Update

7 files changed, 11 insertions, 6 deletions

diff --git a/analysis/analysis.R b/analysis/analysis.R
index bad95ce..1a323a2 100644
--- a/analysis/analysis.R
+++ b/analysis/analysis.R
@@ -77,18 +77,23 @@ GG_VARIOUS=function(){
 
 
 GG_SIMULATIONS = function() {
+    sim_means=sim%>%group_by(wireless,wakeupfor,model)%>%summarize(mean_energy=mean(mean_energy_delta),mean_coverage=mean(mean_coverage_delta))
     ## Dimension Energy
     ggplot(sim,aes(id,mean_energy_delta,color=model))+
+        geom_hline(data=sim_means,aes(yintercept=mean_energy,color=model),linetype="dashed")+
         geom_ribbon(aes(ymin=mean_energy_delta-sd_energy_delta,ymax=mean_energy_delta+sd_energy_delta,fill=model),alpha=0.2,color=NA)+
         geom_point(aes(shape=simkey),size=2)+geom_line()+facet_wrap(~wireless+wakeupfor,scale="free")+ggtitle("Simulation Dimension Energy")+ylab("Energy Relative Absolute Error (J)")+
-        scale_x_continuous("Experiments id",breaks=seq(1,max(sim$id)))+theme(panel.grid.minor = element_blank())+labs(shape="Predictions")
-    ggsave("figures/sim_dimension_energy.pdf")
+        scale_x_continuous("Experiments id",breaks=seq(1,max(sim$id)))+theme(panel.grid.minor = element_blank())+labs(shape="Predictions")+
+        guides(fill=guide_legend(title="Models"),color=guide_legend(title="Models"))
+    ggsave("figures/sim_dimension_energy.pdf",width=11)
     ## Dimension Coverage
     ggplot(sim,aes(id,mean_coverage_delta,color=model))+
+        geom_hline(data=sim_means,aes(yintercept=mean_coverage,color=model),linetype="dashed")+
         geom_ribbon(aes(ymin=mean_coverage_delta-sd_coverage_delta,ymax=mean_coverage_delta+sd_coverage_delta,fill=model),alpha=0.2,color=NA)+
         geom_point(aes(shape=simkey),size=2)+geom_line()+facet_wrap(~wireless+wakeupfor,scale="free")+ggtitle("Simulation Dimension Coverage")+ylab("Coverage Relative Absolute Error")+
-        scale_x_continuous("Experiments id",breaks=seq(1,max(sim$id)))+theme(panel.grid.minor = element_blank())+labs(shape="Predictions")
-    ggsave("figures/sim_dimension_coverage.pdf")
+        scale_x_continuous("Experiments id",breaks=seq(1,max(sim$id)))+theme(panel.grid.minor = element_blank())+labs(shape="Predictions")+
+        guides(fill=guide_legend(title="Models"),color=guide_legend(title="Models"))
+    ggsave("figures/sim_dimension_coverage.pdf",width=11)
 
 }
 
diff --git a/analysis/figures/combined.pdf b/analysis/figures/combined.pdf
index abddf90..9658dbd 100644
--- a/analysis/figures/combined.pdf
+++ b/analysis/figures/combined.pdf
diff --git a/analysis/figures/random_inputs.pdf b/analysis/figures/random_inputs.pdf
index a2b32da..14e48fa 100644
--- a/analysis/figures/random_inputs.pdf
+++ b/analysis/figures/random_inputs.pdf
diff --git a/analysis/figures/sim_dimension_coverage.pdf b/analysis/figures/sim_dimension_coverage.pdf
index 088a813..dc40733 100644
--- a/analysis/figures/sim_dimension_coverage.pdf
+++ b/analysis/figures/sim_dimension_coverage.pdf
diff --git a/analysis/figures/sim_dimension_energy.pdf b/analysis/figures/sim_dimension_energy.pdf
index 9f3d370..83ecb0e 100644
--- a/analysis/figures/sim_dimension_energy.pdf
+++ b/analysis/figures/sim_dimension_energy.pdf
diff --git a/analysis/figures/tree.pdf b/analysis/figures/tree.pdf
index 4d0d44b..0478306 100644
--- a/analysis/figures/tree.pdf
+++ b/analysis/figures/tree.pdf
diff --git a/analysis/learning.R b/analysis/learning.R
index c8c61b8..cb8a3b4 100644
--- a/analysis/learning.R
+++ b/analysis/learning.R
@@ -80,7 +80,7 @@ constraints=apply(inputs,1,function(row){
     min_coverage=min((data_seed%>%filter(wireless==wi,wakeupfor==wa))$coverage)
     max_coverage=max((data_seed%>%filter(wireless==wi,wakeupfor==wa))$coverage)
     ## Generate random points (10 per scenarios)
-    n=10
+    n=20
     current_inputs=tibble(
         wireless=rep(wi,n),
         wakeupfor=rep(wa,n),
@@ -96,7 +96,7 @@ constraints=apply(inputs,1,function(row){
     tree_final=tibble(cbind(current_inputs,tibble(simkey=predictions_tree,model="tree")))
     rbind(knn_final,tree_final)
 })
-inputs=do.call("rbind",constraints)
+inputs=do.call("rbind",constraints)%>%distinct()
 ## Dimension Energy/Coverage
 ggplot(data_seed%>%mutate(wakeupfor=as.character(wakeupfor)),
        aes(coverage,energy,color=simkey))+geom_point()+