diff options
Diffstat (limited to 'results/paper.sh')
| -rwxr-xr-x | results/paper.sh | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/results/paper.sh b/results/paper.sh index a6ad2a2..03e3390 100755 --- a/results/paper.sh +++ b/results/paper.sh @@ -6,6 +6,7 @@ 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.csv" aheaders="simkey,wireless,wakeupfor" @@ -21,24 +22,19 @@ run-simulation () { [ $gen_log -eq 1 ] && echo -e "* seed=$seed simtime=$simtime wakeupevery=$wakeupevery wakeupfor=$wakeupfor n_nodes=$n_nodes extended=$extended hint=$hint poff=$poff pon=$pon prx=$prx ptx=$ptx datasize=$datasize bitrate=$bitrate \n" >> "${log_file}" # Run simulations - if [ -e "$results" ] - then - # Create new result file - if [ $gen_log -eq 1 ] - then - $simulator 2>&1 | tee -a "${log_file}" | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results" - else - $simulator 2>&1 | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results" - fi - else - # Use existing result file - if [ $gen_log -eq 1 ] - then - $simulator 2>&1 | tee -a "${log_file}" | $parser | sed "1 s/$/,${aheaders}/g" | sed "2,\$s/$/,${avalues}/" > "$results" - else - $simulator 2>&1 | $parser | sed "1 s/$/,${aheaders}/g" | sed "2,\$s/$/,${avalues}/" > "$results" - fi - fi + tmp=$(mktemp) + $simulator &> $tmp + [ $gen_log -eq 1 ] && cp $tmp "${log_file}" + + # Gen csv + [ ! -e "$results" ] && { cat $tmp | $parser | sed "1 s/$/,${aheaders}/g" | sed "2,\$s/$/,${avalues}/" > "$results"; } + [ -e "$results" ] && { cat $tmp | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results"; } + + # Gen scheduler analysis + [ $seed -eq 1 ] && $sched $tmp "logs/simkey${simkey}_uptime${wakeupfor}_hint${hint}_extended${extended}_wireless${wireless}.png" + + # Clear tmp + rm $tmp } # Default Parameters |