1 files changed, 54 insertions, 25 deletions
diff --git a/simulations/results/paper.sh b/simulations/results/paper.sh
index 0d486bf..384e07e 100755
--- a/simulations/results/paper.sh
+++ b/simulations/results/paper.sh
@@ -9,13 +9,12 @@ simulator="make -C ${wai}/../ run"
 sched="${wai}/scheduler/analysis.sh"
 parser="${wai}/../parser.awk"
 results="${wai}/results.csv"
-aheaders="simkey,wireless,wakeupfor"
-avalues="none,none,none"
+aheaders="simkey,wireless,wakeupfor,energy_constraint,coverage_constraint,model"
+avalues="none,none,none,none,none,none"
 log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/"
 gen_log=0 # Should we generate logs ?
 
 run-simulation () {
-    exit 0
     # Generate inputs
     $scenarios $seed $simtime $wakeupevery $wakeupfor $n_nodes $extended $hint $poff $pon $prx $ptx $datasize $bitrate $hintsize $latency > "$inputs"
     
@@ -32,7 +31,7 @@ run-simulation () {
     [ -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"
+    #[ $seed -eq 1 ] && $sched $tmp "logs/$(echo ${avalues}|tr ',' '_')_hint${hint}_extended${extended}.png"
 
     # Clear tmp
     rm $tmp
@@ -109,26 +108,56 @@ run-scenarios() {
 # Clean previous runs
 [ -e "${results}" ] && rm "${results}"
 
-for wakeupfor in 60 180
+# Inputs
+parameters=$(cat ../../inputs.csv |tail -n +2)
+nseed=1
+
+while read -r parameter
 do
+    wireless=$(echo "$parameter" |tail -n1|cut -d ',' -f1)
+    wakeupfor=$(echo "$parameter" |tail -n1|cut -d ',' -f2)
+    econstraint=$(echo "$parameter" |tail -n1|cut -d ',' -f3)
+    cconstraint=$(echo "$parameter" |tail -n1|cut -d ',' -f4)
+    simkey=$(echo "$parameter" |tail -n1|cut -d ',' -f5)
+    model=$(echo "$parameter" |tail -n1|cut -d ',' -f6)
+    if [ "$wireless" == "lora" ]
+    then
+        # Lora
+        bitrate="50kbps"
+        pon=0.4
+        prx=0.16
+        ptx=0.16
+        latency=0
+    else
+        # NbIot
+        bitrate="200kbps"
+        pon=0.4
+        prx=0.65
+        ptx=0.65
+        latency=0
+    fi
+    
+    # Configure simulation parameters
+    extended="false"
+    hint="false"
+    if [ $simkey == "extended" ] || [ $simkey == "hintandextended" ]
+    then
+        extended="true"
+    fi
+    if [ $simkey == "extended" ] || [ $simkey == "hintandextended" ]
+    then
+        hint="true"
+    fi
+
+    # Run experiment
+    echo "---------- wireless=${wireless} wakeupfor=${wakeupfor} simkey=${simkey} ----------"
+    avalues="$simkey,$wireless,$wakeupfor,$econstraint,$cconstraint,$model"
+    for seed in $(seq 1 $nseed)
+    do
+        printf "\rSeed run ${seed}/${nseed}"
+        run-simulation
+    done
+    echo 
+
 
-    # Lora
-    echo "----- Run Lora (wakeupfor=$wakeupfor) -----"
-    wireless="lora"
-    bitrate="50kbps"
-    pon=0.4
-    prx=0.16
-    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
-    run-scenarios
-done
+done < <(printf '%s\n' "$parameters")