From 1cdfc9b6e2c791652d509090d453216ee930973a Mon Sep 17 00:00:00 2001
From: Emmanuel Jeandel <ejeandel@free.fr>
Date: Fri, 15 Feb 2019 13:24:30 +0100
Subject: [PATCH] gant/pert uptodate (will they disappear at some point ?)
---
NEWPROPOSAL/figures/pert.tikz | 35 ++++++++++++++++-------------------
NEWPROPOSAL/ganttchart.tex | 30 +++++++++++++++++-------------
2 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/NEWPROPOSAL/figures/pert.tikz b/NEWPROPOSAL/figures/pert.tikz
index dd984fd..14d735c 100644
--- a/NEWPROPOSAL/figures/pert.tikz
+++ b/NEWPROPOSAL/figures/pert.tikz
@@ -1,24 +1,22 @@
\begin{tikzpicture}
\begin{pgfonlayer}{nodelayer}
- \node [style=wpred] (0) at (4, 4) {\ref{task:trans1}};
- \node [style=wpred] (1) at (-4, 4) {\ref{task:transQASM}};
+ \node [style=wpred] (0) at (2, 4) {\ref{task:trans1}};
+ \node [style=wpred] (1) at (-4, 4) {\ref{task:HHL}};
\node [style=wpred] (2) at (-4, 3) {\ref{task:testBench}};
- \node [style=wpred] (3) at (0, 4) {\ref{task:transHLL}};
- \node [style=wpyellow] (4) at (-4, -1) {\ref{task:circuit-model}};
- \node [style=wpyellow] (5) at (-4, 1) {\ref{task:mbqc-model}};
- \node [style=wpyellow] (6) at (-2, -3.5) {\ref{task:HPC-sim-model}};
- \node [style=wpyellow] (7) at (0.25, -1.5) {\ref{task:delft-model}};
- \node [style=wpyellow] (8) at (0.25, 1) {\ref{task:NQIT-model}};
- \node [style=wpgreen] (9) at (-4, -2) {\ref{task:axioms}};
+ \node [style=wpred] (4) at (-4, -1) {\ref{task:circuit-model}};
+ \node [style=wpred] (5) at (-4, 1) {\ref{task:mbqc-model}};
+ \node [style=wpblue] (7) at (0.25, -1.5) {\ref{task:qdot-model}};
+ \node [style=wpblue] (8) at (0.25, 1) {\ref{task:NQIT-model}};
+ \node [style=wpyellow] (9) at (-4, -2) {\ref{task:axioms}};
\node [style=wpgreen] (10) at (-4, -3) {\ref{task:algorithms}};
- \node [style=wpgreen] (11) at (-4, 2) {\ref{task:betterboxes}};
+ \node [style=wpyellow] (11) at (-4, 2) {\ref{task:betterboxes}};
\node [style=wpgreen] (12) at (-2, 1) {\ref{task:annotate1}};
\node [style=wpgreen] (13) at (-2, -1) {\ref{task:annotate2}};
- \node [style=wpblue] (14) at (0.25, -2.5) {\ref{task:basic-opt}};
- \node [style=wpblue] (15) at (2, 3) {\ref{task:ECC}};
+ \node [style=wpgreen] (14) at (0.25, -2.5) {\ref{task:basic-opt}};
+ \node [style=wpgreen] (15) at (2, 3) {\ref{task:ECC}};
\node [style=wpblue] (16) at (2, 2) {\ref{task:runnable}};
\node [style=wpblue] (17) at (2, -0.25) {\ref{task:opt-machine}};
- \node [style=wpblue] (18) at (4, 2) {\ref{task:backendapi}};
+ \node [style=wpred] (18) at (4, 2) {\ref{task:backendapi}};
\node [style=none] (19) at (3.5, -2.5) {};
\node [style=none] (20) at (5.5, -2.5) {};
\node [style=none] (21) at (3.5, -3.5) {};
@@ -30,7 +28,9 @@
\node [style=none] (27) at (6, -4) {};
\node [style=none] (28) at (3, -4) {};
\node [style=none] (29) at (-6, 0) {};
- \end{pgfonlayer}
+ \node [style=wpyellow] (30) at (-4, -4) {\ref{task:resources}};
+ \node [style=wpyellow] (31) at (-4, -5) {\ref{task:resourcesagain}};
+\end{pgfonlayer}
\begin{pgfonlayer}{edgelayer}
\draw [style=NEED] (10) to (14);
\draw [style=NEED] (9) to (14);
@@ -39,6 +39,7 @@
\draw [style=NEED] (4) to (13);
\draw [style=NEED] (5) to (12);
\draw [style=NEED] (4) to (12);
+ \draw [bend right=90, style=influence] (1) to (11);
\draw [style=influence] (13) to (7);
\draw [style=influence] (12) to (7);
\draw [style=influence] (13) to (8);
@@ -46,9 +47,7 @@
\draw [style=NEED] (17) to (18);
\draw [style=NEED] (15) to (18);
\draw [style=NEED] (16) to (18);
- \draw [style=NEED] (1) to (3);
\draw [style=influence] (2) to (1);
- \draw [style=influence] (2) to (3);
\draw [style=NEED] (12) to (17);
\draw [style=NEED] (13) to (17);
\draw [style=NEED] (12) to (16);
@@ -56,11 +55,9 @@
\draw [style=influence] (8) to (17);
\draw [style=influence] (7) to (16);
\draw [style=influence] (8) to (16);
- \draw [style=influence] (10) to (6);
\draw [style=influence] (21.center) to (22.center);
\draw [style=NEED] (19.center) to (20.center);
- \draw [style=NEED] (3) to (0);
- \draw [style=NEED] (11) to (3);
+ \draw [style=NEED] (1) to (0);
\draw [style=influence] (14) to (17);
\draw [style=influence] (11) to (2);
\draw (25.center) to (26.center);
diff --git a/NEWPROPOSAL/ganttchart.tex b/NEWPROPOSAL/ganttchart.tex
index 24cf612..e1b18f0 100644
--- a/NEWPROPOSAL/ganttchart.tex
+++ b/NEWPROPOSAL/ganttchart.tex
@@ -28,31 +28,35 @@
\\
%%%% WP 1
\ganttset{bar/.append style={fill=red!50}}
- \ganttbar{\ref{task:transQASM} QASM $\to$ \azx}{1}{6}\\
- \ganttbar{\ref{task:transHLL} HLL $\to$ \azx}{7}{36}\\
+ \ganttbar{\ref{task:HHL} HLL $\to$ \azx}{1}{36}\\
\ganttbar{\ref{task:trans1} Front-end API}{1}{36}\\
- \ganttbar{\ref{task:testBench} Test Suite}{3}{36}\\
+ \ganttbar{\ref{task:testBench} Test Suite}{6}{36}\\
+ \ganttbar{\ref{task:circuit-model} Circuit model}{1}{12}\\
+ \ganttbar{\ref{task:mbqc-model} 1WQC model}{1}{15}\\
+ \ganttbar{\ref{task:backendapi} Back-end API}{33}{36}\\
%%%% WP 2
\ganttset{bar/.append style={fill=yellow}}
- \ganttbar{\ref{task:circuit-model} Circuit model}{1}{9}\\
- \ganttbar{\ref{task:mbqc-model} 1WQC model}{1}{12}\\
- \ganttbar{\ref{task:HPC-sim-model} HPC simulator}{10}{24}\\
- \ganttbar{\ref{task:delft-model} Superconducting model}{13}{30}\\
- \ganttbar{\ref{task:NQIT-model} NQIT model}{13}{36}\\
+ \ganttbar{\ref{task:axioms} Beyond qubits}{1}{14}\\
+ \ganttbar{\ref{task:betterboxes} Control constructs in \azx}{1}{18}\\
+ \ganttbar{\ref{task:resources} Resources and axioms}{1}{36}\\
+ \ganttbar{\ref{task:resourcesagain} Computational resources}{12}{36}\\
+
+
+% \ganttbar{\ref{task:HPC-sim-model} HPC simulator}{10}{24}\\
+% \ganttbar{\ref{task:delft-model} Superconducting model}{13}{30}\\
%%%% WP 3
\ganttset{bar/.append style={fill=green!50}}
\ganttbar{\ref{task:algorithms} Algorithms for \azx}{1}{24}\\
- \ganttbar{\ref{task:axioms} Beyond qubits}{1}{12}\\
- \ganttbar{\ref{task:betterboxes} Control constructs in \azx}{1}{18}\\
\ganttbar{\ref{task:annotate1} Topology and causality}{13}{24}\\
\ganttbar{\ref{task:annotate2} Quantitative properties}{13}{24}\\
-%%% WP 4
- \ganttset{bar/.append style={fill=blue!50}}
\ganttbar{\ref{task:basic-opt} Model-independent optimisations}{13}{24}\\
\ganttbar{\ref{task:ECC} Error Correction}{1}{24}\\
+%%% WP 4
+ \ganttset{bar/.append style={fill=blue!50}}
+ \ganttbar{\ref{task:qdot-model} Quantum dot model}{13}{36}\\
+ \ganttbar{\ref{task:NQIT-model} NQIT model}{13}{36}\\
\ganttbar{\ref{task:runnable} Execution layout}{16}{30}\\
\ganttbar{\ref{task:opt-machine} Model-guided optimisations}{22}{36}\\
- \ganttbar{\ref{task:backendapi} Back-end API}{33}{36}\\
%%% WP 5 -- don't use
% \ganttset{bar/.append style={fill=gray!50}}
% \ganttbar{\ref{task:admin} \REM{Title}{1}{36}
--
GitLab