Debug/Cleaning

3 files changed, 8 insertions, 6 deletions

diff --git a/results/analysis.R b/results/analysis.R
index 60ee966..bdc95a4 100644
--- a/results/analysis.R
+++ b/results/analysis.R
@@ -3,6 +3,8 @@ library("knitr")
 
 data=read_csv("results.csv")
 
+r_=function(x){round(x,digits=2)}
+
 finalEnergy=data%>%group_by(simkey,wireless,wakeupfor)%>%summarize(wireless=first(wireless),sd=sd(energy),wakeupfor=first(wakeupfor),energy=mean(energy))
 finalStats=data%>%group_by(simkey,wireless,wakeupfor,seed)%>%
     summarise(success=sum(nSend))%>%
@@ -32,9 +34,9 @@ ggplot(finalEnergy,aes(x=simkey,y=energy,fill=wireless))+
     xlab("Scenarios")+ylab("Energy (J)")+
     geom_errorbar(position=position_dodge(0.9),aes(ymin=energy-sd, ymax=energy+sd),width=0.5,size=1.5,) +
     facet_wrap(~ wakeupfor) +
-    geom_text(aes(label = round(energy+sd), y= energy+sd),vjust=-0.4,position=position_dodge(0.9))+
-    geom_text(aes(label = round(energy-sd), y= energy-sd),vjust=+1.5,position=position_dodge(0.9))+
-    geom_text(aes(label = round(energy), y= energy/2),fontface="bold",colour="white",position=position_dodge(0.9))
+    geom_text(aes(label = r_(energy+sd), y= energy+sd),vjust=-0.4,position=position_dodge(0.9))+
+    geom_text(aes(label = r_(energy-sd), y= energy-sd),vjust=+1.5,position=position_dodge(0.9))+
+    geom_text(aes(label = r_(energy), y= energy/2),fontface="bold",colour="white",position=position_dodge(0.9))
 ggsave("energy.png")
 
 
@@ -42,9 +44,9 @@ ggplot(finalStats,aes(x=simkey,y=success,fill=wireless))+
     geom_bar(stat="identity",position=position_dodge())+
     xlab("Scenarios")+ylab("Energy (J)")+
     geom_errorbar(position=position_dodge(0.9),aes(ymin=success-sd_success, ymax=success+sd_success),width=0.5,size=1.5,) +
-    geom_text(aes(label = round(success+sd_success,digits=1), y= success+sd_success),vjust=-0.4,position=position_dodge(0.9))+
-    geom_text(aes(label = round(success-sd_success,digits=1), y= success-sd_success),vjust=+1.5,position=position_dodge(0.9))+
-    geom_text(aes(label = round(success,digits=1), y= success/2),fontface="bold",colour="white",position=position_dodge(0.9))+
+    geom_text(aes(label = r_(success+sd_success), y= success+sd_success),vjust=-0.4,position=position_dodge(0.9))+
+    geom_text(aes(label = r_(success-sd_success), y= success-sd_success),vjust=+1.5,position=position_dodge(0.9))+
+    geom_text(aes(label = r_(success), y= success/2),fontface="bold",colour="white",position=position_dodge(0.9))+
     facet_wrap(~ wakeupfor) +
 ggsave("success.png")
 
diff --git a/results/energy.png b/results/energy.png
index 612b75b..487c8aa 100644
--- a/results/energy.png
+++ b/results/energy.png
diff --git a/results/success.png b/results/success.png
index 4033967..00f4d28 100644
--- a/results/success.png
+++ b/results/success.png