run.sh updated

experiment/run.sh

@@ -3,16 +3,18 @@
 rm -f raw_result.txt
 rm -f result.txt
 
-java -classpath "../out/production/Conversion" inport.Main to_MiniZinc_0 in.ipp conversion_0.dzn
+VERSION="1"
 
-mzn2fzn -o model.fzn "../constraints/conversion_0.mzn" conversion_0.dzn
+java -classpath "../out/production/Conversion" inport.Main "to_MiniZinc_$VERSION" in.ipp "conversion_$VERSION.dzn"
+
+mzn2fzn --no-optimize -o model.fzn "../constraints/conversion_$VERSION.mzn" "conversion_$VERSION.dzn"
 N_LINES=$(wc -l model.fzn)
 echo "Model size : $N_LINES"
 
 START=$(date +%s.%N)
 
-minizinc --solver Gecode "../constraints/conversion_0.mzn" conversion_0.dzn >> raw_result.txt
-
+minizinc --solver Chuffed "../constraints/conversion_$VERSION.mzn" "conversion_$VERSION.dzn" >> raw_result.txt
+# Gecode Chuffed
 END=$(date +%s.%N)
 DIFF=$(echo "$END - $START" | bc)