From 517384538f93dd1d19e65f86836298c377fa04ec Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 Jul 2012 02:50:50 +0100 Subject: [PATCH] strategy: introduce \condproof --- article.tex | 8 +++++++- traversal.tex | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/article.tex b/article.tex index a320e58..dd5c996 100644 --- a/article.tex +++ b/article.tex @@ -159,8 +159,14 @@ \newcommand{\qed}{\square} \newcommand{\proofstarts}{{\it Proof:}} \newcommand{\proof}[1]{\proofstarts #1 $\qed$} -\newcommand{\commitproof}[1]{{\it Proof of commit generation conditions:} + +\newcommand{\commitproof}[1]{{\bf Proof of commit generation conditions:} #1 $\qed$} +\newcommand{\condproof}[2]{ + +{\it #1:} #2 + +} \newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]} diff --git a/traversal.tex b/traversal.tex index c9647ad..93a3eb8 100644 --- a/traversal.tex +++ b/traversal.tex @@ -151,12 +151,13 @@ Use $\alg{Create Base}$ with $L$ = $\tipdy,\; \pq = \pc$ to generate $C$ and set $W \iassign C$. \commitproof{ - Create Acyclic: by Tip Correct Contents of $L$, - $L \haspatch \pa E \equiv \pa E = \pd \lor \pa E \isdep \pd$. - Now $\pd \isdirdep \pc$, - so by Coherence, and setting $\pa E = \pc$, - $L \nothaspatch \pc$. I.e. $L \nothaspatch \pq$. OK. - + \condproof{Create Acyclic}{ + by Tip Correct Contents of $L$, + $L \haspatch \pa E \equiv \pa E = \pd \lor \pa E \isdep \pd$. + Now $\pd \isdirdep \pc$, + so by Coherence, and setting $\pa E = \pc$, + $L \nothaspatch \pc$. I.e. $L \nothaspatch \pq$. OK. + } That's everything for Create Base. } @@ -171,11 +172,12 @@ sources. That is, use $\alg{Pseudo-Merge}$ with $L = W, \; \set R = \{ W \} \cup \set S^{\pcn}$. \commitproof{ - Base Only: $\patchof{W} = \patchof{L} = \pn$. OK. + \condproof{Base Only}{ $\patchof{W} = \patchof{L} = \pn$. OK. } - Unique Tips: - Want to prove that for any $\p \isin C$, $\tipdy$ is a suitable $T$. - WIP TODO + \condproof{Unique Tips}{ + Want to prove that for any $\p \isin C$, $\tipdy$ is a suitable $T$. + WIP TODO + } WIP TODO INCOMPLETE } -- 2.30.2