Minor changes

1 files changed, 55 insertions, 50 deletions

diff --git a/simulations/results/paper.sh b/simulations/results/paper.sh
index cf7c3a8..e97ef7d 100755
--- a/simulations/results/paper.sh
+++ b/simulations/results/paper.sh
@@ -56,57 +56,62 @@ latency=0 # in Seconds
 bitrate="100kbps"
 
 
-# Clean previous runs
-[ -e "${results}" ] && rm "${results}"
+for input_suffix in "NoHintIsFALSE" "NoHintIsTRUE"
+do
+    results="${wai}/results_${input_suffix}.csv"
 
-# Inputs
-parameters=$(cat ../../inputs.csv |tail -n +2)
-nseed=200
+    # Clean previous runs
+    [ -e "${results}" ] && rm "${results}"
 
-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
+    # Inputs
+    parameters=$(cat ../../inputs_${input_suffix}.csv |tail -n +2)
+    nseed=200
 
-    # Run experiment
-    echo "---------- wireless=${wireless} wakeupfor=${wakeupfor} simkey=${simkey} ----------"
-    avalues="$simkey,$wireless,$wakeupfor,$econstraint,$cconstraint,$model"
-    for seed in $(seq 1 $nseed)
+    while read -r parameter
     do
-        printf "\rSeed run ${seed}/${nseed}"
-        run-simulation
-    done
-    echo 
-done < <(printf '%s\n' "$parameters")
+        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 
+    done < <(printf '%s\n' "$parameters")
+done
\ No newline at end of file