chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
traversal: Base/Tip Correct Contents chane notation
[topbloke-formulae.git]
/
trav-alg.tex
diff --git
a/trav-alg.tex
b/trav-alg.tex
index 9e5197e1a65378f672d83efd2e6a7b0f52bcec7f..df5e4cd8fb3b5e47532215b754ea66b6816fb0c1 100644
(file)
--- a/
trav-alg.tex
+++ b/
trav-alg.tex
@@
-29,6
+29,11
@@
such that:
\statement{Correct Base}{
\baseof{\tipcy} = \tipcn
}
\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}
}
\statement{Tip Exceeds Inputs}{
\tipcy \ge \pendsof{\allsrcs}{\pcy}
}
@@
-81,6
+86,8
@@
That is, use $\alg{Merge}$ with $L = W,\; R = S,\; M = M^{\pcn}_i$.
Execute $\alg{Fixup-Base}(W,\pc)$.
Execute $\alg{Fixup-Base}(W,\pc)$.
+TODO define Fixup-Base
+
\subsubsection{Result}
If all of that was successful, let $\tipcn = W$.
\subsubsection{Result}
If all of that was successful, let $\tipcn = W$.
@@
-95,7
+102,7
@@
Choose a $\hasdep$-maximal direct dependency $\pd$ of $\pc$.
\item
\item
-Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
+Use $\alg{Create Base}$ with $L$ = $\
ti
pdy,\; \pq = \pc$ to generate $C$
and set $W \iassign C$. (Recreate Base Beginning.)
\item
and set $W \iassign C$. (Recreate Base Beginning.)
\item