chiark / gitweb /
topbloke-formulae.git
12 years agostrategy: wip
Ian Jackson [Thu, 26 Apr 2012 00:04:53 +0000 (01:04 +0100)]
strategy: wip

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

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

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

12 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

12 years agosimple - improve title cap
Ian Jackson [Wed, 21 Mar 2012 18:28:07 +0000 (18:28 +0000)]
simple - improve title cap

12 years agowip exclusive haspatch - fix Simple / Coherence
Ian Jackson [Wed, 21 Mar 2012 18:26:35 +0000 (18:26 +0000)]
wip exclusive haspatch - fix Simple / Coherence

12 years agosimple commit fix P notation
Ian Jackson [Wed, 21 Mar 2012 18:22:59 +0000 (18:22 +0000)]
simple commit fix P notation

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

12 years agowip exclusive haspatch - fix Tip Own Contents
Ian Jackson [Wed, 21 Mar 2012 18:20:04 +0000 (18:20 +0000)]
wip exclusive haspatch - fix Tip Own Contents

12 years agowip exclusive haspatch - change notation to F in defn
Ian Jackson [Wed, 21 Mar 2012 18:17:15 +0000 (18:17 +0000)]
wip exclusive haspatch - change notation to F in defn

12 years agowip exclusive haspatch - reorder notation
Ian Jackson [Wed, 21 Mar 2012 18:16:42 +0000 (18:16 +0000)]
wip exclusive haspatch - reorder notation

12 years agowip exclusive haspatch - better kerning
Ian Jackson [Tue, 20 Mar 2012 18:03:23 +0000 (18:03 +0000)]
wip exclusive haspatch - better kerning

12 years agowip exclusive haspatch - better symbol
Ian Jackson [Tue, 20 Mar 2012 15:23:31 +0000 (15:23 +0000)]
wip exclusive haspatch - better symbol

12 years agowip exclusive haspatch - notation
Ian Jackson [Tue, 20 Mar 2012 15:10:19 +0000 (15:10 +0000)]
wip exclusive haspatch - notation

12 years agoswap L and R headers and footers, better for 2-up output etc.
Ian Jackson [Sun, 18 Mar 2012 11:46:51 +0000 (11:46 +0000)]
swap L and R headers and footers, better for 2-up output etc.

12 years agorevid - use "git foo" not "git-foo"
Ian Jackson [Sun, 18 Mar 2012 11:43:36 +0000 (11:43 +0000)]
revid - use "git foo" not "git-foo"

12 years agorevid - better deps
Ian Jackson [Sun, 18 Mar 2012 11:29:20 +0000 (11:29 +0000)]
revid - better deps

12 years agomake clean - remove *.ps
Ian Jackson [Sun, 18 Mar 2012 11:27:58 +0000 (11:27 +0000)]
make clean - remove *.ps

12 years agorevid - include
Ian Jackson [Sun, 18 Mar 2012 11:27:23 +0000 (11:27 +0000)]
revid - include

12 years agorevid - make more suitable for us
Ian Jackson [Sun, 18 Mar 2012 11:26:58 +0000 (11:26 +0000)]
revid - make more suitable for us

12 years ago.git-revid from my trains.git
Ian Jackson [Sun, 18 Mar 2012 11:15:28 +0000 (11:15 +0000)]
.git-revid from my trains.git

12 years agomore sophisticated makefile (make once etc.)
Ian Jackson [Sun, 18 Mar 2012 11:10:13 +0000 (11:10 +0000)]
more sophisticated makefile (make once etc.)

12 years agomerge coherence complex - remove unneeded ref to def of haspatch
Ian Jackson [Sun, 18 Mar 2012 11:00:01 +0000 (11:00 +0000)]
merge coherence complex - remove unneeded ref to def of haspatch

12 years agomerge coherence complex - fix proof intro re haspatch nonexclusivity
Ian Jackson [Sun, 18 Mar 2012 10:59:16 +0000 (10:59 +0000)]
merge coherence complex - fix proof intro re haspatch nonexclusivity

12 years agofix non-topbloke merges empty ends proof
Ian Jackson [Sun, 18 Mar 2012 10:55:40 +0000 (10:55 +0000)]
fix non-topbloke merges empty ends proof

12 years agorationalise patch notation names - anticommit
Ian Jackson [Sun, 18 Mar 2012 10:51:23 +0000 (10:51 +0000)]
rationalise patch notation names - anticommit

12 years agoprovide \pl etc.
Ian Jackson [Sun, 18 Mar 2012 10:51:07 +0000 (10:51 +0000)]
provide \pl etc.

12 years agorationalise patch notation names - annotations
Ian Jackson [Sun, 18 Mar 2012 10:44:03 +0000 (10:44 +0000)]
rationalise patch notation names - annotations

12 years agorename Tip Self Contents -> Tip Own Contents f0.2
Ian Jackson [Fri, 16 Mar 2012 23:47:45 +0000 (23:47 +0000)]
rename Tip Self Contents -> Tip Own Contents

12 years agorename Tip Self Inpatch -> Tip Self Contents
Ian Jackson [Fri, 16 Mar 2012 23:46:59 +0000 (23:46 +0000)]
rename Tip Self Inpatch -> Tip Self Contents

12 years agosmall fixes
Ian Jackson [Fri, 16 Mar 2012 23:45:16 +0000 (23:45 +0000)]
small fixes

12 years agonon-topbloke merges fix merge ends proof
Ian Jackson [Fri, 16 Mar 2012 23:39:37 +0000 (23:39 +0000)]
non-topbloke merges fix merge ends proof

12 years agobe more rigorous about conformance
Ian Jackson [Fri, 16 Mar 2012 23:14:18 +0000 (23:14 +0000)]
be more rigorous about conformance

12 years agoadd note about non-exclusivity of \haspatch and \nothaspatch
Ian Jackson [Fri, 16 Mar 2012 23:00:18 +0000 (23:00 +0000)]
add note about non-exclusivity of \haspatch and \nothaspatch

12 years agouse new extended Self Tip Inpatch
Ian Jackson [Fri, 16 Mar 2012 23:00:00 +0000 (23:00 +0000)]
use new extended Self Tip Inpatch

12 years agoextend Self Tip Inpatch
Ian Jackson [Fri, 16 Mar 2012 22:53:39 +0000 (22:53 +0000)]
extend Self Tip Inpatch

12 years agoremove a couple of spurious $\qed$
Ian Jackson [Fri, 16 Mar 2012 22:43:22 +0000 (22:43 +0000)]
remove a couple of spurious $\qed$

12 years agoremove spurious .
Ian Jackson [Fri, 16 Mar 2012 22:40:45 +0000 (22:40 +0000)]
remove spurious .

12 years agomerge fixes/clarifications - clarify and fix tip contents R \in \py
Ian Jackson [Fri, 16 Mar 2012 22:34:19 +0000 (22:34 +0000)]
merge fixes/clarifications - clarify and fix tip contents R \in \py

12 years agomerge fixes/clarifications - clarify tip contents R \not\in \py
Ian Jackson [Fri, 16 Mar 2012 22:28:31 +0000 (22:28 +0000)]
merge fixes/clarifications - clarify tip contents R \not\in \py

12 years agomerge fixes/clarifications - sort out complex case D = C
Ian Jackson [Fri, 16 Mar 2012 22:25:11 +0000 (22:25 +0000)]
merge fixes/clarifications - sort out complex case D = C

12 years agomerge fixes/clarifications - fix several P to \p
Ian Jackson [Fri, 16 Mar 2012 22:00:55 +0000 (22:00 +0000)]
merge fixes/clarifications - fix several P to \p

12 years agomerge fixes/clarifications - remove wrong "on R"
Ian Jackson [Fri, 16 Mar 2012 21:59:19 +0000 (21:59 +0000)]
merge fixes/clarifications - remove wrong "on R"

12 years agomerge fixes/clarifications - add missing \
Ian Jackson [Fri, 16 Mar 2012 21:59:10 +0000 (21:59 +0000)]
merge fixes/clarifications - add missing \

12 years agomerge fixes/clarifications - clarify Non-Topbloke merges - add a wlog
Ian Jackson [Fri, 16 Mar 2012 21:57:23 +0000 (21:57 +0000)]
merge fixes/clarifications - clarify Non-Topbloke merges - add a wlog

12 years agomerge fixes/clarifications - clarify Non-Topbloke merges
Ian Jackson [Fri, 16 Mar 2012 21:55:51 +0000 (21:55 +0000)]
merge fixes/clarifications - clarify Non-Topbloke merges

12 years agomerge fixes/clarifications - relax Foreign Merges
Ian Jackson [Fri, 16 Mar 2012 21:55:38 +0000 (21:55 +0000)]
merge fixes/clarifications - relax Foreign Merges

12 years agomerge fixes/clarifications - change , to \land
Ian Jackson [Fri, 16 Mar 2012 21:55:25 +0000 (21:55 +0000)]
merge fixes/clarifications - change , to \land

12 years agosplit into multiple source files
Ian Jackson [Fri, 16 Mar 2012 21:47:37 +0000 (21:47 +0000)]
split into multiple source files

12 years agoremove a spurious \newpage
Ian Jackson [Fri, 16 Mar 2012 21:36:15 +0000 (21:36 +0000)]
remove a spurious \newpage

12 years agomerge ends conditions change order of precondition to put M in middle, for clarity
Ian Jackson [Thu, 15 Mar 2012 19:20:27 +0000 (19:20 +0000)]
merge ends conditions change order of precondition to put M in middle, for clarity

12 years agowording improvement
Ian Jackson [Thu, 15 Mar 2012 19:19:17 +0000 (19:19 +0000)]
wording improvement

12 years agomention that merge can be used for dependency reinsertion
Ian Jackson [Thu, 15 Mar 2012 19:19:07 +0000 (19:19 +0000)]
mention that merge can be used for dependency reinsertion

12 years agoRevert "rename anticommit section"
Ian Jackson [Thu, 15 Mar 2012 19:14:25 +0000 (19:14 +0000)]
Revert "rename anticommit section"

This reverts commit 8649610cb4d7ce51cda5040bf9f17c05636b016f.

12 years agoRevert all "wip dependency insertion"
Ian Jackson [Thu, 15 Mar 2012 19:14:03 +0000 (19:14 +0000)]
Revert all "wip dependency insertion"

This is actually a subcase of Merge.

Revert "wip dependency insertion"

This reverts commit 12818e0da31738adbaecf129c1e697633d371cf8.

Revert "wip dependency insertion"

This reverts commit c39f3f1f5a5df2a4d628f335f7aaad44c0f68913.

Revert "wip dependency insertion"

This reverts commit e41fe6dd695b0354aa46929828f0d4ffd604f643.

Revert "wip dependency insertion"

This reverts commit 2e2c0cd70b9a6819e2289a7b07addb6e19f5012c.

Revert "wip dependency insertion"

This reverts commit d357159ce17651ed7deba459e32400636973b827.

Revert "wip dependency insertion"

This reverts commit c759fdf5965e18b0fc6f713b22526ec9464ed7f7.

Revert "wip dependency insertion"

This reverts commit de686ee8ee88dade41eb58f604a89f901b3a13a1.

Revert "wip dependency insertion"

This reverts commit fc96ba0c73d771839a025fc5cb771554cf178eaa.

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 23:22:20 +0000 (23:22 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 23:18:50 +0000 (23:18 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 23:12:18 +0000 (23:12 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 22:10:04 +0000 (22:10 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:37:49 +0000 (18:37 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:35:06 +0000 (18:35 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:30:42 +0000 (18:30 +0000)]
wip dependency insertion

12 years agowip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:27:25 +0000 (18:27 +0000)]
wip dependency insertion

12 years agorename anticommit section
Ian Jackson [Wed, 14 Mar 2012 18:20:13 +0000 (18:20 +0000)]
rename anticommit section