From 86636f40068587c017f8f2dbb5f9f5727af2b88b Mon Sep 17 00:00:00 2001 From: Hamed Gorjiara Date: Fri, 4 Jan 2019 11:58:36 -0800 Subject: [PATCH] Edit to work with multituner ... --- hexiom/learn.sh | 7 +++---- killerSudoku/learn.sh | 7 +++---- nqueens/bench.sh | 2 +- nqueens/learn.sh | 5 ++--- sudoku-csolver/learn.sh | 7 +++---- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/hexiom/learn.sh b/hexiom/learn.sh index b624784b..ae16dcf8 100755 --- 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 749cb0fc..f955bf01 100755 --- 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 1408e25f..ae480028 100755 --- 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 24afb95f..07b98543 100755 --- 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 69bce2c5..c9d33acc 100755 --- 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 -- 2.34.1