Update

7 files changed, 26 insertions, 26 deletions

diff --git a/analysis/days.R b/analysis/days.R
index fa706f6..5f87555 100644
--- a/analysis/days.R
+++ b/analysis/days.R
@@ -202,23 +202,27 @@ data_seed_energy=rbind(data_seed,
                            data_seed%>%mutate(seed=seed+600)) # Almost same as if each experiment run 4 times more seed seed
 ## Compute the cumulative energy of each policies in each configuration accross the 4*200 days
 data_seed_energy=data_seed_energy%>%group_by(wireless,wakeupfor,simkey)%>%mutate(energy=cumsum(energy),setup=paste0(wireless," ",wakeupfor,"s"),days=seed)
+## Now sum coverage of each 3 days (like in the energy data frame)
+data_seed_energy=data_seed_energy%>%group_by(wireless,wakeupfor,simkey)%>%mutate(grp=ceiling(days/3))%>%group_by(wireless,wakeupfor,simkey,grp)%>%mutate(coverage=cumsum(coverage))%>%filter(days%%3==0)
 ## Now filter the data
 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)/3) # delta_coverage divide by 3 because we want the average per day (coverage is measure every 3 days (round-robin of 3 policies))
+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,coverage=coverage/3,coverage_training=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")
+write("wireless,wakeupfor,policy,slope,intercept,delta_coverage,coverage,coverage_training,latex","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 ~ days,data)
-    slope=round(as.numeric(reg$coefficients["days"]),digits=1)
-    intercept=round(as.numeric(reg$coefficients[1]),digits=1)
+    slope=round(as.numeric(reg$coefficients["days"]),digits=0)
+    intercept=round(as.numeric(reg$coefficients[1]),digits=0)
     mean_delta_coverage=round(mean(data$delta_coverage),digits=1)
+    mean_coverage=round(mean(data$coverage),digits=1)
+    mean_coverage_training=round(mean(data$coverage_training),digits=1)
     print(paste0("Wireless=",grp$wireless," Wakeupfor=",grp$wakeupfor," Policy=",grp$simkey," Slope=",slope," Intercept=",intercept," Delta Coverage=",mean_delta_coverage))
-    write(paste(grp$wireless,grp$wakeupfor,grp$simkey,slope,intercept,mean_delta_coverage,sep=","),"figures/delta_energy_coverage.csv",append=T)
+    write(paste(grp$wireless,grp$wakeupfor,grp$simkey,slope,intercept,mean_delta_coverage,mean_coverage,mean_coverage_training,paste0(r"("$\mathbf{s=)",slope,",c_p=",mean_coverage,",c_t=",mean_coverage_training,r"(}$")"),sep=","),"figures/delta_energy_coverage.csv",append=T)
 })
 
 ggplot(energy_coverage_delta,aes(days/30,delta_energy/1e3,color=simkey,shape=simkey))+
diff --git a/analysis/figures/days_accuracy.pdf b/analysis/figures/days_accuracy.pdf
index e3e3ebc..c99896d 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 85fb106..a11a71a 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 6a82c72..106d9db 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 6634a09..3ea9f52 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 35eb48a..d483355 100644
--- a/analysis/figures/delta_energy_coverage.csv
+++ b/analysis/figures/delta_energy_coverage.csv
@@ -1,21 +1,17 @@
-wireless,wakeupfor,policy,slope,intercept,delta_coverage
-
-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
+wireless,wakeupfor,policy,slope,intercept,delta_coverage,coverage,coverage_training,latex
+lora,60,baseline,-544,-1108,-4.2,0,4.2,"$\mathbf{s=-544,c_p=0,c_t=4.2}$"
+lora,60,extended,215,-880,1.8,6,4.2,"$\mathbf{s=215,c_p=6,c_t=4.2}$"
+lora,60,hint,-473,-840,-4.2,0,4.2,"$\mathbf{s=-473,c_p=0,c_t=4.2}$"
+lora,60,hintandextended,337,-923,2.4,6.6,4.2,"$\mathbf{s=337,c_p=6.6,c_t=4.2}$"
+lora,180,baseline,-676,-19,-6.1,2.2,8.3,"$\mathbf{s=-676,c_p=2.2,c_t=8.3}$"
+lora,180,extended,-483,84,2.5,10.9,8.3,"$\mathbf{s=-483,c_p=10.9,c_t=8.3}$"
+lora,180,hint,3132,-3341,2.9,11.2,8.3,"$\mathbf{s=3132,c_p=11.2,c_t=8.3}$"
+lora,180,hintandextended,1166,668,3.6,11.9,8.3,"$\mathbf{s=1166,c_p=11.9,c_t=8.3}$"
+nbiot,60,baseline,-97,-2827,-3,2.5,5.5,"$\mathbf{s=-97,c_p=2.5,c_t=5.5}$"
+nbiot,60,extended,-77,-2565,0.9,6.4,5.5,"$\mathbf{s=-77,c_p=6.4,c_t=5.5}$"
+nbiot,60,hint,216,-1557,-0.6,4.9,5.5,"$\mathbf{s=216,c_p=4.9,c_t=5.5}$"
+nbiot,60,hintandextended,179,20,2.1,7.6,5.5,"$\mathbf{s=179,c_p=7.6,c_t=5.5}$"
+nbiot,180,baseline,-1054,3070,-0.8,10.4,11.1,"$\mathbf{s=-1054,c_p=10.4,c_t=11.1}$"
+nbiot,180,extended,-1210,2996,0,11.1,11.1,"$\mathbf{s=-1210,c_p=11.1,c_t=11.1}$"
+nbiot,180,hint,2603,2433,0.7,11.9,11.1,"$\mathbf{s=2603,c_p=11.9,c_t=11.1}$"
+nbiot,180,hintandextended,2249,1118,0.8,11.9,11.1,"$\mathbf{s=2249,c_p=11.9,c_t=11.1}$"
diff --git a/analysis/figures/delta_energy_training.pdf b/analysis/figures/delta_energy_training.pdf
index 6524b08..da6bc6a 100644
--- a/analysis/figures/delta_energy_training.pdf
+++ b/analysis/figures/delta_energy_training.pdf