diff options
Diffstat (limited to 'results/paper.sh')
| -rwxr-xr-x | results/paper.sh | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/results/paper.sh b/results/paper.sh index c1106d3..9f224bb 100755 --- a/results/paper.sh +++ b/results/paper.sh @@ -11,20 +11,33 @@ results="${wai}/results.csv" aheaders="simkey,wireless,wakeupfor" avalues="none,none,none" log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/" +gen_log=0 # Should we generate logs ? run-simulation () { # Generate inputs - $scenarios $seed $simtime $wakeupevery $wakeupfor $n_nodes $extended $hint $poff $pon $prx $ptx $datasize $bitrate > "$inputs" + $scenarios $seed $simtime $wakeupevery $wakeupfor $n_nodes $extended $hint $poff $pon $prx $ptx $datasize $bitrate $hintsize > "$inputs" # Init logs - 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}" + [ $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" ] + if [ -e "$results" ] then - $simulator 2>&1 | tee -a "${log_file}" | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results" + # 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 - $simulator 2>&1 | tee -a "${log_file}" | $parser | sed "1 s/$/,${aheaders}/g" | sed "2,\$s/$/,${avalues}/" > "$results" + # 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 } @@ -40,12 +53,13 @@ poff=0 pon=0.4 prx=0.16 ptx=0.16 -datasize=1000000 # MB +datasize=1000000 # 1MB +hintsize=4 bitrate="100kbps" run-scenarios() { # Configure number of seed per scenarios - nseed=100 + nseed=200 # Baseline echo "Baseline..." |