X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=2ee37593eaec32d49957386b6721ab1fc1c68880;hp=5d8f85f670598985da7c05ce47d6673a4f648021;hb=f5f93d74c204fcd773074e61aa4fac1a3e48aa3c;hpb=d00298b5b6d70bd919824ab8b79d71663f3cdfa6

diff --git a/article.tex b/article.tex
index 5d8f85f..2ee3759 100644
--- a/article.tex
+++ b/article.tex
@@ -5,11 +5,13 @@
 \usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
+\usepackage{eufrak}
 \usepackage{mdwlist}
+%\usepackage{lastpage}
 %\usepackage{accents}
 
 \usepackage{fancyhdr}
-\pagestyle{fancy}
+\pagestyle{fancyplain}
 \rhead[\rightmark]{}
 \lhead[]{\rightmark}
 \rfoot[\thepage]{\input{revid.inc}}
@@ -26,17 +28,20 @@
 \newcommand{\has}{\sqsupseteq}
 \newcommand{\isin}{\sqsubseteq}
 
-\newcommand{\nothaspatch}{\mathrel{\,\!\not\relax\haspatch}}
+\newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
 \newcommand{\haspatch}{\sqSupset}
 \newcommand{\patchisin}{\sqSubset}
-\newcommand{\zhaspatch}{\mathrel{\sqSupset_{\degree}}}
+%\newcommand{\zhaspatch}{\mathrel{\underset{\fullmoon}\sqSupset}}
+\newcommand{\zhaspatch}{\mathrel{\sqSupset_\varnothing\mkern-4mu}}
 
         \newif\ifhidehack\hidehackfalse
         \DeclareRobustCommand\hidefromedef[2]{%
           \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
         \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
 
+\newcommand{\stmt}[1]{\mathfrak{#1}}
+
 \newcommand{\set}[1]{\mathbb{#1}}
 \newcommand{\pay}[1]{\pa{#1}^+}
 \newcommand{\pan}[1]{\pa{#1}^-}
@@ -45,6 +50,14 @@
 \newcommand{\py}{\pay{P}}
 \newcommand{\pn}{\pan{P}}
 
+\newcommand{\pc}{\pa{C}}
+\newcommand{\pcy}{\pay{C}}
+\newcommand{\pcn}{\pan{C}}
+
+\newcommand{\pd}{\pa{D}}
+\newcommand{\pdy}{\pay{D}}
+\newcommand{\pdn}{\pan{D}}
+
 \newcommand{\pl}{\pa{L}}
 \newcommand{\ply}{\pay{L}}
 \newcommand{\pln}{\pan{L}}
@@ -60,8 +73,11 @@
 %\newcommand{\hasparents}{\underaccent{1}{>}}
 %\newcommand{\hasparents}{{%
 %  \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
-\newcommand{\hasparents}{>_{\mkern-7.0mu _1}}
-\newcommand{\areparents}{<_{\mkern-14.0mu _1\mkern+5.0mu}}
+\newcommand{\hasparent}{>_{\mkern-7.0mu _{1}}}
+\newcommand{\isparent}{<_{\mkern-18.0mu _{1}\mkern+9.0mu}}
+
+\newcommand{\hasparents}{>_{\mkern-7.0mu _{1:}}}
+\newcommand{\areparents}{<_{\mkern-14.0mu _{1:}\mkern+5.0mu}}
 
 \renewcommand{\implies}{\Rightarrow}
 \renewcommand{\equiv}{\Leftrightarrow}
@@ -75,19 +91,59 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\merge}{{\mathcal M}}
-\newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
+%\newcommand{\commitmerge}{\text{\commitmergename}}
+\newcommand{\commitmergeof}[4]{#1 \has \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
+\newcommand{\commitmergename}{Git Merge}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
+\newcommand{\depsreq}{{\mathcal G}}
+
+\newcommand{\allsrcs}{\set U}
+\newcommand{\allreach}{\set O}
+\newcommand{\allreachof}[1]{\set O^{#1}}
 
 \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{\mergeof}[3]{\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
+
+\newcommand{\alg}[1]{\text{\bf #1}}
+\newcommand{\setmerge}{\mergeof{}{}{}}
+\newcommand{\setmergeof}[3]{\mergeof{#1}{#2}{#3}}
+\newcommand{\stmtmergeof}[3]{\mergeof{#1}{#2}{#3}}
+
+%\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}} }
 
+\newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
+\newcommand{\hasdep}{\succ}
+\newcommand{\isdep}{\prec}
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
+
+\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{\tippy}{ \tipa \py }
+
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
   \mathop{\mathchoice%
@@ -96,6 +152,13 @@
     {\hbox{\normalsize$\forall$}}%
     {\hbox{\scriptsize$\forall$}}}%
 }
+\newcommand{\bigexists}{%
+  \mathop{\mathchoice%
+    {\hbox{\huge$\exists$}}%
+    {\hbox{\Large$\exists$}}%
+    {\hbox{\normalsize$\exists$}}%
+    {\hbox{\scriptsize$\exists$}}}%
+}
 
 \newcommand{\Largeexists}{\mathop{\hbox{\Large$\exists$}}}
 \newcommand{\Largenexists}{\mathop{\hbox{\Large$\nexists$}}}
@@ -104,6 +167,16 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\commitproof}[1]{{\bf Proof of commit generation conditions:}
+ #1 $\qed$}
+\newcommand{\condproof}[2]{
+
+{\it #1:} #2
+
+}
+
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
@@ -112,6 +185,8 @@
 
 \begin{document}
 
+\chapter{Data model}
+
 \input{notation.tex}
 \input{invariants.tex}
 \input{lemmas.tex}
@@ -122,5 +197,16 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
+
+\chapter{Update strategy}
+
+\input{strategy.tex}
+\input{ranking.tex}
+\input{traversal.tex}
+
+%\AtEndDocument{\par\bigskip\centerline{\Large\bfseries Document ends here}}
+
+\par$\bigboxdot$
 
 \end{document}