Merge remote-tracking branch 'origin/main' into main

potassco-asp-course · Jan 24, 2021 · ba6b3b3 · ba6b3b3
2 parents 06f65a7 + e8afee9
commit ba6b3b3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/encoding.tex b/encoding.tex
@@ -0,0 +1,25 @@
+% ----------------------------------------------------------------------
+\lecture{Advanced Modeling}{encoding}
+% ----------------------------------------------------------------------
+\part{Advanced Modeling}
+% ----------------------------------------------------------------------
+\input{encoding/declarativity}
+% ----------------------------------------------------------------------
+\section{$n$-Queens reloaded}
+% ------------------------------
+\input{modeling/queens-problem}
+\input{encoding/queens}
+
+% \setchessboard{smallboard,labelbottomformat=\arabic{filelabel},showmover=false,marginleftwidth=1ex,marginrightwidth=1ex,margintopwidth=1ex,marginbottomwidth=1ex,pgfstyle=straightmove,arrow=}
+% \lstset{numbers=none,numberblanklines=false,basicstyle=\ttfamily\small,columns=flexible,escapechar=?}
+% \newcommand{\attach}[2]{#2}
+% \input{encoding/methodology}
+% \input{hitori}
+% ------------------------------------------------------------
+%\lstset{basicstyle=\ttfamily,numberblanklines=true,escapechar=\%}
+% ------------------------------------------------------------
+%
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "main"
+%%% End:
diff --git a/include/encoding b/include/encoding
diff --git a/include/modeling b/include/modeling
diff --git a/main.tex b/main.tex
@@ -46,7 +46,7 @@
 \usepackage{beamer-patch}
 \input{beamer-config}
 % ----------------------------------------------------------------------
-%\includeonlylecture{%
+\includeonlylecture{%
 %organization%
 %motivation%
 %introduction%
@@ -59,13 +59,13 @@
 %ocharacterization%
 %pcharacterization%
 %solving%
+encoding%
 %msolving%
 %tsolving%
 %hsolving%
 %systems%
-%encoding%
 %preferences%
-%,goodbye,bibliography}
+,goodbye,bibliography}
 % ----------------------------------------------------------------------
 \begin{document}
 % ----------------------------------------------------------------------
@@ -88,6 +88,7 @@
 \input{./ocharacterization}
 \input{./pcharacterization}
 \input{./solving}
+\input{./encoding}
 % ------------------------------
 \input{./goodbye}
 % ------------------------------

diff --git a/modeling.tex b/modeling.tex
@@ -26,6 +26,7 @@ \subsection{Satisfiability testing}
 \input{modeling/sat}
 % ------------------------------
 \subsection{Queens}
+\input{modeling/queens-problem}
 \input{modeling/queens}
 % ------------------------------
 \subsection{Traveling salesperson}
+1 −0		.gitignore
+2 −1		README.md
+27 −0		declarativity.tex
+1 −0		dummy.txt
+24 −0		encoding.tex
+14 −0		encodings/queens0.lp
+14 −0		encodings/queens1.lp
+14 −0		encodings/queens2.lp
+15 −0		encodings/queens3.lp
+383 −0		methodology.tex
+629 −0		posing.tex
+411 −0		queens.tex