From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 May 2012 20:11:06 +0000 (+0100)
Subject: strategy: traversal wip
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=42c4989a724e87f211f3a95d68dd2ecbc3100cf9

strategy: traversal wip
---

diff --git a/strategy.tex b/strategy.tex
index 7ceff45..e3ba372 100644
--- a/strategy.tex
+++ b/strategy.tex
@@ -292,11 +292,11 @@ In some order, perhaps interleaving the two kinds of merge:
 \item For each $\pd \isdirdep \pc$, find a merge base
 $M \le W,\; \le \tipdy$ and merge $\tipdy$ into $W$.
 That is, use $\alg{Merge}$ with $L = W,\; R = \tipdy$.
-(Dependency merge.)
+(Dependency Merge.)
 
 \item For each $S \in S^{\pcn}_i$, merge it into $W$.
 That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
-(Base sibling merge.)
+(Base Sibling Merge.)
 
 \end{enumerate}
 
@@ -316,12 +316,19 @@ Choose a $\hasdep$-maximal direct dependency $\pd$ of $\pc$.
 \item
 
 Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
-and set $W \iassign C$.
+and set $W \iassign C$.  (Recreate Base Beginning.)
 
 \item
 
 Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
 
+\item
+
+Declare that we contain all of the relevant information from the
+sources.  That is, use $\alg{Pseudo-merge}$ with $L = W, \;
+\set R = \{ W \} \cup \set S^{\pcn}$.
+(Recreate Base Final Declaration.)
+
 \end{enumerate}
 
 \subsubsection{$\alg{Recreate-Recurse}(\pd)$}
@@ -333,7 +340,7 @@ Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
 \item TODO what about non-Topbloke base branches
 
 \item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
-(Recreate Base Psuedo-merge.)
+(Recreate Base Dependency Base Declaration.)
 
 \item For all $\hasdep$-maximal $\pd' \isdirdep \pd$,
 execute $\alg{Recreate-Recurse}(\pd')$.
@@ -343,3 +350,19 @@ $L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$.
 (Recreate Reapply.)
 
 \end{enumerate}
+
+
+\subsection{$\alg{Merge-Tip}(\pc)$}
+
+\begin{enumerate}
+
+\item TODO CHOOSE/REFINE W AND S as was done during Ranking for bases
+
+\item $\alg{Merge}$ from $\tipcn$.  That is, $L = W, \;
+R = \tipcn$ and choose any suitable $M$.  (Tip Base Merge.)
+
+\item For each source $S \in \set S^{\pcy}$,
+$\alg{Merge}$ with $L = W, \; R = S$ and any suitable $M$.
+(Tip Source Merge.)
+
+\end{enumerate}