From 332a237d2f33bf14493d059eb2ab4ae9fefe2a87 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Thu, 17 Jun 2021 17:25:18 +1000 Subject: [PATCH] Bash variable style in gecode restart scripts --- run_record_gecode.sh | 2 +- run_replay_gecode.sh | 2 +- run_restart_gecode.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run_record_gecode.sh b/run_record_gecode.sh index 2cf7dd4..48a4272 100755 --- a/run_record_gecode.sh +++ b/run_record_gecode.sh @@ -18,7 +18,7 @@ for data in ./${folder}/*.dzn; do filename=$(basename -- "$data") filename="${filename%.*}" minizinc --solver mzn-fzn -c -Ggecode ${model}.mzn ${data} &> ${output_folder}/${filename}.${i}.sol - ${solver} --c-d 1 --a-d 2 -time ${record_timeout_sec}000 -r $i -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol + ${solver} --c-d 1 --a-d 2 -time ${record_timeout_sec}000 -r ${i} -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol mv record.txt ${output_folder}/${filename}.${i}.rec done rm -f ${model}.fzn ${model}.ozn diff --git a/run_replay_gecode.sh b/run_replay_gecode.sh index cb6da86..27facd6 100755 --- a/run_replay_gecode.sh +++ b/run_replay_gecode.sh @@ -20,7 +20,7 @@ for data in ./${folder}/*.dzn; do filename="${filename%.*}" cp ${records_folder}/${filename}.${i}.rec record.txt minizinc --solver mzn-fzn -c -Ggecode ${model}.mzn ${data} &> ${output_folder}/${filename}.${i}.sol - ${solver} --c-d 1 --a-d 2 -time ${timeout_sec}000 -r $i -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol + ${solver} --c-d 1 --a-d 2 -time ${timeout_sec}000 -r ${i} -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol done rm -f ${model}.fzn ${model}.ozn echo "" diff --git a/run_restart_gecode.sh b/run_restart_gecode.sh index 8326d72..c97ded1 100755 --- a/run_restart_gecode.sh +++ b/run_restart_gecode.sh @@ -18,7 +18,7 @@ for data in ./${folder}/*.dzn; do filename=$(basename -- "$data") filename="${filename%.*}" minizinc --solver mzn-fzn -c -Ggecode ${model}.mzn ${data} &> ${output_folder}/${filename}.${i}.sol - ${solver} --c-d 1 --a-d 2 -time ${timeout_sec}000 -r $i -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol + ${solver} --c-d 1 --a-d 2 -time ${timeout_sec}000 -r ${i} -a -restart constant -s ${model}.fzn | minizinc --output-time --ozn-file ${model}.ozn >> ${output_folder}/${filename}.${i}.sol done rm -f ${model}.fzn ${model}.ozn echo ""