Minor changes

6 files changed, 21 insertions, 21 deletions

diff --git a/analysis/days.R b/analysis/days.R
index dd9a819..52fb878 100644
--- a/analysis/days.R
+++ b/analysis/days.R
@@ -52,6 +52,13 @@ F1_Score2=function(truth, pred){
 ## Down scale data
 reduce_days=function(data,every=6){data%>%filter(((days/3) %% every) == 0)}
 
+## GGPlot Theme
+th = function(option="D") {list(theme_bw(),
+                                theme(legend.box.background = element_rect(fill = "white", color = "black",size=0.9),
+                                      strip.background =element_rect(fill="#F5F5F5")),
+                     scale_color_viridis(discrete=TRUE,option=option,end=0.95),
+                     scale_fill_viridis(discrete=TRUE,option=option,end=0.95))}
+
 ## Train models
 generate_accuracy_for=function(ignore_hint=FALSE,seed_max=200,attempts_max=2,wrl="lora",wuf=180) {
     attempts=seq(1,attempts_max)
@@ -155,37 +162,33 @@ learning_curves=accuracy%>%group_by(wireless,wakeupfor,days,model)%>%
         min_f1_hintandextended=min(f1_hintandextended),max_f1_hintandextended=max(f1_hintandextended))
 
 
-ggplot(data=learning_curves%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(linetype=model))+
+ggplot(data=learning_curves%>%mutate(model=ifelse(model=="knn","KNN","DT"))%>%reduce_days(6),aes(linetype=model))+
     geom_line(aes(days/30,mean_f1_baseline,color="Baseline"),size=1.2)+
     geom_line(aes(days/30,mean_f1_extended,color="Extended"),size=1.2)+
     geom_line(aes(days/30,mean_f1_hintandextended,color="Hintandextended"),size=1.2)+labs(color="Classes",linetype="Model")+
     facet_wrap(~wireless+wakeupfor)+
     scale_x_continuous(breaks = seq(0, max(learning_curves$days/30)))+
     scale_y_continuous(breaks = seq(0, 1, by = 0.1))+
-    theme_bw()+
+    th()+
     theme(panel.grid.minor = element_blank(),
           legend.position = c(0.9,0.74),
           legend.margin = margin(2,4,2,4),
           legend.spacing=unit(-0.2,"cm"),
-          legend.box.margin=margin(1,1,1,1),
-          legend.box.background = element_rect(fill = "white", color = "black",size=0.8))+
-    xlab("Training months")+ylab("Classes F1-Score")+
-    scale_color_viridis(discrete=TRUE,end=0.7)
+          legend.box.margin=margin(1,1,1,1))+
+    xlab("Training duration (months)")+ylab("Classes F1-Score")
 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"))%>%reduce_days(3),
        aes(days/30,mean_accuracy))+
-    geom_line(aes(linetype=model),size=1.2)+xlab("Training months")+ylab("Model accuracy")+labs(linetype="Models")+
+    geom_line(aes(linetype=model),size=1.2)+xlab("Training duration (months)")+ylab("Model accuracy")+labs(linetype="Models")+
     scale_x_continuous(breaks = seq(0, max(learning_curves$days/30)))+
     scale_y_continuous(breaks = seq(0, 1, by = 0.1))+
     facet_wrap(~wireless+wakeupfor)+
-    theme_bw()+
+    th()+
     theme(panel.grid.minor = element_blank(),
-          legend.position = c(0.38,0.68),
-          legend.background = element_rect(fill = "white", color = "black",size=0.8))+
-    scale_color_viridis(discrete=TRUE,end=0.7)
+          legend.position = c(0.38,0.68))
 ggsave("figures/days_accuracy.pdf",width=8.5,height=6)
 
 
@@ -217,26 +220,23 @@ 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 months")+
+    geom_line(size=1.2)+ylab("Delta in energy (kJ)")+xlab("Training duration (months)")+
     facet_wrap(~wireless+wakeupfor,scale="free")+
-    scale_color_viridis(discrete=TRUE,option="H",end=0.95)+labs(color="Class")+
-    theme_bw()+theme(legend.position="top",
-                     legend.box.spacing=margin(0,0,0,0))
+    th()+theme(legend.position="top")+labs(color="Classes")
 ggsave("figures/delta_energy_training.pdf")
 
 ggplot(energy_coverage_delta,aes(days/30,delta_coverage,color=simkey))+
-    geom_line(size=1.2)+ylab("Delta in coverage")+xlab("Training months")+
+    geom_line(size=1.2)+ylab("Delta in coverage")+xlab("Training duration (months)")+
     facet_wrap(~wireless+wakeupfor,scale="free")+
-    scale_color_viridis(discrete=TRUE,end=0.9)+labs(color="Class")+
-    theme_bw()+theme(legend.position="top",legend.box.spacing=margin(0,0,0,0))
+    th()+theme(legend.position="top")+labs(color="Classes")
 ggsave("figures/delta_coverage_training.pdf",width=9)
 
 ggplot(data=energy%>%reduce_days(6),aes(days/30,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))+
+    labs(fill="Wireless and Uptime")+
     scale_x_continuous(breaks = seq(0, max(energy$days/30)))+
-    xlab("Number of months")+ylab("Energy consumption (MJ)")
+    xlab("Training duration (months)")+ylab("Energy consumption (MJ)")+
+    th()+theme(legend.position=c(0.12,0.75))
 ggsave("figures/days_energy.pdf",width=8.5,height=4)
 
 
diff --git a/analysis/figures/days_accuracy.pdf b/analysis/figures/days_accuracy.pdf
index 35ce206..675fbec 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 2650abc..b74971b 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 7acbd99..fb55119 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 91b0f10..1054687 100644
--- a/analysis/figures/delta_coverage_training.pdf
+++ b/analysis/figures/delta_coverage_training.pdf
diff --git a/analysis/figures/delta_energy_training.pdf b/analysis/figures/delta_energy_training.pdf
index 9a36559..7b05f03 100644
--- a/analysis/figures/delta_energy_training.pdf
+++ b/analysis/figures/delta_energy_training.pdf