article.tex

   1 \documentclass[a4paper,leqno]{strayman}
   2 \errorcontextlines=50
   3 \let\numberwithin=\notdef
   4 \usepackage{amsmath}
   5 \usepackage{mathabx}
   6 \usepackage{txfonts}
   7 \usepackage{amsfonts}
   8 \usepackage{mdwlist}
   9 %\usepackage{accents}
  10
  11 \usepackage{fancyhdr}
  12 \pagestyle{fancy}
  13 \rhead[\rightmark]{}
  14 \lhead[]{\rightmark}
  15 \rfoot[\thepage]{\input{revid.inc}}
  16 \lfoot[\input{revid.inc}]{\thepage}
  17
  18 \let\stdsection\section
  19 \renewcommand\section{\newpage\stdsection}
  20
  21 \renewcommand{\ge}{\geqslant}
  22 \renewcommand{\le}{\leqslant}
  23 \newcommand{\nge}{\ngeqslant}
  24 \newcommand{\nle}{\nleqslant}
  25
  26 \newcommand{\has}{\sqsupseteq}
  27 \newcommand{\isin}{\sqsubseteq}
  28
  29 \newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
  30 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
  31 \newcommand{\haspatch}{\sqSupset}
  32 \newcommand{\patchisin}{\sqSubset}
  33 %\newcommand{\zhaspatch}{\mathrel{\underset{\fullmoon}\sqSupset}}
  34 \newcommand{\zhaspatch}{\mathrel{\sqSupset_\varnothing\mkern-4mu}}
  35
  36         \newif\ifhidehack\hidehackfalse
  37         \DeclareRobustCommand\hidefromedef[2]{%
  38           \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
  39         \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
  40
  41 \newcommand{\set}[1]{\mathbb{#1}}
  42 \newcommand{\pay}[1]{\pa{#1}^+}
  43 \newcommand{\pan}[1]{\pa{#1}^-}
  44
  45 \newcommand{\p}{\pa{P}}
  46 \newcommand{\py}{\pay{P}}
  47 \newcommand{\pn}{\pan{P}}
  48
  49 \newcommand{\pc}{\pa{C}}
  50 \newcommand{\pcy}{\pay{C}}
  51 \newcommand{\pcn}{\pan{C}}
  52
  53 \newcommand{\pd}{\pa{D}}
  54 \newcommand{\pdy}{\pay{D}}
  55 \newcommand{\pdn}{\pan{D}}
  56
  57 \newcommand{\pl}{\pa{L}}
  58 \newcommand{\ply}{\pay{L}}
  59 \newcommand{\pln}{\pan{L}}
  60
  61 \newcommand{\pq}{\pa{Q}}
  62 \newcommand{\pqy}{\pay{Q}}
  63 \newcommand{\pqn}{\pan{Q}}
  64
  65 \newcommand{\pr}{\pa{R}}
  66 \newcommand{\pry}{\pay{R}}
  67 \newcommand{\prn}{\pan{R}}
  68
  69 %\newcommand{\hasparents}{\underaccent{1}{>}}
  70 %\newcommand{\hasparents}{{%
  71 %  \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
  72 \newcommand{\hasparents}{>_{\mkern-7.0mu _{1:}}}
  73 \newcommand{\areparents}{<_{\mkern-14.0mu _{1:}\mkern+5.0mu}}
  74
  75 \renewcommand{\implies}{\Rightarrow}
  76 \renewcommand{\equiv}{\Leftrightarrow}
  77 \renewcommand{\nequiv}{\nLeftrightarrow}
  78 \renewcommand{\land}{\wedge}
  79 \renewcommand{\lor}{\vee}
  80
  81 \newcommand{\pancs}{{\mathcal A}}
  82 \newcommand{\pends}{{\mathcal E}}
  83
  84 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
  85 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
  86
  87 %\newcommand{\commitmerge}{\text{\commitmergename}}
  88 \newcommand{\commitmergeof}[4]{#1 \approx \stmtmergeof{#2}{#3}{#4}}
  89 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
  90 \newcommand{\commitmergename}{Git Merge}
  91
  92 \newcommand{\patch}{{\mathcal P}}
  93 \newcommand{\base}{{\mathcal B}}
  94 \newcommand{\depsreq}{{\mathcal G}}
  95
  96 \newcommand{\allsrcs}{\set U}
  97 \newcommand{\allreach}{\set O}
  98 \newcommand{\allreachof}[1]{\set O^{#1}}
  99
 100 \newcommand{\patchof}[1]{\patch ( #1 ) }
 101 \newcommand{\baseof}[1]{\base ( #1 ) }
 102 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 103
 104 \newcommand{\foreign}{\pa F}
 105 \newcommand{\isforeign}[1]{#1 \in \foreign}
 106
 107 \newcommand{\allpatches}{\Upsilon}
 108 \newcommand{\assign}{\leftarrow}
 109 \newcommand{\iassign}{\leftarrow}
 110 %\newcommand{\assign}{' =}
 111
 112 \newcommand{\mergeof}[3]{\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
 113
 114 \newcommand{\alg}[1]{\text{\bf #1}}
 115 \newcommand{\setmerge}{\mergeof{}{}{}}
 116 \newcommand{\setmergeof}[3]{\mergeof{#1}{#2}{#3}}
 117 \newcommand{\stmtmergeof}[3]{\mergeof{#1}{#2}{#3}}
 118
 119 %\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
 120 %\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
 121 %\newcommand{\setmergeof}[3]{\setmerge\left\lfloor #1 \middle\lfloor #2 \middle\rfloor #3 \right\rfloor}
 122
 123 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
 124 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
 125
 126 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
 127 \newcommand{\hasdep}{\succ}
 128 \newcommand{\isdep}{\prec}
 129 \newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
 130
 131 \newcommand{\tip}{ T }
 132 \newcommand{\tipa}[1]{ \tip^{#1} }
 133 \newcommand{\tipcn}{ \tipa \pcn }
 134 \newcommand{\tipcy}{ \tipa \pcy }
 135 \newcommand{\tipdn}{ \tipa \pdn }
 136 \newcommand{\tipdy}{ \tipa \pdy }
 137
 138 \newcommand{\tippy}{ \tipa \py }
 139
 140 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 141 \newcommand{\bigforall}{%
 142   \mathop{\mathchoice%
 143     {\hbox{\huge$\forall$}}%
 144     {\hbox{\Large$\forall$}}%
 145     {\hbox{\normalsize$\forall$}}%
 146     {\hbox{\scriptsize$\forall$}}}%
 147 }
 148 \newcommand{\bigexists}{%
 149   \mathop{\mathchoice%
 150     {\hbox{\huge$\exists$}}%
 151     {\hbox{\Large$\exists$}}%
 152     {\hbox{\normalsize$\exists$}}%
 153     {\hbox{\scriptsize$\exists$}}}%
 154 }
 155
 156 \newcommand{\Largeexists}{\mathop{\hbox{\Large$\exists$}}}
 157 \newcommand{\Largenexists}{\mathop{\hbox{\Large$\nexists$}}}
 158
 159 \newcommand{\qed}{\square}
 160 \newcommand{\proofstarts}{{\it Proof:}}
 161 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 162
 163 \newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
 164
 165 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 166 \newcommand{\gathnext}{\\ \tag*{}}
 167
 168 \newcommand{\true}{t}
 169 \newcommand{\false}{f}
 170
 171 \begin{document}
 172
 173 \chapter{Data model}
 174
 175 \input{notation.tex}
 176 \input{invariants.tex}
 177 \input{lemmas.tex}
 178 \input{annotations.tex}
 179
 180 \input{simple.tex}
 181 \input{create-base.tex}
 182 \input{create-tip.tex}
 183 \input{anticommit.tex}
 184 \input{merge.tex}
 185 \input{pseudomerge.tex}
 186
 187 \chapter{Update strategy}
 188
 189 \input{strategy.tex}
 190 \input{ranking.tex}
 191 \input{trav-alg.tex}
 192 \input{trav-proofs.tex}
 193
 194 \end{document}