From: Mart Lubbers <mart@martlubbers.net>
Date: Sun, 13 Mar 2016 09:38:59 +0000 (+0100)
Subject: prep for the report
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=11f388b11fa3bda90f86d5753417efc3d7300c11;p=mc1516pa.git

prep for the report
---

diff --git a/code/fancy_benchmark.sh b/code/fancy_benchmark.sh
index 63e24cb..d76761b 100755
--- a/code/fancy_benchmark.sh
+++ b/code/fancy_benchmark.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-echo -e "screen\tboxes\tseconds"
+echo -e "screen\tboxes\tseconds\tsteps"
 find ../sokobanzip/screens/ -type f | xargs -I{} \
 	bash -c 'echo -ne "{}\t" && grep -o "[*$]" {} | wc -l' | sort -k2 -nr |\
 	tac | cut -f1 | xargs -I{} bash -c \
 		'S1=`date +%s`; 
-		./NuSMV <(<{} ./SokobanObjectwise) 2>&1>/dev/null;
+		STEPS=`./NuSMV <(<{} ./SokobanObjectwise) | grep -c State`;
 		S2=`date +%s`;
-		echo -e "$(basename {})\t$(grep -o "[*$]" {} | wc -l)\t$((S2-S1))"'
+		echo -e "$(basename {})\t$(grep -o "[*$]" {} | wc -l)\t$((S2-S1))\t$STEPS"'
diff --git a/report1/alex.tex b/report1/alex.tex
new file mode 100644
index 0000000..802992c
--- /dev/null
+++ b/report1/alex.tex
@@ -0,0 +1 @@
+Hello world
diff --git a/report1/mart.tex b/report1/mart.tex
new file mode 100644
index 0000000..802992c
--- /dev/null
+++ b/report1/mart.tex
@@ -0,0 +1 @@
+Hello world
diff --git a/report1/report1.tex b/report1/report1.tex
index e8ee572..c212acd 100644
--- a/report1/report1.tex
+++ b/report1/report1.tex
@@ -1,4 +1,5 @@
 %&report1
 \begin{document}
-Hello world!
+\input{mart.tex}
+\input{alex.tex}
 \end{document}