From df40f93cf198b5fe113acb82dc64eed8b0555016 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Tue, 18 May 2021 17:17:58 +1000
Subject: [PATCH] Adapt AMPL part

---
 assets/glossary.tex       |  6 ------
 chapters/2_background.tex | 24 +++++++++---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/assets/glossary.tex b/assets/glossary.tex
index f8d1579..d9fd952 100644
--- a/assets/glossary.tex
+++ b/assets/glossary.tex
@@ -85,7 +85,6 @@
   description={},
 }
 
-
 \newglossaryentry{gls-chr}{
   name={constraint handling rules},
   description={},
@@ -191,11 +190,6 @@
   description={},
 }
 
-\newglossaryentry{linear-program}{
-  name={linear program},
-  description={},
-}
-
 \newglossaryentry{gls-lcg}{
   name={lazy clause generation},
   description={},
diff --git a/chapters/2_background.tex b/chapters/2_background.tex
index 8ba30dd..327904e 100644
--- a/chapters/2_background.tex
+++ b/chapters/2_background.tex
@@ -848,7 +848,6 @@ can then be rewritten as linear \glspl{constraint} using the \glspl{variable}
     \label{line:back-mip-channel} & x_{i} = \sum_{j=1}^{n} j * y_{ij} & \forall_{i=1}^{n} \\
     \label{line:back-mip-row} & \sum_{i=1}^{n} y_{ij} \leq 1 & \forall_{j=1}^{n}
   \end{align}
-    % & \sum_{j=1} y_{ij} \leq 1 & \forall_{i=1}^{n}\\
 
 
   The encoding of this variable uses only integers. Like the \gls{cp} model,
@@ -963,20 +962,15 @@ expressions and functions provided by the language.
 One of the most used \cmls\ is \gls{ampl} \autocite{fourer-2003-ampl}. As the
 name suggest, \gls{ampl} was designed to allow modellers to express problems
 through the use of mathematical equations. It is therefore also described as an
-``algebraic modelling language''. Specifically an \gls{ampl} model generally
-describes a \gls{linear-program}. In a \gls{linear-program} the \glspl{variable}
-can take any value from a continuous range and the \gls{objective} and
-\glspl{constraint} can only use linear function over \glspl{variable} (\ie\
-\(\sum c_{i} x_{i}\), where all \(c_{i}\) are \glspl{parameter} and all
-\(x_{i}\) are \glspl{variable}).
-
-Depending on the \gls{solver} targeted by \gls{ampl}, the language can give the
-modeller access to additional functionality. For \glspl{solver} that have a
-\gls{mip} solving method, the modellers can require \glspl{variable} to be
-integers. Different types of \glspl{solver} can also have access to different
-types of constraints, such as quadratic and non-linear constraints. \gls{ampl}
-has even been extended to allow the usage of certain \glspl{global} when using a
-\gls{cp} \gls{solver} \autocite{fourer-2002-amplcp}.
+``algebraic modelling language''. Specifically \gls{ampl} was designed to model
+linear programs. These days \gls{ampl} has been extended to allow more advanced
+\gls{solver} usage. Depending on the \gls{solver} targeted by \gls{ampl}, the
+language can give the modeller access to additional functionality. For
+\glspl{solver} that have a \gls{mip} solving method, the modellers can require
+\glspl{variable} to be integers. Different types of \glspl{solver} can also have
+access to different types of constraints, such as quadratic and non-linear
+constraints. \gls{ampl} has even been extended to allow the usage of certain
+\glspl{global} when using a \gls{cp} \gls{solver} \autocite{fourer-2002-amplcp}.
 
 \begin{example}