Update

7 files changed, 14 insertions, 55 deletions

diff --git a/analysis/days.R b/analysis/days.R
index 4997ffd..8747bc3 100644
--- a/analysis/days.R
+++ b/analysis/days.R
@@ -49,6 +49,9 @@ F1_Score2=function(truth, pred){
     do.call("cbind",result)
 }
 
+## Down scale data
+reduce_days=function(data,every=6){data%>%filter(((days/3) %% every) == 0)}
+
 ## Train models
 generate_accuracy_for=function(ignore_hint=FALSE,seed_max=200,attempts_max=2,wrl="lora",wuf=180) {
     attempts=seq(1,attempts_max)
@@ -128,7 +131,7 @@ if(F){ # Toggle to train
     energy=rbind(lora60$energy,
                  lora180$energy,
                  nbiot60$energy,
-                 nbiot180$energy)%>%left_join(coverage,by=c("wireless","wakeupfor","days"))      
+                 nbiot180$energy)%>%left_join(coverage,by=c("wireless","wakeupfor","days"))
 }
 
 
@@ -172,9 +175,10 @@ ggsave("figures/days_f1-score.pdf",width=8.5,height=6)
 
 
 ## Plot Merge Accuracy
-ggplot(data=learning_curves%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(days,mean_accuracy))+
+ggplot(data=learning_curves%>%mutate(model=ifelse(model=="knn","KNN","DT"))%>%reduce_days(3),
+       aes(days,mean_accuracy))+
     geom_line(aes(linetype=model),size=1.2)+xlab("Training days")+ylab("Model accuracy")+labs(linetype="Models")+
-    scale_x_continuous(breaks = seq(0, 15, by = 1))+
+    scale_x_continuous(breaks = seq(0, max(learning_curves$days), by = 40))+
     scale_y_continuous(breaks = seq(0, 1, by = 0.1))+
     facet_wrap(~wireless+wakeupfor)+
     theme_bw()+
@@ -217,16 +221,20 @@ energy_coverage_delta%>%group_by(wireless,wakeupfor,simkey)%>%group_walk(functio
 ggplot(energy_coverage_delta,aes(days,delta_energy/1e3,color=simkey,shape=simkey))+
     geom_line(size=1.2)+ylab("Delta in energy (kJ)")+xlab("Training days")+
     facet_wrap(~wireless+wakeupfor,scale="free")+
-    scale_color_viridis(discrete=TRUE,option="H",end=0.95)
+    scale_color_viridis(discrete=TRUE,option="H",end=0.95)+labs(color="Class")+
+    theme_bw()+theme(legend.position=c(0.58,0.9),
+                     legend.box.background = element_rect(fill = "white", color = "black",size=0.8))
 ggsave("figures/delta_energy_training.pdf")
 
 ggplot(energy_coverage_delta,aes(days,delta_coverage,color=simkey))+
     geom_line(size=1.2)+ylab("Delta in coverage")+xlab("Training days")+
     facet_wrap(~wireless+wakeupfor,scale="free")+
-    scale_color_viridis(discrete=TRUE,end=0.9)
+    scale_color_viridis(discrete=TRUE,end=0.9)+labs(color="Class")+
+    theme_bw()+theme(legend.position=c(0.45,0.94),
+                     legend.box.background = element_rect(fill = "white", color = "black",size=0.8))
 ggsave("figures/delta_coverage_training.pdf")
 
-ggplot(data=energy%>%filter(((days/3) %% 6) == 0),aes(days,energy/1e6,group=setup,fill=setup))+
+ggplot(data=energy%>%reduce_days(6),aes(days,energy/1e6,group=setup,fill=setup))+
     geom_bar(stat="identity",position="dodge")+
     scale_fill_viridis(discrete=TRUE,option="D")+
     labs(fill="Nodes wireless technology and uptime")+theme(legend.position=c(0.2,0.75))+
diff --git a/analysis/figures/days_accuracy.pdf b/analysis/figures/days_accuracy.pdf
index e97946c..52d9c86 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 1618261..f4fbf23 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 bdd9bfa..4bd5fc4 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 a1b82e1..5de184d 100644
--- a/analysis/figures/delta_coverage_training.pdf
+++ b/analysis/figures/delta_coverage_training.pdf
diff --git a/analysis/figures/delta_energy.csv b/analysis/figures/delta_energy.csv
deleted file mode 100644
index 78ecd38..0000000
--- a/analysis/figures/delta_energy.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-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,-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,-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
diff --git a/analysis/figures/delta_energy_training.pdf b/analysis/figures/delta_energy_training.pdf
index eaa8e85..83aa850 100644
--- a/analysis/figures/delta_energy_training.pdf
+++ b/analysis/figures/delta_energy_training.pdf