chiark / gitweb /
topbloke-formulae.git
11 years agonotation: use \commitmergename in its definition text, and clarify
Ian Jackson [Sat, 7 Jul 2012 16:56:48 +0000 (17:56 +0100)]
notation: use \commitmergename in its definition text, and clarify

11 years agointernal notation: invent \commitmergename and use it everywhere
Ian Jackson [Sat, 7 Jul 2012 16:53:27 +0000 (17:53 +0100)]
internal notation: invent \commitmergename and use it everywhere

perl -i~ -pe 's/\$\\commitmerge\b\$/\\commitmergename/' *.tex

plus the actual definition

11 years agonotation: define \commitmergeof in terms of \stmtmergeof
Ian Jackson [Sat, 7 Jul 2012 16:27:19 +0000 (17:27 +0100)]
notation: define \commitmergeof in terms of \stmtmergeof

11 years agonotation: define \stmtmergeof and \setmergeof
Ian Jackson [Sat, 7 Jul 2012 16:23:02 +0000 (17:23 +0100)]
notation: define \stmtmergeof and \setmergeof

11 years agointernal notation: break out \mergeof
Ian Jackson [Sat, 7 Jul 2012 16:12:36 +0000 (17:12 +0100)]
internal notation: break out \mergeof

11 years agointernal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof...
Ian Jackson [Sat, 7 Jul 2012 16:10:23 +0000 (17:10 +0100)]
internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof - fix

11 years agointernal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof
Ian Jackson [Sat, 7 Jul 2012 16:08:51 +0000 (17:08 +0100)]
internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof

11 years agowip strategy
Ian Jackson [Sat, 7 Jul 2012 15:53:04 +0000 (16:53 +0100)]
wip strategy

11 years agostrategy: calculate/use \allsrcs
Ian Jackson [Sat, 9 Jun 2012 15:36:00 +0000 (16:36 +0100)]
strategy: calculate/use \allsrcs

11 years agostrategy: amendments from p27-28
Ian Jackson [Sat, 9 Jun 2012 15:25:39 +0000 (16:25 +0100)]
strategy: amendments from p27-28

11 years agostrategy: wip proofs
Ian Jackson [Mon, 28 May 2012 00:12:19 +0000 (01:12 +0100)]
strategy: wip proofs

11 years agostrategy: notational fix
Ian Jackson [Mon, 28 May 2012 00:11:52 +0000 (01:11 +0100)]
strategy: notational fix

11 years agonew macro \statement (for \[\eqn{...}{...}\] - many possible call sites)
Ian Jackson [Mon, 28 May 2012 00:11:42 +0000 (01:11 +0100)]
new macro \statement (for \[\eqn{...}{...}\] - many possible call sites)

11 years agostrategy notation: introduce \allsrcs
Ian Jackson [Mon, 28 May 2012 00:10:52 +0000 (01:10 +0100)]
strategy notation: introduce \allsrcs

11 years agostrategy: split into more files
Ian Jackson [Sun, 27 May 2012 23:22:47 +0000 (00:22 +0100)]
strategy: split into more files

11 years agopsueomerge: sort out foreign ends
Ian Jackson [Sun, 27 May 2012 23:20:12 +0000 (00:20 +0100)]
psueomerge: sort out foreign ends

11 years agoannotate foreign ends too
Ian Jackson [Sun, 27 May 2012 23:16:52 +0000 (00:16 +0100)]
annotate foreign ends too

11 years agoforeign notation: replace "D \text{ s.t. } \isforeign{D}" with "D \in \foreign"
Ian Jackson [Sun, 27 May 2012 23:12:08 +0000 (00:12 +0100)]
foreign notation: replace "D \text{ s.t. } \isforeign{D}" with "D \in \foreign"

11 years agoforeign notation: make \foreign into a set
Ian Jackson [Sun, 27 May 2012 23:08:18 +0000 (00:08 +0100)]
foreign notation: make \foreign into a set

11 years agoforeign notation: introduce \isforeign
Ian Jackson [Sun, 27 May 2012 23:03:06 +0000 (00:03 +0100)]
foreign notation: introduce \isforeign

perl -i~ -pe 's/\\patchof(\{[^{}]+\})\s+=\s+\\foreign\b/\\isforeign$1/g' *.tex

and then add the definition in article.tex

11 years agoforeign notation: change \bot to \foreign everywhere
Ian Jackson [Sun, 27 May 2012 23:01:01 +0000 (00:01 +0100)]
foreign notation: change \bot to \foreign everywhere

11 years agopsuedomerge: initial version
Ian Jackson [Sun, 27 May 2012 22:57:17 +0000 (23:57 +0100)]
psuedomerge: initial version

11 years agofixes: correct suitable tips
Ian Jackson [Sun, 27 May 2012 22:13:52 +0000 (23:13 +0100)]
fixes: correct suitable tips

11 years agostrategy: notation: change D(K) to G(K)
Ian Jackson [Sun, 27 May 2012 22:10:46 +0000 (23:10 +0100)]
strategy: notation: change D(K) to G(K)

11 years agofixes: correct suitable tips
Ian Jackson [Sun, 27 May 2012 22:08:53 +0000 (23:08 +0100)]
fixes: correct suitable tips

11 years agostrategy: traversal wip proofs
Ian Jackson [Sun, 27 May 2012 22:04:59 +0000 (23:04 +0100)]
strategy: traversal wip proofs

11 years agostrategy: traversal wip
Ian Jackson [Sun, 27 May 2012 20:11:06 +0000 (21:11 +0100)]
strategy: traversal wip

11 years agostrategy: traversal wip
Ian Jackson [Sun, 27 May 2012 19:58:52 +0000 (20:58 +0100)]
strategy: traversal wip

11 years agostrategy: replace old \tip... macros
Ian Jackson [Sun, 27 May 2012 19:58:27 +0000 (20:58 +0100)]
strategy: replace old \tip... macros

11 years agostrategy: remove old stuff
Ian Jackson [Sun, 27 May 2012 19:06:30 +0000 (20:06 +0100)]
strategy: remove old stuff

11 years agostrategy: traversal wip
Ian Jackson [Sun, 27 May 2012 18:50:02 +0000 (19:50 +0100)]
strategy: traversal wip

11 years agostrategy: fixes
Ian Jackson [Sun, 27 May 2012 18:49:27 +0000 (19:49 +0100)]
strategy: fixes

11 years agostrategy: ranking: proof of termination
Ian Jackson [Sun, 27 May 2012 18:49:10 +0000 (19:49 +0100)]
strategy: ranking: proof of termination

11 years agonotation: \hasdirdep
Ian Jackson [Sun, 27 May 2012 18:48:46 +0000 (19:48 +0100)]
notation: \hasdirdep

11 years agostrategy: notation: setmerge -> merge
Ian Jackson [Sun, 27 May 2012 18:48:02 +0000 (19:48 +0100)]
strategy: notation: setmerge -> merge

11 years agostrategy: notation: setmergeof
Ian Jackson [Sun, 27 May 2012 18:05:38 +0000 (19:05 +0100)]
strategy: notation: setmergeof

11 years agostrategy: wip traversal
Ian Jackson [Sun, 27 May 2012 18:04:31 +0000 (19:04 +0100)]
strategy: wip traversal

11 years agostrategy: notation: add \alg
Ian Jackson [Sun, 27 May 2012 18:04:19 +0000 (19:04 +0100)]
strategy: notation: add \alg

11 years agostrategy: new, wip, notational fixes
Ian Jackson [Sun, 27 May 2012 17:57:16 +0000 (18:57 +0100)]
strategy: new, wip, notational fixes

11 years agostrategy: new, wip, notational fixes
Ian Jackson [Sun, 27 May 2012 17:43:47 +0000 (18:43 +0100)]
strategy: new, wip, notational fixes

11 years agostrategy: new, wip, found
Ian Jackson [Sun, 27 May 2012 17:24:09 +0000 (18:24 +0100)]
strategy: new, wip, found

11 years agostrategy: new, wip
Ian Jackson [Sun, 13 May 2012 12:59:43 +0000 (13:59 +0100)]
strategy: new, wip

11 years agostrategy: new, wip
Ian Jackson [Sat, 12 May 2012 10:15:42 +0000 (11:15 +0100)]
strategy: new, wip

11 years agostrategy: new, wip
Ian Jackson [Fri, 11 May 2012 23:41:30 +0000 (00:41 +0100)]
strategy: new, wip

11 years agostrategy: new, wip
Ian Jackson [Fri, 11 May 2012 23:29:26 +0000 (00:29 +0100)]
strategy: new, wip

11 years agostrategy: new, wip
Ian Jackson [Fri, 11 May 2012 23:21:12 +0000 (00:21 +0100)]
strategy: new, wip

11 years agostrategy: wip
Ian Jackson [Tue, 1 May 2012 13:21:53 +0000 (14:21 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Mon, 30 Apr 2012 10:30:46 +0000 (11:30 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Sun, 29 Apr 2012 22:27:24 +0000 (23:27 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Sun, 29 Apr 2012 22:25:08 +0000 (23:25 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Sun, 29 Apr 2012 21:31:10 +0000 (22:31 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Fri, 27 Apr 2012 13:31:25 +0000 (14:31 +0100)]
strategy: wip

11 years agostrategy: rename \gref macros: perl -i~ -pe 's/gref([zcuf])/tip$1/g' *.tex
Ian Jackson [Fri, 27 Apr 2012 12:57:21 +0000 (13:57 +0100)]
strategy: rename \gref macros: perl -i~ -pe 's/gref([zcuf])/tip$1/g' *.tex

11 years agostrategy: wip
Ian Jackson [Fri, 27 Apr 2012 12:56:04 +0000 (13:56 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Fri, 27 Apr 2012 12:31:59 +0000 (13:31 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Fri, 27 Apr 2012 11:51:59 +0000 (12:51 +0100)]
strategy: wip

11 years agoinvariants: remove some slightly ugly colons
Ian Jackson [Fri, 27 Apr 2012 11:51:52 +0000 (12:51 +0100)]
invariants: remove some slightly ugly colons

11 years agostrategy: wip, notation changes, finished planning we think
Ian Jackson [Fri, 27 Apr 2012 11:22:19 +0000 (12:22 +0100)]
strategy: wip, notation changes, finished planning we think

11 years agonotation: change >_1 to >_1: so we can define \succ_1 slightly differently
Ian Jackson [Fri, 27 Apr 2012 11:22:01 +0000 (12:22 +0100)]
notation: change >_1 to >_1: so we can define \succ_1 slightly differently

11 years agostrategy: use \chapter
Ian Jackson [Fri, 27 Apr 2012 10:19:51 +0000 (11:19 +0100)]
strategy: use \chapter

11 years agostrategy: wip
Ian Jackson [Thu, 26 Apr 2012 00:04:53 +0000 (01:04 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Wed, 25 Apr 2012 22:06:25 +0000 (23:06 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Wed, 25 Apr 2012 21:14:11 +0000 (22:14 +0100)]
strategy: wip

11 years agostrategy: wip
Ian Jackson [Tue, 24 Apr 2012 00:41:07 +0000 (01:41 +0100)]
strategy: wip

11 years agostrategy: provide new \pc eg al
Ian Jackson [Tue, 24 Apr 2012 00:40:51 +0000 (01:40 +0100)]
strategy: provide new \pc eg al

12 years agomerge: fix dependency reinsertion blurb to mention the need for the base to be merged...
Ian Jackson [Wed, 18 Apr 2012 20:44:08 +0000 (21:44 +0100)]
merge: fix dependency reinsertion blurb to mention the need for the base to be merged first

12 years agounique tips: rename anticommit condition Unique Tip to Correct Tip
Ian Jackson [Wed, 18 Apr 2012 20:38:36 +0000 (21:38 +0100)]
unique tips: rename anticommit condition Unique Tip to Correct Tip

12 years agounique tips: fix various \pendsof and \pancsof to refer to \py not \p
Ian Jackson [Wed, 18 Apr 2012 20:37:05 +0000 (21:37 +0100)]
unique tips: fix various \pendsof and \pancsof to refer to \py not \p

12 years agounique tips: add condition and prove, for merge
Ian Jackson [Wed, 18 Apr 2012 20:34:13 +0000 (21:34 +0100)]
unique tips: add condition and prove, for merge

12 years agoprovide \bigexists
Ian Jackson [Wed, 18 Apr 2012 20:33:53 +0000 (21:33 +0100)]
provide \bigexists

12 years agounique tips: single parent unique tips applies to anticommit too
Ian Jackson [Wed, 18 Apr 2012 20:11:25 +0000 (21:11 +0100)]
unique tips: single parent unique tips applies to anticommit too

12 years agounique tips: single parent unique tips use cases
Ian Jackson [Wed, 18 Apr 2012 17:33:22 +0000 (18:33 +0100)]
unique tips: single parent unique tips use cases

12 years agounique tips: single parent unique tips lemma
Ian Jackson [Wed, 18 Apr 2012 17:27:03 +0000 (18:27 +0100)]
unique tips: single parent unique tips lemma

12 years agounique tips: add to list of invariants
Ian Jackson [Wed, 18 Apr 2012 17:18:09 +0000 (18:18 +0100)]
unique tips: add to list of invariants

12 years agofix typo f0.3
Ian Jackson [Tue, 27 Mar 2012 20:24:35 +0000 (21:24 +0100)]
fix typo

12 years agocomments from mdw - fix incorrect refs to B in create tip
Ian Jackson [Tue, 27 Mar 2012 19:07:00 +0000 (20:07 +0100)]
comments from mdw - fix incorrect refs to B in create tip

12 years agocomments from mdw - add note re universal quantification
Ian Jackson [Tue, 27 Mar 2012 18:17:34 +0000 (19:17 +0100)]
comments from mdw - add note re universal quantification

12 years agocomments from mdw - add section on \set to notation
Ian Jackson [Tue, 27 Mar 2012 18:14:20 +0000 (19:14 +0100)]
comments from mdw - add section on \set to notation

12 years agocomments from mdw - clarify that \p are disjoint by construction
Ian Jackson [Tue, 27 Mar 2012 18:14:08 +0000 (19:14 +0100)]
comments from mdw - clarify that \p are disjoint by construction

12 years agoclarify proof of calculation of ends
Ian Jackson [Mon, 26 Mar 2012 00:19:13 +0000 (01:19 +0100)]
clarify proof of calculation of ends

12 years agofix notation in calculation of ends
Ian Jackson [Mon, 26 Mar 2012 00:17:32 +0000 (01:17 +0100)]
fix notation in calculation of ends

12 years agoadd final.ps to default target
Ian Jackson [Sun, 25 Mar 2012 20:02:44 +0000 (21:02 +0100)]
add final.ps to default target

12 years agoclarify merge complex D=C
Ian Jackson [Sun, 25 Mar 2012 20:02:02 +0000 (21:02 +0100)]
clarify merge complex D=C

12 years agoget rid of a leftover spurious \neg[]
Ian Jackson [Sun, 25 Mar 2012 19:48:22 +0000 (20:48 +0100)]
get rid of a leftover spurious \neg[]

12 years agofix leftover \land
Ian Jackson [Sun, 25 Mar 2012 19:45:56 +0000 (20:45 +0100)]
fix leftover \land

12 years agocommentary about exhaustiveness
Ian Jackson [Sun, 25 Mar 2012 19:45:06 +0000 (20:45 +0100)]
commentary about exhaustiveness

12 years ago\nothaspatch with two slashes again as it's not equivalent to \neg \haspatch; partial...
Ian Jackson [Sun, 25 Mar 2012 19:41:28 +0000 (20:41 +0100)]
\nothaspatch with two slashes again as it's not equivalent to \neg \haspatch; partial revert of d00298b5b6d70bd919824ab8b79d71663f3cdfa6

12 years agorefactor for coherence cases - merge
Ian Jackson [Wed, 21 Mar 2012 21:47:29 +0000 (21:47 +0000)]
refactor for coherence cases - merge

12 years agorefactor for coherence cases - simple, fix leftover ~
Ian Jackson [Wed, 21 Mar 2012 21:44:57 +0000 (21:44 +0000)]
refactor for coherence cases - simple, fix leftover ~

12 years agorefactor for coherence cases - anticommit
Ian Jackson [Wed, 21 Mar 2012 21:42:22 +0000 (21:42 +0000)]
refactor for coherence cases - anticommit

12 years agofix wrong symbols in simple
Ian Jackson [Wed, 21 Mar 2012 21:37:38 +0000 (21:37 +0000)]
fix wrong symbols in simple

12 years agorefactor for coherence cases - simple, more
Ian Jackson [Wed, 21 Mar 2012 21:37:25 +0000 (21:37 +0000)]
refactor for coherence cases - simple, more

12 years agorefactor for coherence cases - simple
Ian Jackson [Wed, 21 Mar 2012 21:34:24 +0000 (21:34 +0000)]
refactor for coherence cases - simple

12 years agowip exclusive haspatch - clarify Merge Coherence (for neither haspatch)
Ian Jackson [Wed, 21 Mar 2012 21:26:03 +0000 (21:26 +0000)]
wip exclusive haspatch - clarify Merge Coherence (for neither haspatch)

12 years agowip exclusive haspatch - fix Merge Coherence (for disagree)
Ian Jackson [Wed, 21 Mar 2012 21:25:48 +0000 (21:25 +0000)]
wip exclusive haspatch - fix Merge Coherence (for disagree)

12 years agowip exclusive haspatch - fix Merge Coherence (for both haspatch)
Ian Jackson [Wed, 21 Mar 2012 21:25:27 +0000 (21:25 +0000)]
wip exclusive haspatch - fix Merge Coherence (for both haspatch)

12 years agowip exclusive haspatch - fix Anticommit
Ian Jackson [Wed, 21 Mar 2012 21:08:28 +0000 (21:08 +0000)]
wip exclusive haspatch - fix Anticommit

12 years agowip exclusive haspatch - fix Anticommit wip
Ian Jackson [Wed, 21 Mar 2012 18:36:31 +0000 (18:36 +0000)]
wip exclusive haspatch - fix Anticommit wip

12 years agowip exclusive haspatch - fix Create Tip
Ian Jackson [Wed, 21 Mar 2012 18:34:38 +0000 (18:34 +0000)]
wip exclusive haspatch - fix Create Tip

12 years agowip exclusive haspatch - fix Create Base
Ian Jackson [Wed, 21 Mar 2012 18:29:47 +0000 (18:29 +0000)]
wip exclusive haspatch - fix Create Base