strategy: calculate/use \allsrcs

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 7a43732309281d9402dde333c37f398c8cb75a29..92092d285d92fc2e228e37e2839a15acf984d11a 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -90,18 +90,28 @@
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\newcommand{\depsreq}{{\mathcal G}}
+
+\newcommand{\allsrcs}{\set U}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\foreign}{\pa F}
+\newcommand{\isforeign}[1]{#1 \in \foreign}
+
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
 \newcommand{\iassign}{\leftarrow}
 %\newcommand{\assign}{' =}
 
 \newcommand{\alg}[1]{\text{\bf #1}}
+\newcommand{\setmerge}{\alg{merge}}
+\newcommand{\setmergeof}[3]{\setmerge\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
+%\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lfloor #1 \middle\lfloor #2 \middle\rfloor #3 \right\rfloor}
 
 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
@@ -109,21 +119,14 @@
 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
 
-\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{\tip}{ T }
+\newcommand{\tipa}[1]{ \tip^{#1} }
+\newcommand{\tipcn}{ \tipa \pcn }
+\newcommand{\tipcy}{ \tipa \pcy }
+\newcommand{\tipdn}{ \tipa \pdn }
+\newcommand{\tipdy}{ \tipa \pdy }
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
@@ -148,6 +151,8 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
@@ -168,9 +173,13 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}
 
 \input{strategy.tex}
+\input{ranking.tex}
+\input{trav-alg.tex}
+\input{trav-proofs.tex}
 
 \end{document}