Merge branch 'master' of https://gitlab.cis.strath.ac.uk/kwb13215/quantera-2

NEWPROPOSAL/FULLPROP.tex

@@ -1114,7 +1114,7 @@ The work plan has four major scientific work packages,
 which will proceed in parallel, and all will have at least some activities
 throughout the length of the project.  (There is also a fifth
 work package grouping administrative and organisational activities.)
-\begin{description}
+\begin{description} 
 \item[\ref{wp:frontend}] is focussed on \newt{the \dzxc interface with known high-level quantum programming languages} 
 %translating from HLLs into \azx, reflecting higher level programming constructs into \azx, 
 and building a test suite of programs.
@@ -1316,7 +1316,7 @@ Devise test-suite of concrete instances of circuits and
 %%%
 \begin{WP}{Representation, reasoning, and resources in \zx}{1M}{36M}{wp:backends}
 \WPleaderPOL
-\WPeffort{\newt{12}}{\newt{12}}{\newt{14}}{\newt{4}}{\newt{42}}{\newt{6}}
+\WPeffort{\newt{12}}{\newt{12}}{\newt{14}}{\newt{4}}{\newt{30}}{\newt{6}}
 \begin{WPaim}
 %We build the theoretical foundations for \zx as an intermediate representation. This includes extending the capabilities of \zx to represent mixed states, qudit states, and control flows. We use \zx axiomatisations and automated theorem provers to extract out post-classical computing resources, which will be used both for further optimisation work, and for characterisation of quantum algorithmic speed-up.
 We build the theoretical foundations for \zx as an intermediate representation. This includes extending the capabilities of \zx to represent qudit states with a fixed $d$, arbitrary finite-dimensional quantum states, and control flows. We explore the structure of W-type tensors with interaction with \zx generators of GHZ-type. We use \zx axiomatisations and automated theorem provers to extract out post-classical computing resources, which will be used both for further optimisation work, and for characterisation of quantum algorithmic speed-up.
@@ -1454,7 +1454,7 @@ Perdrix, Valiron, Carette.}
 %%%
 \begin{WP}{Machine-dependent optimisation}{1M}{36M}{wp:usefulstuff}
   \WPleaderGREN
-  \WPeffort{0}{9}{0}{0}{\newt{6}}{0}
+  \WPeffort{12}{9}{12}{6}{\newt{6}}{0}
   \begin{WPaim}
 We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon quantum dot devices developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be \ldots.
 Also machine-dependent error correction here?
@@ -1505,7 +1505,7 @@ Also machine-dependent error correction here?
 \end{WP}
 
 \REM{\emph{Leader:} Kissinger.
-\emph{Others:} Abramsky, de Beaudrap, Duncan, Jeandel, Perdrix,
+\emph{Others:} Abramsky, de Beaudrap, Duncan, Jeandel, Perdrix, 
 Staton, Carette.}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1559,7 +1559,8 @@ Staton, Carette.}
 \paragraph{Work package overview}
 \label{sec:work-pack-overv}
 
-\bR \begin{center}
+\TODOb{All checked; please don't change, only fix if broke!} 
+\newt{\begin{center}
   \begin{tabular}{|p{0.2\textwidth}|c|c|c|c|c|c|}
     \hline
     \textbf{Partner} 
@@ -1569,15 +1570,15 @@ Staton, Carette.}
     & \ref{wp:usefulstuff} 
     & \ref{wp:admin} 
     & \textbf{TOTAL} \\\hline
-1. Grenoble   &  0 & \newt{12} & \newt{12} & 15 & 3  & 48 \\\hline
-2. LORIA      & 14 & \newt{12} & \newt{9} & 9  & 3  & 47 \\\hline
-3. Oxford     & 32 & \newt{14} & \newt{30} & 18 & 2  & 84 \\\hline
-4. CQC        &  5 & \newt{4} & \newt{12} &  5 & 1  & 29 \\\hline
-5. Gdansk     &  \newt{12} & \newt{42} & \newt{12} & \newt{6} & \newt{4}  & \newt{76} \\\hline
-6. Nijmegen   &  3 & \newt{6} & \newt{12} & 21 & 2  & 51 \\\hline
-\textbf{TOTAL}& 47 & \newt{90} & \newt{81} & 75 & 11 & 299   \\\hline
+1. Grenoble   &  12 & 12 & 12 & 12 & 3  & 51 \\\hline
+2. LORIA      & 14 & 12 & 9  & 9  & 3  & 47 \\\hline
+3. Oxford     & 32 & 14 & 30 & 12 & 2  & 90 \\\hline
+4. CQC        &  5 & 4  & 12 &  6 & 1  & 28 \\\hline
+5. Gdansk     &  12& 30 & 12 & 6 & 4  & 64 \\\hline
+6. Nijmegen   &  3 & 6  & 12 & 0 & 2  & 23 \\\hline
+\textbf{TOTAL}& 78 & 78 & 87 & 45 & 11 & 299   \\\hline 
   \end{tabular}
-\end{center}\e
+\end{center}}
 
 \REM{(total effort per WP and partner in person.months)}