Merge branch 'master' of ssh://gitlab:2222/kwb13215/quantera-2

NEWPROPOSAL/FULLPROP.tex

@@ -1298,7 +1298,7 @@ Devise test-suite of concrete instances of circuits and
 %%%
 \begin{WP}{Representation, reasoning, and resources in \zx}{1M}{36M}{wp:backends}
 \WPleaderPOL
-\WPeffort{{12}}{{12}}{{14}}{{4}}{{42}}{{6}}
+\WPeffort{{2}}{{12}}{{14}}{{4}}{{42}}{{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.
@@ -1436,7 +1436,7 @@ Perdrix, Valiron, Carette.}
 %%%
 \begin{WP}{Machine-dependent optimisation}{13M}{36M}{wp:usefulstuff}
   \WPleaderGREN
-  \WPeffort{12}{9}{12}{6}{6}{0}
+  \WPeffort{20}{9}{12}{6}{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 spin qubits 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?
@@ -1553,13 +1553,13 @@ Staton, Carette.}
     & \ref{wp:usefulstuff} 
     & \ref{wp:admin} 
     & \textbf{TOTAL} \\\hline
-1. Grenoble   &  12 & 2 & 12 & 12 & 3  & 41 \\\hline
+1. Grenoble   &  12 & 2 & 12 & 20 & 3  & 49 \\\hline
 2. LORIA      & 20 & 12 & 9  & 9  & 3  & 53 \\\hline
 3. Oxford     & 32 & 14 & 30 & 12 & 2  & 90 \\\hline
-4. CQC        &  12 & 4  & 12 &  6 & 1  & 28 \\\hline
+4. CQC        &  12 & 4  & 12 &  6 & 1  & 35 \\\hline
 5. Gdansk     &  12& 42 & 12 & 6 & 4  & 76 \\\hline
-6. Nijmegen   &  3 & 6  & 12 & 0 & 2  & 23 \\\hline
-\textbf{TOTAL}& 91 & 80 & 87 & 45 & 11 & 317   \\\hline 
+6. Nijmegen   &  3 & 6  & 12 & 0 & 0  & 21 \\\hline
+\textbf{TOTAL}& 91 & 80 & 87 & 53 & 13 & 324   \\\hline 
   \end{tabular}
 \end{center}}