Refresh all scenarios

1 files changed, 9 insertions, 2 deletions

diff --git a/results/analysis.R b/results/analysis.R
index c3eb093..60ee966 100644
--- a/results/analysis.R
+++ b/results/analysis.R
@@ -5,9 +5,9 @@ data=read_csv("results.csv")
 
 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),totalUptime=mean(totalUptime))%>%
+    summarise(success=sum(nSend))%>%
     ungroup()%>%group_by(simkey,wireless,wakeupfor)%>%
-    summarise(sd_success=sd(success),success=mean(success),totalUptime=first(totalUptime))
+    summarise(sd_success=sd(success),success=mean(success))
 
 # Sender energy
 senderEnergy=data%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(senderEnergy=mean(energy))
@@ -15,6 +15,13 @@ receiverEnergy=data%>%filter(isSender==0)%>%group_by(simkey,wireless,wakeupfor)%
 finalStats=finalStats%>%left_join(senderEnergy,by=c("simkey","wireless","wakeupfor"))
 finalStats=finalStats%>%left_join(receiverEnergy,by=c("simkey","wireless","wakeupfor"))
 
+# Uptime
+senderUptime=data%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(senderUptime=mean(totalUptime))
+receiverUptime=data%>%filter(isSender==0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(receiverUptime=mean(totalUptime))
+finalStats=finalStats%>%left_join(senderUptime,by=c("simkey","wireless","wakeupfor"))
+finalStats=finalStats%>%left_join(receiverUptime,by=c("simkey","wireless","wakeupfor"))
+
+
 # Add nSendFail to stats
 sendFail=data%>%filter(node=="on0")%>%group_by(simkey,wireless,wakeupfor)%>%summarise(nSendFail=mean(nSendFail))
 finalStats=finalStats%>%left_join(sendFail,by=c("simkey","wireless","wakeupfor"))