Dekker1/dekker-phd-thesis
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work work

Browse Source
This commit is contained in:
Jip J. Dekker 2021-05-22 14:38:14 +10:00
parent 3469458307
commit c58478355a
No known key found for this signature in database
GPG Key ID: 517DF4A00618C9C3
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/packages.tex
View File

@ -1,6 +1,5 @@
\usepackage{silence} \hfuzz=5pt
\WarningFilter{biblatex}{File 'australian-apa.lbx'} \usepackage{scrhack}
\hfuzz=1.5pt
\usepackage{fvextra} \usepackage{fvextra}
\usepackage{csquotes} \usepackage{csquotes}
\usepackage[australian]{babel} \usepackage[australian]{babel}
@ -52,6 +51,7 @@
\usepackage[ \usepackage[
style=apa, style=apa,
]{biblatex} ]{biblatex}
\DeclareLanguageMapping{australian}{english-apa}
\usepackage[noabbrev]{cleveref} \usepackage[noabbrev]{cleveref}
% Tables % Tables

14
chapters/2_background.tex
View File

@ -153,8 +153,12 @@ the following model is the result of flattening:
var 0..1: selection_1; var 0..1: selection_1;
var 0..1: selection_2; var 0..1: selection_2;
var 0..175: total_joy:: is_defined_var; var 0..175: total_joy:: is_defined_var;
constraint int_lin_le([32,8,40],[selection_0,selection_1,selection_2],44); constraint int_lin_le([32,8,40], [selection_0,selection_1,selection_2], 44);
constraint int_lin_eq([63,12,100,-1],[selection_0,selection_1,selection_2,total_joy],0):: defines_var(total_joy); constraint int_lin_eq(
[63,12,100,-1],
[selection_0,selection_1,selection_2,total_joy],
0
):: defines_var(total_joy);
solve maximize total_joy; solve maximize total_joy;
\end{mzn} \end{mzn}
@ -492,7 +496,7 @@ both contexts.
Some expressions in the \cmls\ do not always have a well-defined result. Some expressions in the \cmls\ do not always have a well-defined result.
\begin{example}\label{ex:back-undef} \begin{example}\label{ex:back-undef}
Consider the following ``complex constraint'' Consider, for example, the following ``complex constraint''
\begin{mzn} \begin{mzn}
constraint i <= 4 -> a[i] * x >= 6; constraint i <= 4 -> a[i] * x >= 6;
@ -970,7 +974,7 @@ only \minizinc\ allows modellers to extend the language using their own
(user-defined) functions. In other \cmls\ the modeller is restricted to the (user-defined) functions. In other \cmls\ the modeller is restricted to the
expressions and functions provided by the language. expressions and functions provided by the language.
\subsection{\glsentrytext{ampl}}% \subsection{AMPL}%
\label{sub:back-ampl} \label{sub:back-ampl}
\glsreset{ampl} \glsreset{ampl}
@ -1046,7 +1050,7 @@ when using a \gls{cp} \solver{} \autocite{fourer-2002-amplcp}.
\subsection{\glsentrytext{opl}}% \subsection{OPL}%
\label{sub:back-opl} \label{sub:back-opl}
\glsreset{opl} \glsreset{opl}

2
chapters/3_rewriting.tex
View File

@ -1017,7 +1017,7 @@ proceed as normal with the root context constraint.
\minizinc{} distinguishes not only between root and reified contexts, but in \minizinc{} distinguishes not only between root and reified contexts, but in
addition recognises constraints in \emph{positive} contexts, also known as addition recognises constraints in \emph{positive} contexts, also known as
\emph{half-reified} \autocite{feydy-2011-half-reif}. A full explanation and \emph{half-reified} \autocite{feydy-2011-half-reif}. A full explanation and
discussion of half-reification can be found in \cref{ch:half_reif}. discussion of half-reification can be found in \cref{ch:half-reif}.
\jip{TODO:\ Reification should also be discussed in the background. How can we \jip{TODO:\ Reification should also be discussed in the background. How can we
make this more specific to how it works in \nanozinc{}.} make this more specific to how it works in \nanozinc{}.}

1
dekker_thesis.tex
View File

@ -105,7 +105,6 @@ following publication:
\include{chapters/5_incremental} \include{chapters/5_incremental}
\appendix{} \appendix{}
\include{chapters/A3_temp_hr}
\include{chapters/A1_minizinc_grammar} \include{chapters/A1_minizinc_grammar}
\include{chapters/A2_benchmark} \include{chapters/A2_benchmark}