X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=trav-alg.tex;h=df5e4cd8fb3b5e47532215b754ea66b6816fb0c1;hp=8cbaa9a2cfae6a5f56c4489ac4ff35b27cd01eae;hb=9ad96b436e0c1ddc5c4fb5074c588644e88c0bae;hpb=e147ed24f934d56744b763821dd170bc852d6d46

diff --git a/trav-alg.tex b/trav-alg.tex
index 8cbaa9a..df5e4cd 100644
--- a/trav-alg.tex
+++ b/trav-alg.tex
@@ -29,6 +29,11 @@ such that:
 \statement{Correct Base}{
   \baseof{\tipcy} = \tipcn
 }
+\statement{Base Correct Contents}{
+  \tipcn \haspatch \pa E
+   \equiv
+  \pa E \isdep \pc
+}
 \statement{Tip Exceeds Inputs}{
   \tipcy \ge \pendsof{\allsrcs}{\pcy}
 }
@@ -69,7 +74,7 @@ In some order, perhaps interleaving the two kinds of merge:
 \item For each $\hasdep$-maximal $\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.)
+(Base 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$.
@@ -81,6 +86,11 @@ That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
 
 Execute $\alg{Fixup-Base}(W,\pc)$.
 
+TODO define Fixup-Base
+
+\subsubsection{Result}
+
+If all of that was successful, let $\tipcn = W$.
 
 \subsection{$\alg{Recreate-Base}(\pc)$}
 
@@ -92,7 +102,7 @@ Choose a $\hasdep$-maximal direct dependency $\pd$ of $\pc$.
 
 \item
 
-Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
+Use $\alg{Create Base}$ with $L$ = $\tipdy,\; \pq = \pc$ to generate $C$
 and set $W \iassign C$.  (Recreate Base Beginning.)
 
 \item