Changeset 1442 for Deliverables/D4.2-4.3

Timestamp:

Oct 21, 2011, 6:00:03 PM (9 years ago)

Author:

mulligan

Message:

changes fixing wrong deletion of conflicts

File:

• Deliverables/D4.2-4.3/reports/D4-2.tex (modified) (3 diffs)

Deliverables/D4.2-4.3/reports/D4-2.tex

@@ -427 +427 @@
 These axiomatised components are found in the ERTL to LTL pass.
 
-It should be noted that these axiomatised components fall into the following pattern: whilst their implementation is complex, and their proof of correctness is difficult, we are able to quickly and easily verify that any answer that they provide is correct.
-Therefore, we plan to provide implementations in OCaml only, and to provide certified verifiers in Matita.
+It should be noted that these axiomatised components fall into the following pattern: whilst their implementation is complex, and their proof of correctness is difficult, we are able to quickly and easily verify that any answer that they provide is correct. Therefore, we plan to provide implementations in OCaml only,
+and to provide certified verifiers in Matita.
 At the moment, the implementation of the certified verifiers is left as future work.
 \item
@@ -566 +566 @@
 \texttt{ERTL/Interference.ma} & Axiomatised graph colouring component & \texttt{common/interference.ml} & 0.03\tnote{c} \\
 \texttt{ERTL/liveness.ma} & Liveness analysis & \texttt{ERTL/liveness.ml} & 0.92 \\
-\texttt{LTL/LTLToLIN.ma} & Translation from LTL to LIN & \texttt{LTL/LTLToLIN.ml} & 0.53 \tnote{c} \\
+\texttt{LTL/LTLToLIN.ma} & Translation from LTL to LIN & \texttt{LTL/LTLToLIN.ml} & 0.53\tnote{c} \\
 \texttt{LIN/joint\_LTL\_LIN.ma} & Generic code for LTL and LIN languages & N/A & N/A \\
 \texttt{LIN/LINToASM.ma} & Translation from LIN to assembly & \texttt{LIN/LINToASM.ml} & 2.85\tnote{d}
@@ -575 +575 @@
   \item[c] Includes \texttt{joint/TranslateUtils.ma}, \texttt{LTL/LTLToLINI.ml} and \texttt{joint/joint\_LTL\_LIN.ma}.
   \item[d] Includes \texttt{joint/TranslateUtils.ma}, and \texttt{joint/joint\_LTL\_LIN.ma}.\\
-  Total lines of Matita code for the above files: 3032. \\
-  Total lines of O'Caml code for the above files: 3332. \\
-  Ration of total lines: 0.91.
+  \begin{tabular}{ll}
+  Total lines of Matita code for the above files:& 3032. \\
+  Total lines of O'Caml code for the above files:& 3332. \\
+  Ration of total lines:& 0.91.
+  \end{tabular}
 \end{tablenotes}
 \end{threeparttable}