chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79d94bd
)
strategy: traversal wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 20:11:06 +0000
(21:11 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 20:11:06 +0000
(21:11 +0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 7ceff45fb8ade776b0d6a8184d6358023e87b73a..e3ba372373a06af330823732cb03bf7e3b8b727c 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-292,11
+292,11
@@
In some order, perhaps interleaving the two kinds of merge:
\item For each $\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$.
\item For each $\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
m
erge.)
+(Dependency
M
erge.)
\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$.
\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$.
-(Base
sibling m
erge.)
+(Base
Sibling M
erge.)
\end{enumerate}
\end{enumerate}
@@
-316,12
+316,19
@@
Choose a $\hasdep$-maximal direct dependency $\pd$ of $\pc$.
\item
Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
\item
Use $\alg{Create Base}$ with $L$ = $\pdy,\; \pq = \pc$ to generate $C$
-and set $W \iassign C$.
+and set $W \iassign C$.
(Recreate Base Beginning.)
\item
Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
\item
Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
+\item
+
+Declare that we contain all of the relevant information from the
+sources. That is, use $\alg{Pseudo-merge}$ with $L = W, \;
+\set R = \{ W \} \cup \set S^{\pcn}$.
+(Recreate Base Final Declaration.)
+
\end{enumerate}
\subsubsection{$\alg{Recreate-Recurse}(\pd)$}
\end{enumerate}
\subsubsection{$\alg{Recreate-Recurse}(\pd)$}
@@
-333,7
+340,7
@@
Execute the subalgorithm $\alg{Recreate-Recurse}(\pc)$.
\item TODO what about non-Topbloke base branches
\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
\item TODO what about non-Topbloke base branches
\item Use $\alg{Pseudo-Merge}$ with $L = W,\; \set R = \{ \tipdn \}$.
-(Recreate Base
Psuedo-merge
.)
+(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')$.
@@
-343,3
+350,19
@@
$L = W, \; R = \tipdy, \; M = \baseof{R} = \tipdn$.
(Recreate Reapply.)
\end{enumerate}
(Recreate Reapply.)
\end{enumerate}
+
+
+\subsection{$\alg{Merge-Tip}(\pc)$}
+
+\begin{enumerate}
+
+\item TODO CHOOSE/REFINE W AND S as was done during Ranking for bases
+
+\item $\alg{Merge}$ from $\tipcn$. That is, $L = W, \;
+R = \tipcn$ and choose any suitable $M$. (Tip Base Merge.)
+
+\item For each source $S \in \set S^{\pcy}$,
+$\alg{Merge}$ with $L = W, \; R = S$ and any suitable $M$.
+(Tip Source Merge.)
+
+\end{enumerate}