diff options
| -rw-r--r-- | paper.tex | 10 | ||||
| -rw-r--r-- | tex/src/figure-branching.tex | 56 | ||||
| -rw-r--r-- | tex/src/preamble-project.tex | 1 |
3 files changed, 36 insertions, 31 deletions
@@ -342,12 +342,15 @@ Where exact reproducibility is not possible, values can be verified by any stati \begin{figure*}[t] \begin{center} \includetikz{figure-branching}{scale=1}\end{center} \vspace{-3mm} - \caption{\label{fig:branching} Maneage is a Git branch. Projects using Maneage are branched off it and apply their customizations. + \caption{\label{fig:branching} Maneage is a Git branch. + Projects using Maneage are branched off it and apply their customizations. (a) A hypothetical project's history prior to publication. The low-level structure (in Maneage, shared between all projects) can be updated by merging with Maneage. (b) A finished/published project can be revitalized for new technologies by merging with the core branch. - Each Git ``commit'' is shown on its branch as a colored ellipse, with its commit hash shown. - The commits are colored to identify their branch. + Each Git ``commit'' is shown on its branch as a colored ellipse, with its commit hash shown and colored to identify the team that is/was working on the branch. + Briefly, Git is a version control system, allowing a structured backup of project files. + Each Git ``commit'' effectively contains a copy all the project's files, at the moment it was made. + The upward arrows at the branch-tops are therefore in the direction of time. } \end{figure*} @@ -478,6 +481,7 @@ Antonio D\'iaz D\'iaz, Surena Fatemi, Fabrizio Gagliardi, Konrad Hinsen, +Marios Karouzos, Mohammad-reza Khellat, Johan Knapen, Tamara Kovazh, diff --git a/tex/src/figure-branching.tex b/tex/src/figure-branching.tex index 56a76e8..56c1652 100644 --- a/tex/src/figure-branching.tex +++ b/tex/src/figure-branching.tex @@ -17,12 +17,14 @@ -%% To simplify the adding of new commits. +%% Basic definitions to facilitate the plot code. \newcommand{\branchcommit}[4]{ \draw [fill=#1, opacity=0.8] (#2,#3) circle [x radius=5.5mm, y radius=2.1mm]; \draw [anchor=center] (#2,#3) node {\textcolor{white}{\scriptsize\texttt{#4}}}; } - +\definecolor{maneagebranchcolor}{HTML}{46211A} +\definecolor{projectbranchcolor}{HTML}{BA5536} +\definecolor{derivedbranchcolor}{HTML}{C28556} @@ -61,24 +63,24 @@ (3cm,4.5cm) -- (4.5cm,5cm) -- (4.5cm,6cm) -- (3cm,6.5cm); %% Maneage commits. - \branchcommit{green!70!blue}{1.5cm}{1cm}{1d72e26} - \branchcommit{green!70!blue}{1.5cm}{2cm}{0c120cb} - \branchcommit{green!70!blue}{1.5cm}{3cm}{5781173} - \branchcommit{green!70!blue}{1.5cm}{4cm}{0774aac} - \branchcommit{green!70!blue}{1.5cm}{5cm}{3c05235} - \branchcommit{green!70!blue}{1.5cm}{6cm}{6ec4881} - \branchcommit{green!70!blue}{1.5cm}{7cm}{852d996} + \branchcommit{maneagebranchcolor}{1.5cm}{1cm}{1d72e26} + \branchcommit{maneagebranchcolor}{1.5cm}{2cm}{0c120cb} + \branchcommit{maneagebranchcolor}{1.5cm}{3cm}{5781173} + \branchcommit{maneagebranchcolor}{1.5cm}{4cm}{0774aac} + \branchcommit{maneagebranchcolor}{1.5cm}{5cm}{3c05235} + \branchcommit{maneagebranchcolor}{1.5cm}{6cm}{6ec4881} + \branchcommit{maneagebranchcolor}{1.5cm}{7cm}{852d996} %% Project commits. - \branchcommit{red!60!green}{3cm}{2.5cm}{4483a81} - \branchcommit{red!60!green}{3cm}{3.5cm}{5e830f5} - \branchcommit{red!60!green}{3cm}{4.5cm}{01dd812} - \branchcommit{red!60!green}{3cm}{5.5cm}{2ed0c82} - \branchcommit{red!60!green}{3cm}{6.5cm}{f62596e} + \branchcommit{projectbranchcolor}{3cm}{2.5cm}{4483a81} + \branchcommit{projectbranchcolor}{3cm}{3.5cm}{5e830f5} + \branchcommit{projectbranchcolor}{3cm}{4.5cm}{01dd812} + \branchcommit{projectbranchcolor}{3cm}{5.5cm}{2ed0c82} + \branchcommit{projectbranchcolor}{3cm}{6.5cm}{f62596e} %% Derivate project commits. - \branchcommit{red!60!green}{4.5cm}{5cm}{f69e1f4} - \branchcommit{red!60!green}{4.5cm}{6cm}{716b56b} + \branchcommit{projectbranchcolor}{4.5cm}{5cm}{f69e1f4} + \branchcommit{projectbranchcolor}{4.5cm}{6cm}{716b56b} %% Paper being processed icon. The white rectangle over it is to blend it %% into the background. @@ -128,23 +130,23 @@ {\bf project}; %% Maneage commits. - \branchcommit{green!70!blue}{9.5cm}{1cm}{1d72e26} - \branchcommit{green!70!blue}{9.5cm}{2cm}{0c120cb} - \branchcommit{green!70!blue}{9.5cm}{4cm}{b47b2a3} - \branchcommit{green!70!blue}{9.5cm}{5cm}{340a7ec} - \branchcommit{green!70!blue}{9.5cm}{6cm}{a92b25a} - \branchcommit{green!70!blue}{9.5cm}{7cm}{6e1e3ff} + \branchcommit{maneagebranchcolor}{9.5cm}{1cm}{1d72e26} + \branchcommit{maneagebranchcolor}{9.5cm}{2cm}{0c120cb} + \branchcommit{maneagebranchcolor}{9.5cm}{4cm}{b47b2a3} + \branchcommit{maneagebranchcolor}{9.5cm}{5cm}{340a7ec} + \branchcommit{maneagebranchcolor}{9.5cm}{6cm}{a92b25a} + \branchcommit{maneagebranchcolor}{9.5cm}{7cm}{6e1e3ff} %% Project commits. - \branchcommit{red!60!green}{11cm}{2.5cm}{4483a81} - \branchcommit{red!60!green}{11cm}{4.5cm}{\projectversion} + \branchcommit{projectbranchcolor}{11cm}{2.5cm}{4483a81} + \branchcommit{projectbranchcolor}{11cm}{4.5cm}{\projectversion} \node[anchor=south, inner sep=0pt, color=white] at (11cm,4.8cm) {\includegraphics[width=1cm]{tex/img/icon-complete.eps}}; %% Derivate project commits. - \branchcommit{purple!60!yellow}{12.5cm}{5cm}{b177c7e} - \branchcommit{purple!60!yellow}{12.5cm}{6cm}{5ae1fdc} - \branchcommit{purple!60!yellow}{12.5cm}{7cm}{bcf4512} + \branchcommit{derivedbranchcolor}{12.5cm}{5cm}{b177c7e} + \branchcommit{derivedbranchcolor}{12.5cm}{6cm}{5ae1fdc} + \branchcommit{derivedbranchcolor}{12.5cm}{7cm}{bcf4512} %% Description of this scenario: \draw [rounded corners, fill=black!10!white] (11.1cm,0) rectangle (15.3cm,1.25cm); diff --git a/tex/src/preamble-project.tex b/tex/src/preamble-project.tex index e14fbf6..16a9ddc 100644 --- a/tex/src/preamble-project.tex +++ b/tex/src/preamble-project.tex @@ -55,7 +55,6 @@ %% Custom macros \newcommand{\inlinecode}[1]{\textcolor{blue!35!black}{\texttt{#1}}} - \newcommand\eprint[1]{\href{https://arXiv.org/abs/#1}{{arXiv:#1}}} \newcommand\doi[1]{\href{https://oadoi.org/#1}{{DOI:#1}}} |