strategy: rename \gref macros: perl -i~ -pe 's/gref([zcuf])/tip$1/g' *.tex

diff --git a/article.tex b/article.tex
index 8ecdbc394a04fde93eadc52bda85d26199fd8174..54de0cecf8d9b288d4149c285d3fe1b94379a162 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -99,20 +99,20 @@
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
 
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
 

-\newcommand{\grefz}{ T^0 }
-\newcommand{\grefc}{ T }
-\newcommand{\grefu}{ T' }
-\newcommand{\greff}{ T^* }
-
-\newcommand{\grefza}[1]{ \grefz_{#1} }
-\newcommand{\grefca}[1]{ \grefc_{#1} }
-\newcommand{\grefua}[1]{ \grefu_{#1} }
-\newcommand{\greffa}[1]{ \greff_{#1} }
-
-\newcommand{\grefzc}{ \grefza \pc }
-\newcommand{\grefcc}{ \grefca \pc }
-\newcommand{\grefuc}{ \grefua \pc }
-\newcommand{\greffc}{ \greffa \pc }
+\newcommand{\tipz}{ T^0 }
+\newcommand{\tipc}{ T }
+\newcommand{\tipu}{ T' }
+\newcommand{\tipf}{ T^* }
+
+\newcommand{\tipza}[1]{ \tipz_{#1} }
+\newcommand{\tipca}[1]{ \tipc_{#1} }
+\newcommand{\tipua}[1]{ \tipu_{#1} }
+\newcommand{\tipfa}[1]{ \tipf_{#1} }
+
+\newcommand{\tipzc}{ \tipza \pc }
+\newcommand{\tipcc}{ \tipca \pc }
+\newcommand{\tipuc}{ \tipua \pc }
+\newcommand{\tipfc}{ \tipfa \pc }

 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%

diff --git a/strategy.tex b/strategy.tex
index 0fa1ff19c5ddd13848dd52a1625087d00de93154..0ac03fa119ebb0a65c201352c9c8123136bc4a8e 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -27,7 +27,7 @@ partial order.
 $ \bigcup_i \pendsof{S_i}{\pc} $.
 All the ends of $\pc$ in the sources.
 
 $ \bigcup_i \pendsof{S_i}{\pc} $.
 All the ends of $\pc$ in the sources.
 

-\item[ $ \grefzc, \grefcc, \grefuc, \greffc $ ]
+\item[ $ \tipzc, \tipcc, \tipuc, \tipfc $ ]

 The git ref for the Topbloke commit set $\pc$: respectively,
 the original, current, updated, and final values.
 
 The git ref for the Topbloke commit set $\pc$: respectively,
 the original, current, updated, and final values.
 


@@ -49,7 +49,7 @@ processing at each step $\pc$.
 At each recursive step 
 we make a plan to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
 and all the direct contributors of $\pc$ (as determined below)
 At each recursive step 
 we make a plan to merge all $\set E_{\pc} = \{ E_{\pc,j \ldots} \}$
 and all the direct contributors of $\pc$ (as determined below)

-into $\grefzc$, to make $\greffc$.
+into $\tipzc$, to make $\tipfc$.

 
 We start with $\pc = \pl$ where $\pl = \patchof{L}$.
 
 
 We start with $\pc = \pl$ where $\pl = \patchof{L}$.
 


@@ -67,7 +67,7 @@ For brevity we will write $E_j$ for $E_{\pc,j}$.
 Remove from that set (and ordering) any $E_j$ which
 are $\le$ and $\neq$ some other $E_k$.
 
 Remove from that set (and ordering) any $E_j$ which
 are $\le$ and $\neq$ some other $E_k$.
 

-Initially let $\set D_0 = \depsreqof{\grefzc}$.
+Initially let $\set D_0 = \depsreqof{\tipzc}$.

 For each $E_j$ starting with $j=1$ choose a corresponding intended
 merge base $M_j$ such that $M_j \le E_j \land M_j \le T_{\pc,j-1}$.
 Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and
 For each $E_j$ starting with $j=1$ choose a corresponding intended
 merge base $M_j$ such that $M_j \le E_j \land M_j \le T_{\pc,j-1}$.
 Calculate $\set D_j$ as the 3-way merge of the sets $\set D_{j-1}$ and


@@ -99,38 +99,38 @@ for $\pc' = \p$.
 \section{Execution phase}
 
 We process commit sets from the bottom up according to the relation
 \section{Execution phase}
 
 We process commit sets from the bottom up according to the relation

-$\hasdep$.  For each commit set $\pc$ we construct $\greffc$ from
-$\grefzc$, as planned.  By construction, $\hasdep$ has $\patchof{L}$
+$\hasdep$.  For each commit set $\pc$ we construct $\tipfc$ from
+$\tipzc$, as planned.  By construction, $\hasdep$ has $\patchof{L}$

 as its maximum, so this operation will finish by updating
 as its maximum, so this operation will finish by updating

-$\greffa{\patchof{L}}$.
+$\tipfa{\patchof{L}}$.

 
 After we are done, the result has the following properties:
 \[ \eqn{Tip Inputs}{
 
 After we are done, the result has the following properties:
 \[ \eqn{Tip Inputs}{

-  \bigforall_{E_i \in \set E_{\pc}} \greffc \ge E_i
+  \bigforall_{E_i \in \set E_{\pc}} \tipfc \ge E_i

 }\]
 \[ \eqn{Tip Dependencies}{
 }\]
 \[ \eqn{Tip Dependencies}{

-  \bigforall_{\pc \hasdep \p} \greffc \ge \greffa \p
+  \bigforall_{\pc \hasdep \p} \tipfc \ge \tipfa \p

 }\]
 \[ \eqn{Perfect Contents}{
 }\]
 \[ \eqn{Perfect Contents}{

-  \greffc \haspatch \p \equiv \pc \hasdep \py
+  \tipfc \haspatch \p \equiv \pc \hasdep \py

 }\]
 
 }\]
 

-For brevity we will write $\grefu$ for $\grefuc$, etc.  We will start
-out with $\grefc = \grefz$, and at each step of the way construct some
-$\grefu$ from $\grefc$.  The final $\grefu$ becomes $\greff$.
+For brevity we will write $\tipu$ for $\tipuc$, etc.  We will start
+out with $\tipc = \tipz$, and at each step of the way construct some
+$\tipu$ from $\tipc$.  The final $\tipu$ becomes $\tipf$.

 
 \subsection{Preparation}
 
 
 \subsection{Preparation}
 

-Firstly, we will check each $E_i$ for being $\ge \grefc$.  If
+Firstly, we will check each $E_i$ for being $\ge \tipc$.  If

 it is, are we fast forward to $E_i$
 it is, are we fast forward to $E_i$

---- formally, $\grefu = \text{max}(\grefc, E_i)$ ---
+--- formally, $\tipu = \text{max}(\tipc, E_i)$ ---

 and drop $E_i$ from the planned ordering.
 
 \subsection{Merge Contributors for $\pcy$}
 
 and drop $E_i$ from the planned ordering.
 
 \subsection{Merge Contributors for $\pcy$}
 

-Merge $\pcn$ into $\grefc$.  That is, merge with
-$L = \grefc, R = \greffa{\pcn}, M = \baseof{\grefc}$.
-to construct $\grefu$.
+Merge $\pcn$ into $\tipc$.  That is, merge with
+$L = \tipc, R = \tipfa{\pcn}, M = \baseof{\tipc}$.
+to construct $\tipu$.

 
 Merge conditions: Ingredients satisfied by construction.
 Tip Merge satisfied by construction.  Merge Acyclic follows
 
 Merge conditions: Ingredients satisfied by construction.
 Tip Merge satisfied by construction.  Merge Acyclic follows


@@ -147,9 +147,9 @@ WIP UP TO HERE
 
 Addition Merge Ends: If $\py \isdep \pcn$, we have already
 done the execution phase for $\pcn$ and $\py$.  By
 
 Addition Merge Ends: If $\py \isdep \pcn$, we have already
 done the execution phase for $\pcn$ and $\py$.  By

-Perfect Contents for $\pcn$, $\greffa \pcn \haspatch \p$.
+Perfect Contents for $\pcn$, $\tipfa \pcn \haspatch \p$.

 
 

-computed $\greffa \py$, and by Perfect Contents for $\py$
+computed $\tipfa \py$, and by Perfect Contents for $\py$

 
 
 with $M=M_j, L=T_{\pc,j-1}, R=E_j$,
 
 
 with $M=M_j, L=T_{\pc,j-1}, R=E_j$,