Merge pull request #20 from potassco-asp-course/t/ms

t/ms
potassco-asp-course · May 23, 2022 · 2427e8e · 2427e8e
2 parents 730fb63 + 4525521
commit 2427e8e
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "include/heuristic-driven-solving"]
 	path = include/heuristic-driven-solving
 	url = ../heuristic-driven-solving
+[submodule "include/controlling"]
+	path = include/controlling
+	url = ../controlling
diff --git a/controlling.tex b/controlling.tex
@@ -0,0 +1,31 @@
+% ----------------------------------------------------------------------
+\lecture{Controlling}{controlling}
+% ----------------------------------------------------------------------
+\part{Controlling}
+% ----------------------------------------------------------------------
+\section{Motivation}
+% ------------------------------
+\input{controlling/motivation}
+\input{controlling/example}
+% ----------------------------------------------------------------------
+\section{Embedded script}
+% ------------------------------
+\input{controlling/script}
+% ----------------------------------------------------------------------
+\section{Module import}
+% ------------------------------
+\input{controlling/module}
+% ----------------------------------------------------------------------
+\section{Application class}
+% ------------------------------
+\input{controlling/application}
+% ----------------------------------------------------------------------
+\section{Vademecum}
+% ------------------------------
+\input{controlling/vademecum}
+% ----------------------------------------------------------------------
+%
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/include/controlling b/include/controlling
diff --git a/include/macros b/include/macros
diff --git a/include/multi-shot-solving b/include/multi-shot-solving
diff --git a/main.tex b/main.tex
@@ -66,6 +66,7 @@
 %
 %encoding%
 %meta%
+%controlling%
 %msolving%
 %tsolving%
 %hsolving%
@@ -97,6 +98,7 @@
 % ------------------------------
 \input{./encoding}
 \input{./meta}
+\input{./controlling}
 \input{./msolving}
 \input{./tsolving}
 \input{./hsolving}

diff --git a/msolving.tex b/msolving.tex
@@ -37,9 +37,9 @@ \subsection{Optimization}
 % ------------------------------
 \input{multi-shot-solving/optimization}
 % ----------------------------------------------------------------------
-\subsection{Planning}
+% \subsection{Planning}
 % ------------------------------
-\input{multi-shot-solving/towers-of-hanoi}
+% \input{multi-shot-solving/towers-of-hanoi} % TO BE MERGED
 % ----------------------------------------------------------------------
 \subsection{Board gaming}
 % ------------------------------

diff --git a/slides/controlling.pdf b/slides/controlling.pdf
diff --git a/slides/main.pdf b/slides/main.pdf
diff --git a/slides/msolving.pdf b/slides/msolving.pdf
+2 −1		control.tex
+1 −1		external-example.tex
+3 −2		external.tex
+39 −1		incremental.tex
+1 −1		motivation.tex
+37 −3		optimization.tex
+1 −1		program-example.tex
+2 −1		program.tex