diff --git a/.chktexrc b/.chktexrc index a17b6e0..4d951e1 100644 --- a/.chktexrc +++ b/.chktexrc @@ -1,4 +1,4 @@ # Exclude these environments from syntax checking -VerbEnvir { pgfpicture tikzpicture mzn nzn grammar proof } +VerbEnvir { pgfpicture tikzpicture mzn nzn plain grammar proof } MathCmd { \hypo } WipeArg { \mzninline:{} \nzninline:{} \Sem:{} \texttt:{} } diff --git a/assets/img/back_compilation_structure.pdf b/assets/img/back_compilation_structure.pdf index d0f4a2f..fe88c76 100644 Binary files a/assets/img/back_compilation_structure.pdf and b/assets/img/back_compilation_structure.pdf differ diff --git a/assets/img/rew_compilation_structure.pdf b/assets/img/rew_compilation_structure.pdf new file mode 100644 index 0000000..d2dceeb Binary files /dev/null and b/assets/img/rew_compilation_structure.pdf differ diff --git a/chapters/3_rewriting.tex b/chapters/3_rewriting.tex index 05ade69..6aa71f3 100644 --- a/chapters/3_rewriting.tex +++ b/chapters/3_rewriting.tex @@ -34,12 +34,13 @@ tool chain allows us to: functional definitions \end{itemize} -The new architecture is shown in \Cref{sfig:4-newarch}. A constraint model is -first compiled to byte code (called \microzinc{}), independent of the data. The -byte code is interpreted with the data to produce \nanozinc\ code, an extension -of the existing \flatzinc\ format. The interpreter can even be made incremental: -in \cref{ch:incremental} we discuss how in meta optimisation, no recompilation -is required. +The new architecture is shown in \Cref{fig:rew-comp}. A constraint model is +first compiled into a smaller constraint language called \microzinc{}, +independent of the data. After the \microzinc{} is transformed into a byte code, +it is interpreted with the data to produce \nanozinc\ code, an extension of the +existing \flatzinc\ format. The interpreter can even be made incremental: in +\cref{ch:incremental} we discuss how in meta optimisation, no recompilation is +required. We have developed a prototype of this tool chain, and present experimental validation of these advantages. The prototype is still very experimental, but @@ -54,21 +55,11 @@ representation, and in \cref{sec:4-experiments} we report on the experimental results of the prototype implementation. Finally, \Cref{sec:4-conclusion} presents our conclusions. -\begin{figure}[ht] +\begin{figure} \centering - \begin{subfigure}[b]{.45\columnwidth} - \centering - \includegraphics[width=\columnwidth]{assets/img/4_old_process} - \caption{\label{sfig:4-oldarch}} - \end{subfigure}% - \hspace{0.05\columnwidth}% - \begin{subfigure}[b]{.50\columnwidth} - \centering - \includegraphics[width=\columnwidth]{assets/img/4_new_process} - \caption{\label{sfig:4-newarch}} - \end{subfigure} - \caption{\label{fig:4-arch} (a) Current \minizinc\ architecture, and (b) new - \minizinc\ architecture} + \includegraphics[width=\linewidth]{assets/img/rew_compilation_structure} + \caption{\label{fig:rew-comp} The proposed process for the compilation of + \minizinc\ instances.} \end{figure}