Minor changes

2 files changed, 12 insertions, 7 deletions

diff --git a/results/pareto.R b/results/pareto.R
index a1cebd2..0a656d3 100644
--- a/results/pareto.R
+++ b/results/pareto.R
@@ -70,18 +70,19 @@ return(rbind(total60%>%mutate(wakeupfor=60),total180%>%mutate(wakeupfor=180)))
 stats_sor=build_stats("logs/sor_results/results.csv")%>%filter(type=="Sender")%>%mutate(strategy="SOR")
 stats_uor=build_stats("logs/uor_results/results.csv")%>%filter(type=="Sender")%>%mutate(strategy="UOR")
 stats_fh=build_stats("logs/farhint_results/results.csv")%>%filter(type=="Sender")%>%mutate(strategy="FH")
-stats=rbind(stats_sor,stats_uor,stats_fh)%>%filter(wireless=="nbiot",wakeupfor==60) # Change filter as you which (which plot you want down bellow)
-
+stats_cmb=build_stats("logs/combined/results.csv")%>%filter(type=="Sender")%>%mutate(strategy="Combined")
+stats_none=build_stats("results_prev.csv")%>%filter(type=="Sender")%>%mutate(strategy="None")
+stats=rbind(stats_sor,stats_uor,stats_fh,stats_cmb,stats_none)%>%filter(wireless=="nbiot",wakeupfor==60) # Change filter as you which (which plot you want down bellow)
 
 pareto=tibble()
 stats%>%ungroup()%>%group_by(wakeupfor,wireless)%>%group_walk(function(data, t){
-for(i in 1:NROW(data)){
+    for(i in 1:NROW(data)){
     pt=data[i,]
     e=pt$energy
     s=pt$success
 
     domE=data$energy<e
-    domS=data$success>s
+    domS=data$success>=s
 
     if(!any(domE & domS)){
         pareto<<-rbind(pareto,cbind(pt,t))
@@ -90,13 +91,17 @@ for(i in 1:NROW(data)){
 pareto = pareto %>% mutate(energy = as.numeric(energy))
 pareto = pareto %>% mutate(success = as.numeric(success))
 pareto = pareto %>% arrange(energy,success)
-pareto = pareto %>%dformat()
+pareto = pareto %>% dformat()
 
 ggplot(stats%>%dformat(),aes(energy,success,color=simkey,shape=strategy))+
     geom_line(data=pareto,aes(energy,success),linetype="dashed", size=1,inherit.aes=FALSE)+
     geom_point(alpha=0.1,size=4)+
     geom_point(data=pareto,size=4)+scale_y_reverse()+
-    labs(color="Policies:",shape="Strategies:")+scale_color_brewer(palette = "Spectral")+theme_minimal()+theme(legend.position="top", text=element_text(size=20))+
+    labs(color="Policies:",shape="Strategies:")+scale_color_brewer(palette = "Spectral")+theme_minimal()+theme(text=element_text(size=20), legend.position=c(.8,.75),legend.box.background = element_rect(color="black", size=1, fill="white"))+
     xlab("Sender energy consumption (J)")+ylab(TeX(r'(#Succ$_p$)'))
 #    +facet_wrap(~wakeupfor+wireless,scale="free")
-ggsave("pareto.pdf",width=9,height=9)
+ggsave("pareto.pdf",width=10,height=9)
+
+message("Pareto infos:")
+print(pareto%>%group_by(simkey)%>%summarize(count=n()))
+print(pareto%>%group_by(strategy)%>%summarize(count=n()))
diff --git a/results/pareto.pdf b/results/pareto.pdf
index c887242..f4f1a97 100644
--- a/results/pareto.pdf
+++ b/results/pareto.pdf