strategy: wip traversal

[topbloke-formulae.git] / strategy.tex

diff --git a/strategy.tex b/strategy.tex
index d6c06da777300d25afde45747f9c36a919cf9266..48d93d77954256085eb3d44c0dcf0eb52272d065 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -108,15 +108,15 @@ We run the following algorithm:
 \item Repeatedly:
 \begin{enumerate}
 \item Clear out the graph $\hasdirdep$ so it has no edges.
-\item Execute {\bf Rank-Recurse}($\pc_0$)
+\item Execute $\alg{Rank-Recurse}(\pc_0)$
 \item Until $\allpatches$ remains unchanged.
 \end{enumerate}
 \end{enumerate}
 
-{\bf Rank-Recurse}($\pc$) is:
+$\alg{Rank-Recurse}(\pc)$ is:
 \begin{enumerate}
 
-\item If we have already done {\bf Rank-Recurse}($\pc$) in this
+\item If we have already done $\alg{Rank-Recurse}(\pc)$ in this
 ranking iteration, do nothing.  Otherwise:
 
 \item Add $\pc$ to $\allpatches$ if it is not there already.
@@ -155,7 +155,7 @@ if available.
 \item For each $i \ldots 1..n$, update our putative direct
 dependencies:
 $$
-\Gamma \assign \text{\bf set-merge}\left[\Gamma, 
+\Gamma \assign \alg{set-merge}\left[\Gamma,
  \left( \begin{cases} 
   M_i \in \pcn :     & \depsreqof{M_i} \\
   M_i \not\in \pcn : & \{ \}
@@ -164,7 +164,7 @@ $$
  \right]
 $$
 
-TODO define {\bf set-merge}
+TODO define $\alg{set-merge}$
 
 \item Finalise our putative direct dependencies
 $
@@ -179,7 +179,7 @@ as necessary).
 If this results in a cycle, abort entirely (as the function $g$ is
 inappropriate; a different $g$ could work).
 \end{enumerate}
-\item Run ${\text{\bf Rank-Recurse}}(\pd)$.
+\item Run $\alg{Rank-Recurse}(\pd)$.
 
 \end{enumerate}
 
@@ -211,8 +211,14 @@ and corresponding merge bases $M^{\pcn}_i = M_i$.
 
 \section{Traversal phase}
 
+For each patch $C \in \allpatches$ in topological order by $\hasdep$,
+lowest first:
 
+\begin{enumerate}
+
+\item Optionally, attempt $\alg{Merge-Base}(\pc)$.
 
+\end{enumerate}
 
 
 \section{Planning phase}