notation: remove notation test file

[topbloke-formulae.git] / trav-alg.tex

diff --git a/trav-alg.tex b/trav-alg.tex
index 37d91941ef952d2b9ad6550a25e19ddb58421b71..3151ca491324aea0160a524516a11ea76e563815 100644 (file)
--- a/trav-alg.tex
+++ b/trav-alg.tex
@@ -1,7 +1,7 @@
 \section{Traversal phase --- algorithm}
 
 (In general, unless stated otherwise below, when we generate a new
 \section{Traversal phase --- algorithm}
 
 (In general, unless stated otherwise below, when we generate a new

-commit $C$ using one of the commit kind algorith, we update
+commit $C$ using one of the commit kind recipies, we update

 $W \assign C$.  In any such case where we say we're going to Merge
 with $L = W$, if $R \ge W$ we do not Merge but instead simply set
 $W \assign R$.)
 $W \assign C$.  In any such case where we say we're going to Merge
 with $L = W$, if $R \ge W$ we do not Merge but instead simply set
 $W \assign R$.)


@@ -23,13 +23,21 @@ lowest first:
 
 \end{enumerate}
 
 
 \end{enumerate}
 

-After processing each $\pc$ we will have created:
-
-\begin{itemize}
-
-\item $\tipcn$ and $\tipcy$ such that $\baseof{\tipcy} = \tipcn$.
-
-\end{itemize}
+After processing each $\pc$ we will have created $\tipcn$ and $\tipcy$
+such that:
+
+\statement{Correct Base}{
+  \baseof{\tipcy} = \tipcn
+}
+\statement{Tip Exceeds Inputs}{
+  \tipcy \ge \pendsof{\allsrcs}{\pcy}
+}
+\statement{Base Exceeds Inputs' Bases}{
+  \bigforall_{E \in \pendsof{\allsrcs}{\pcy}} \tipcn \ge \baseof{E}
+}
+\statement{Base Exceeds Base Inputs}{
+  \bigforall_{H \in \set H^{\pn}} \tipcn \ge H
+}

 
 \subsection{$\alg{Merge-Base}(\pc)$}
 
 
 \subsection{$\alg{Merge-Base}(\pc)$}
 


@@ -94,7 +102,7 @@ Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
 \item
 
 Declare that we contain all of the relevant information from the
 \item
 
 Declare that we contain all of the relevant information from the

-sources.  That is, use $\alg{Pseudo-merge}$ with $L = W, \;
+sources.  That is, use $\alg{Pseudo-Merge}$ with $L = W, \;

 \set R = \{ W \} \cup \set S^{\pcn}$.
 (Recreate Base Final Declaration.)
 
 \set R = \{ W \} \cup \set S^{\pcn}$.
 (Recreate Base Final Declaration.)
 


@@ -108,12 +116,12 @@ sources.  That is, use $\alg{Pseudo-merge}$ with $L = W, \;
 
 \item TODO what about non-Topbloke base branches
 
 
 \item TODO what about non-Topbloke base branches
 

-\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
-(Recreate Base Dependency Base Declaration.)
-

 \item For all $\hasdep$-maximal $\pd' \isdirdep \pd$,
 execute $\alg{Recreate-Recurse}(\pd')$.
 
 \item For all $\hasdep$-maximal $\pd' \isdirdep \pd$,
 execute $\alg{Recreate-Recurse}(\pd')$.
 

+\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
+(Recreate Base Dependency Base Declaration.)
+

 \item Use $\alg{Merge}$ to apply $\pd$ to $W$.  That is,
 $L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$.
 (Recreate Reapply.)
 \item Use $\alg{Merge}$ to apply $\pd$ to $W$.  That is,
 $L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$.
 (Recreate Reapply.)