strategy: define W in Notation

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index e2017c34c3fcd516d308438ab5c6f33f3b577583..27c9fd82b98d79868af1d126318e16004d42c2ae 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -61,6 +61,12 @@ These are the heads which will be merged and used in this update.
 This will include the current local and remote git refs, as desired.
 Obtained from the function $h$ (see below).
 
+\item[ $W$ ]
+
+During the Traversal phase, when we generate new commits, the working
+head of the branch we are working on.  Starts at $W_0$, updated as the
+algorithm progresses, and ultimately used to set $T$.
+
 %\item[ $\set E_{\pc}$ ]
 %$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
 %All the ends of $\pc$ in the sources.
@@ -84,6 +90,12 @@ all of its dependencies will be updated.
 \item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
 Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
 
+\item[ $w : \pc^{+/-} \mapsto W_0^{\pc^{+/-}}$ ]
+
+Function for getting the existing local head of the branch
+$\pc^{+/-}$.  I.e., the current value of the branch ref for $\pc^{+/-}$.
+$W_0^{\pc^{+/-}} \in \set H$.
+
 \item[ $g : \pc, \Gamma \mapsto \Gamma'$ ]
 Function to allow explicit adjustment of the direct dependencies
 of $\pc$.  It is provided with a putative set of direct dependencies
@@ -124,8 +136,9 @@ $\allreach$ varies over time as we generate more commits.  Each
 commit we generate will have only reachable commits as ancestors, so
 generating a new commit (only) adds that new commit to $\allreach$.
 
-\item[ $\allreachof{\py}$ ]
-The set of reachable commits at the point where we have just generated
-$\tippy$, i.e. just after $\alg{Merge-Tip}(\p)$.
+\item[ $\allreachof{\pn}$, $\allreachof{\py}$ ]
+The sets of reachable commits at the point where we have just generated
+$\tippn$ or $\tippy$, i.e. just after $\alg{Merge-Base}(\p)$ or
+$\alg{Recreate-Base}(\p)$, or $\alg{Merge-Tip}(\p)$, respectively.
 
 \end{basedescript}