Edit to work with multituner ...

diff --git a/hexiom/learn.sh b/hexiom/learn.sh
index b624784b6951ad9c9f5ecbed304c569a8b304ef0..ae16dcf84a98d6ed62934e92c4bf24e548ec372d 100755 (executable)
--- a/hexiom/learn.sh
+++ b/hexiom/learn.sh
@@ -10,14 +10,13 @@ BIN=../../bin
 BDIR=../Benchmarks/hexiom/learningset/
 
 #Checking the number of 
-if [ "$#" -lt 1 ]; then
+if [ "$#" -lt 2 ]; then
        echo "Illegal number of argument"
-       echo "./learn.sh [LearningSet]"
+       echo "./learn.sh [LearningSet] [TunerType]"
        exit 1
 fi
 if [ "$1" -gt 2 ]; then
        echo "Only 3 sets are available for learning. Parameter should be less than 3"
-       echo "./bench.sh [NUMBER] [--csolver/--dump]"
        exit 1
 fi
 
@@ -29,5 +28,5 @@ declare -a LearningSet=("${BDIR}38.dump ${BDIR}41.dump ${BDIR}43.dump ${BDIR}44.
 echo ${LearningSet[$1]}
 cd $BIN
 ./run.sh serializestatictuner
-./run.sh runmultituner $BUDGET $ROUND ${LearningSet[$1]} - $TUNERCONF
+./run.sh runmultituner $2 $BUDGET $ROUND $TIMEMAX ${LearningSet[$1]} - $TUNERCONF
 

diff --git a/killerSudoku/learn.sh b/killerSudoku/learn.sh
index 749cb0fc2084168645e09522494099fff22e247d..f955bf01da343a6d7255e8c306ec1f53dd22419b 100755 (executable)
--- a/killerSudoku/learn.sh
+++ b/killerSudoku/learn.sh
@@ -10,14 +10,13 @@ BIN=../../bin
 BDIR=../Benchmarks/sudoku-csolver/learningset/
 
 #Checking the number of 
-if [ "$#" -lt 1 ]; then
+if [ "$#" -lt 2 ]; then
        echo "Illegal number of argument"
-       echo "./learn.sh [LearningSet]"
+       echo "./learn.sh [LearningSet] [TunerType]"
        exit 1
 fi
 if [ "$1" -gt 2 ]; then
        echo "Only 3 sets are available for learning. Parameter should be less than 3"
-       echo "./bench.sh [NUMBER] [--csolver/--dump]"
        exit 1
 fi
 
@@ -29,5 +28,5 @@ declare -a LearningSet=("${BDIR}2-25-5.dump ${BDIR}2-25.dump ${BDIR}36x36-591.du
 echo ${LearningSet[$1]}
 cd $BIN
 ./run.sh serializestatictuner
-./run.sh runmultituner $BUDGET $ROUND ${LearningSet[$1]} - $TUNERCONF
+./run.sh runmultituner $2 $BUDGET $ROUND $TIMEMAX ${LearningSet[$1]} - $TUNERCONF
 

diff --git a/nqueens/bench.sh b/nqueens/bench.sh
index 1408e25f225da10742e047541637c6e6b7aca54e..ae4800282723283a4d5735c59eec9c7c859cf157 100755 (executable)
--- a/nqueens/bench.sh
+++ b/nqueens/bench.sh
@@ -6,7 +6,7 @@
 
 #Variables
 source ../common.sh
-PARAMETERS="64 96 112 128 144 160 192 224 256 288 320 352 384 416 448 480 512"
+PARAMETERS="64 96 112 128 144 160 192 224 256 288 320 352 384"
 
 #Checking the number of 
 if [ "$#" -lt 1 ]; then

diff --git a/nqueens/learn.sh b/nqueens/learn.sh
index 24afb95ff21dcae1437ec93bedd9314a61cbd412..07b98543ebf2af262d2a938760bc21812dbee6a2 100755 (executable)
--- a/nqueens/learn.sh
+++ b/nqueens/learn.sh
@@ -12,12 +12,11 @@ BDIR=../Benchmarks/nqueens/learningset/
 #Checking the number of 
 if [ "$#" -lt 1 ]; then
        echo "Illegal number of argument"
-       echo "./learn.sh [LearningSet]"
+       echo "./learn.sh [LearningSet] [TunerType]"
        exit 1
 fi
 if [ "$1" -gt 2 ]; then
        echo "Only 3 sets are available for learning. Parameter should be less than 3"
-       echo "./bench.sh [NUMBER] [--csolver/--dump]"
        exit 1
 fi
 
@@ -29,5 +28,5 @@ declare -a LearningSet=("${BDIR}96.dump ${BDIR}112.dump ${BDIR}144.dump ${BDIR}1
 echo ${LearningSet[$1]}
 cd $BIN
 ./run.sh serializestatictuner
-./run.sh runmultituner $BUDGET $ROUND ${LearningSet[$1]} - $TUNERCONF
+./run.sh runmultituner $2 $BUDGET $ROUND $TIMEMAX ${LearningSet[$1]} - $TUNERCONF
 

diff --git a/sudoku-csolver/learn.sh b/sudoku-csolver/learn.sh
index 69bce2c5f2154a08244efddd008e475268504b66..c9d33acc17e9b60445ba3e04a54b08de86c1ab04 100755 (executable)
--- a/sudoku-csolver/learn.sh
+++ b/sudoku-csolver/learn.sh
@@ -10,14 +10,13 @@ BIN=../../bin
 BDIR=../Benchmarks/sudoku-csolver/learningset/
 
 #Checking the number of 
-if [ "$#" -lt 1 ]; then
+if [ "$#" -lt 2 ]; then
        echo "Illegal number of argument"
-       echo "./learn.sh [LearningSet]"
+       echo "./learn.sh [LearningSet] [TunerType]"
        exit 1
 fi
 if [ "$1" -gt 2 ]; then
        echo "Only 3 sets are available for learning. Parameter should be less than 3"
-       echo "./bench.sh [NUMBER] [--csolver/--dump]"
        exit 1
 fi
 
@@ -29,5 +28,5 @@ declare -a LearningSet=("${BDIR}36x36-591.dump ${BDIR}36x36-592.dump ${BDIR}36x3
 echo ${LearningSet[$1]}
 cd $BIN
 ./run.sh serializestatictuner
-./run.sh runmultituner $BUDGET $ROUND ${LearningSet[$1]} - $TUNERCONF
+./run.sh runmultituner $2 $BUDGET $ROUND $TIMEMAX ${LearningSet[$1]} - $TUNERCONF