1 files changed, 27 insertions, 29 deletions

diff --git a/results/paper_.sh b/results/paper_.sh
index d7c8630..7d7f240 100755
--- a/results/paper_.sh
+++ b/results/paper_.sh
@@ -6,12 +6,13 @@ 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"
+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=1 # Should we generate logs ?
+log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/"
+gen_log=0 # Should we generate logs ?
 
 run-simulation () {
     # Generate inputs
@@ -20,15 +21,29 @@ run-simulation () {
     # Init logs
     [ $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}"
 
-    $simulator 2>&1
+    # Run simulations
+    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/$(echo ${avalues}|tr ',' '_')_hint${hint}_extended${extended}.png"
+
+    # Clear tmp
+    cat $tmp
+    rm $tmp
 }
 
 # Default Parameters
-seed=1
+seed=0
 simtime=86400 # One day
 wakeupevery=3600
 wakeupfor=60
-n_nodes=12
+n_nodes=13
 extended="false"
 hint="false"
 poff=0
@@ -44,21 +59,16 @@ bitrate="100kbps"
 
 run-scenarios() {
     # Configure number of seed per scenarios
-    nseed=1
+    nseed=200
 
-
-    # Hint
-    hint="true"
-    avalues="hint,$wireless,$wakeupfor"
-    for seed in $(seq 1 $nseed)
+    # Baseline
+    avalues="baseline,$wireless,$wakeupfor"
+    for seed in 17
     do
-        printf "\rHint...${seed}"
+        printf "\rBaseline...${seed}"
         run-simulation
     done
-    hint="false"
     echo 
-
-
 }
 
 # Clean previous runs
@@ -76,16 +86,4 @@ do
     ptx=0.16
     latency=0
     run-scenarios
-
-    # NbIot
-    echo "----- Run NbIoT (wakeupfor=$wakeupfor) -----"
-    wireless="nbiot"
-    bitrate="200kbps"
-    pon=0.4
-    prx=0.65
-    ptx=0.65
-    latency=0.01
-    #run-scenarios
-done
-
-echo "Logs: $log_file"
\ No newline at end of file
+done
\ No newline at end of file