diff --git a/run_scalability_datasize.sh b/run_scalability_datasize.sh index ba7dc16..c1d5826 100755 --- a/run_scalability_datasize.sh +++ b/run_scalability_datasize.sh @@ -3,12 +3,12 @@ set -e wai=$(dirname $(readlink -f "$0")) -scenarios="${wai}/../scenarios" -inputs="${wai}/../inputs.json" -simulator="make -C ${wai}/../ run" -sched="${wai}/scheduler/analysis.sh" -parser="${wai}/../parser.awk" -results="${wai}/results_datasize.csv" +scenarios="${wai}/scenarios" +inputs="${wai}/inputs.json" +simulator="make run" +sched="${wai}/analysis/scheduler/analysis.sh" +parser="${wai}/parser.awk" +results="${wai}/results/scalability_datasize.csv" aheaders="simkey,wireless,wakeupfor,n_nodes,datasize" avalues="none,none,none,none" log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/" diff --git a/run_scalability_nnodes.sh b/run_scalability_nnodes.sh index f7cd962..87accb9 100755 --- a/run_scalability_nnodes.sh +++ b/run_scalability_nnodes.sh @@ -3,12 +3,12 @@ set -e wai=$(dirname $(readlink -f "$0")) -scenarios="${wai}/../scenarios" -inputs="${wai}/../inputs.json" -simulator="make -C ${wai}/../ run" -sched="${wai}/scheduler/analysis.sh" -parser="${wai}/../parser.awk" -results="${wai}/results_scalability.csv" +scenarios="${wai}/scenarios" +inputs="${wai}/inputs.json" +simulator="make run" +sched="${wai}/analysis/scheduler/analysis.sh" +parser="${wai}/parser.awk" +results="${wai}/results/scalability_nnodes.csv" aheaders="simkey,wireless,wakeupfor,n_nodes" avalues="none,none,none,none" log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/" diff --git a/run_strategies.sh b/run_strategies.sh index 0e95fe4..5059d93 100755 --- a/run_strategies.sh +++ b/run_strategies.sh @@ -5,7 +5,7 @@ set -e wai=$(dirname $(readlink -f "$0")) scenarios="${wai}/scenarios" inputs="${wai}/inputs.json" -simulator="make -C ${wai}/ run" +simulator="make run" sched="${wai}/analysis/scheduler/analysis.sh" parser="${wai}/parser.awk" results="${wai}/strategy_sor.csv" # UPDATE HERE TO CHANGE OUTPUT CSV FILE NAME