Minor changes

7 files changed, 21 insertions, 19 deletions

diff --git a/analysis/days.R b/analysis/days.R
index 52fb878..8df39dd 100644
--- a/analysis/days.R
+++ b/analysis/days.R
@@ -1,6 +1,8 @@
 ########## INFORMATIONS ##########
 # This file is made to study online classification
 # So, each pair (wireless,wakeupfor) has its classification models (knn and decision tree)
+# Note that is the following error appears: object 'accuracy' not found
+# it means you should toggle the boolean in the if condition in the code to generate the accuracy onbject
 ##################################
 
 library("tidyverse")
@@ -211,7 +213,7 @@ energy_coverage_delta=energy_coverage_delta%>%group_by(wireless,wakeupfor)%>%sum
 write("wireless,wakeupfor,policy,slope,intercept,delta_coverage","figures/delta_energy_coverage.csv")
 energy_coverage_delta%>%group_by(wireless,wakeupfor,simkey)%>%group_walk(function(data,grp){
     grp=as.list(grp)
-    reg=lm(delta_energy/1e3 ~ days,data)
+    reg=lm(delta_energy ~ days,data)
     slope=round(as.numeric(reg$coefficients["days"]),digits=1)
     intercept=round(as.numeric(reg$coefficients[1]),digits=1)
     mean_delta_coverage=round(mean(data$delta_coverage),digits=1)
@@ -222,8 +224,8 @@ energy_coverage_delta%>%group_by(wireless,wakeupfor,simkey)%>%group_walk(functio
 ggplot(energy_coverage_delta,aes(days/30,delta_energy/1e3,color=simkey,shape=simkey))+
     geom_line(size=1.2)+ylab("Delta in energy (kJ)")+xlab("Training duration (months)")+
     facet_wrap(~wireless+wakeupfor,scale="free")+
-    th()+theme(legend.position="top")+labs(color="Classes")
-ggsave("figures/delta_energy_training.pdf")
+    th()+theme(legend.position=c(0.61,0.93))+labs(color="Classes")
+ggsave("figures/delta_energy_training.pdf",height=6,width=10)
 
 ggplot(energy_coverage_delta,aes(days/30,delta_coverage,color=simkey))+
     geom_line(size=1.2)+ylab("Delta in coverage")+xlab("Training duration (months)")+
diff --git a/analysis/figures/days_accuracy.pdf b/analysis/figures/days_accuracy.pdf
index 675fbec..137f9b2 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 b74971b..c190674 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 fb55119..27c2816 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 1054687..e9eb30f 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 60d139e..1ff40b6 100644
--- a/analysis/figures/delta_energy_coverage.csv
+++ b/analysis/figures/delta_energy_coverage.csv
@@ -1,17 +1,17 @@
 wireless,wakeupfor,policy,slope,intercept,delta_coverage
-lora,60,baseline,-0.5,-1.1,-12.6
-lora,60,extended,0.2,-0.9,-6.4
-lora,60,hint,-0.5,-0.8,-12.6
-lora,60,hintandextended,0.3,-0.9,-5.9
-lora,180,baseline,-0.7,0,-22.7
-lora,180,extended,-0.5,0.1,-14.1
-lora,180,hint,3.1,-3.3,-13.8
-lora,180,hintandextended,1.2,0.7,-13
-nbiot,60,baseline,-0.1,-2.8,-13.9
-nbiot,60,extended,-0.1,-2.6,-10
-nbiot,60,hint,0.2,-1.6,-11.5
-nbiot,60,hintandextended,0.2,0,-8.8
-nbiot,180,baseline,-1.1,3.1,-23
-nbiot,180,extended,-1.2,3,-22.3
-nbiot,180,hint,2.6,2.4,-21.6
-nbiot,180,hintandextended,2.2,1.1,-21.5
+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
diff --git a/analysis/figures/delta_energy_training.pdf b/analysis/figures/delta_energy_training.pdf
index 7b05f03..2caeaa6 100644
--- a/analysis/figures/delta_energy_training.pdf
+++ b/analysis/figures/delta_energy_training.pdf