From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 12 Mar 2012 15:15:51 +0000 (+0000)
Subject: proof of alternative merge formulation
X-Git-Tag: f0.2~50
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=8d7b149b51ee761db2300244444a0dd09b612b27;p=topbloke-formulae.git

proof of alternative merge formulation
---

diff --git a/article.tex b/article.tex
index e6cc12a..1dd625f 100644
--- a/article.tex
+++ b/article.tex
@@ -218,10 +218,25 @@ We maintain these each time we construct a new commit. \\
     \text{as above with L and R exchanged}
   \end{cases}
 }\]
-\proof{
-  Truth table xxx
-
-  Original definition is symmetrical in $L$ and $R$.
+\proof{ ~ Truth table (ordered by original definition): \\
+  \begin{tabular}{cccc|c|cc}
+     $D = C$ &
+          $\isin L$ &
+               $\isin M$ &
+                    $\isin R$ & $\isin C$ &
+                                      $L$ vs. $R$ & $L$ vs. $M$
+  \\\hline
+     y &  ? &  ? &  ?      &      y   & ?         & ?            \\
+     n &  y &  y &  y      &      y   & $\equiv$  & $\equiv$     \\
+     n &  y &  n &  y      &      y   & $\equiv$  & $\nequiv$    \\
+     n &  n &  y &  n      &      n   & $\equiv$  & $\nequiv$    \\
+     n &  n &  n &  n      &      n   & $\equiv$  & $\equiv$     \\
+     n &  y &  y &  n      &      n   & $\nequiv$ & $\equiv$     \\
+     n &  n &  y &  y      &      n   & $\nequiv$ & $\nequiv$    \\
+     n &  y &  n &  n      &      y   & $\nequiv$ & $\nequiv$    \\
+     n &  n &  n &  y      &      y   & $\nequiv$ & $\equiv$     \\
+  \end{tabular} \\
+  And original definition is symmetrical in $L$ and $R$.
 }
 
 \[ \eqn{Exclusive Tip Contents:}{