makefile fix and table with results so far added to ex3

diff --git a/a4/Makefile b/a4/Makefile
index 79844d6..c70a9e0 100644 (file)
--- a/a4/Makefile
+++ b/a4/Makefile
@@ -18,4 +18,4 @@ all: $(DOCUMENT).pdf
        $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 clean:
-       $(RM) -v $(addprefix $(DOCUMENT).,aux fmt log out pdf toc)
+       $(RM) -v $(addprefix $(DOCUMENT).,aux fmt log out pdf toc dvi)

diff --git a/a4/code/bouw.sh b/a4/code/bouw.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/code/run.sh b/a4/code/run.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/code/run_candylearner.sh b/a4/code/run_candylearner.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/code/schoonop.sh b/a4/code/schoonop.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/code/sut/CandyMachine.jar b/a4/code/sut/CandyMachine.jar
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/code/sut/learnlib_dot2jtorx_aut.py b/a4/code/sut/learnlib_dot2jtorx_aut.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/preamble.tex b/a4/preamble.tex
index 9230216..a3a539e 100644 (file)
--- a/a4/preamble.tex
+++ b/a4/preamble.tex
@@ -3,6 +3,7 @@
 \usepackage{a4wide}
 \usepackage[dvipdfm]{hyperref}
 \usepackage{graphicx}
+\usepackage{longtable}
 
 \author{%
        Charlie Gerhardus\and

diff --git a/a4/question4.tex b/a4/question4.tex
index e69de29..1bd6ae5 100644 (file)
--- a/a4/question4.tex
+++ b/a4/question4.tex
@@ -0,0 +1,30 @@
+\begin{longtable}{| l | l | l | c | c | c |}\r
+\caption{Learning parameters and resulting model size.} \\\hline\r
+Alphabet & Method & Test method & States & Time \\\hline \hline\r
+small & LStar & Random & 2 & 12 sec \\\hline\r
+small & TTT & Random & 2 & 5 sec \\\hline\r
+small & RivestSchapire & Random & 2 & 6 sec \\\hline\r
+small & KearnsVazirani & Random & 2 & 5 sec \\\hline\r
+small & LStar & WMethod & 2 & 35 sec \\\hline\r
+small & TTT & WMethod & 2 & 32 sec \\\hline\r
+small & RivestSchapire & WMethod & 2 & 33 sec \\\hline\r
+small & KearnsVazirani & WMethod & 2 & 33 sec \\\hline\r
+\r
+partial & LStar & Random & 4 & 18 sec \\\hline\r
+partial & TTT & Random & 4 & 16 sec \\\hline\r
+partial & RivestSchapire & Random & 4 & 13 sec \\\hline\r
+partial & KearnsVazirani & Random & 4 & 22 sec \\\hline\r
+partial & LStar & WMethod & 4 & 384 sec \\\hline\r
+partial & TTT & WMethod & - & - \\\hline\r
+partial & RivestSchapire & WMethod & 4 & 384 \\\hline\r
+partial & KearnsVazirani & WMethod & 4 & 383 sec \\\hline\r
+\r
+full & LStar & Random & 5 & 44 sec \\\hline\r
+full & TTT & Random & 5 & 25 sec \\\hline\r
+full & RivestSchapire & Random & 4 & 12 sec \\\hline\r
+full & KearnsVazirani & Random & 5 & 19 sec \\\hline\r
+full & LStar & WMethod & - & - \\\hline\r
+full & TTT & WMethod & 5 & 2632 sec \\\hline\r
+full & RivestSchapire & WMethod & - & - \\\hline\r
+full & KearnsVazirani & WMethod & - & - \\\hline\r
+\end{longtable}
\ No newline at end of file

diff --git a/a4/tcp/bouw.sh b/a4/tcp/bouw.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/tcp/results/van_learnlib_naar_dot.py b/a4/tcp/results/van_learnlib_naar_dot.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/tcp/run.sh b/a4/tcp/run.sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/a4/tcp/schoonop.sh b/a4/tcp/schoonop.sh
old mode 100755 (executable)
new mode 100644 (file)