Minor changes

7 files changed, 21 insertions, 17 deletions

diff --git a/analysis/days.R b/analysis/days.R
index 8df39dd..fa706f6 100644
--- a/analysis/days.R
+++ b/analysis/days.R
@@ -207,7 +207,7 @@ data_seed_energy=data_seed_energy%>%filter(days %in% !!energy$days)
 ## Compute the delta data
 energy_coverage_delta=data_seed_energy%>%
     full_join(energy,by=c("days","wireless","wakeupfor"),suffix=c("","_training"))
-energy_coverage_delta=energy_coverage_delta%>%group_by(wireless,wakeupfor)%>%summarize(delta_energy=energy-energy_training,simkey=simkey,days=days,delta_coverage=coverage-coverage_training)
+energy_coverage_delta=energy_coverage_delta%>%group_by(wireless,wakeupfor)%>%summarize(delta_energy=energy-energy_training,simkey=simkey,days=days,delta_coverage=(coverage-coverage_training)/3) # delta_coverage divide by 3 because we want the average per day (coverage is measure every 3 days (round-robin of 3 policies))
 
 
 write("wireless,wakeupfor,policy,slope,intercept,delta_coverage","figures/delta_energy_coverage.csv")
diff --git a/analysis/figures/days_accuracy.pdf b/analysis/figures/days_accuracy.pdf
index 137f9b2..e3e3ebc 100644
--- a/analysis/figures/days_accuracy.pdf
+++ b/analysis/figures/days_accuracy.pdf
diff --git a/analysis/figures/days_energy.pdf b/analysis/figures/days_energy.pdf
index c190674..85fb106 100644
--- a/analysis/figures/days_energy.pdf
+++ b/analysis/figures/days_energy.pdf
diff --git a/analysis/figures/days_f1-score.pdf b/analysis/figures/days_f1-score.pdf
index 27c2816..6a82c72 100644
--- a/analysis/figures/days_f1-score.pdf
+++ b/analysis/figures/days_f1-score.pdf
diff --git a/analysis/figures/delta_coverage_training.pdf b/analysis/figures/delta_coverage_training.pdf
index e9eb30f..6634a09 100644
--- a/analysis/figures/delta_coverage_training.pdf
+++ b/analysis/figures/delta_coverage_training.pdf
diff --git a/analysis/figures/delta_energy_coverage.csv b/analysis/figures/delta_energy_coverage.csv
index 1ff40b6..35eb48a 100644
--- a/analysis/figures/delta_energy_coverage.csv
+++ b/analysis/figures/delta_energy_coverage.csv
@@ -1,17 +1,21 @@
 wireless,wakeupfor,policy,slope,intercept,delta_coverage
-lora,60,baseline,-543.7,-1108.4,-12.6
-lora,60,extended,214.8,-879.5,-6.4
-lora,60,hint,-473,-840,-12.6
-lora,60,hintandextended,337.1,-923.3,-5.9
-lora,180,baseline,-676,-19.2,-22.7
-lora,180,extended,-483.2,84.5,-14.1
-lora,180,hint,3132.4,-3340.7,-13.8
-lora,180,hintandextended,1166.4,667.5,-13
-nbiot,60,baseline,-96.8,-2827.3,-13.9
-nbiot,60,extended,-77.4,-2565,-10
-nbiot,60,hint,216,-1557.2,-11.5
-nbiot,60,hintandextended,179,19.7,-8.8
-nbiot,180,baseline,-1054.3,3069.7,-23
-nbiot,180,extended,-1210.2,2995.6,-22.3
-nbiot,180,hint,2602.9,2432.6,-21.6
-nbiot,180,hintandextended,2249.1,1117.9,-21.5
+
+lora,60,baseline,-543.7,-1108.4,-4.2
+lora,60,extended,214.8,-879.5,-2.1
+lora,60,hint,-473,-840,-4.2
+lora,60,hintandextended,337.1,-923.3,-2
+
+lora,180,baseline,-676,-19.2,-7.6
+lora,180,extended,-483.2,84.5,-4.7
+lora,180,hint,3132.4,-3340.7,-4.6
+lora,180,hintandextended,1166.4,667.5,-4.3
+
+nbiot,60,baseline,-96.8,-2827.3,-4.6
+nbiot,60,extended,-77.4,-2565,-3.3
+nbiot,60,hint,216,-1557.2,-3.8
+nbiot,60,hintandextended,179,19.7,-2.9
+
+nbiot,180,baseline,-1054.3,3069.7,-7.7
+nbiot,180,extended,-1210.2,2995.6,-7.4
+nbiot,180,hint,2602.9,2432.6,-7.2
+nbiot,180,hintandextended,2249.1,1117.9,-7.2
diff --git a/analysis/figures/delta_energy_training.pdf b/analysis/figures/delta_energy_training.pdf
index 2caeaa6..6524b08 100644
--- a/analysis/figures/delta_energy_training.pdf
+++ b/analysis/figures/delta_energy_training.pdf