From 3b6e0ab0b83405e3c0f88c57bc00eeb9223d5404 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Wed, 21 Jul 2021 07:45:20 +0200 Subject: [PATCH] Correct rounding --- results/180sec.pdf | Bin 10343 -> 10343 bytes results/60sec.pdf | Bin 10611 -> 10611 bytes results/analysis2.R | 12 ++++++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/results/180sec.pdf b/results/180sec.pdf index 2cf3a79851bb9df79dbce6b2b111849cc8a8aaf2..aeeaa76f804d8c698efe4b8ad4279e1d740bfbaa 100644 GIT binary patch delta 48 vcmaDJ@H}9GnX0*wp@F%Hk%_q`m%eX)ic4Zis)B}#m5~8R945ChnnwcwU;GUD delta 48 wcmaDJ@H}9GnW~wQk)g4vk)equm%eX)ic4Zis)B}#m63swp#fZOV>FKj0A8{T=>Px# diff --git a/results/60sec.pdf b/results/60sec.pdf index f8bfdb30026f0b50d196a59bff71e2229894d4b6..38da5ac5255d8d439e0e594625fbdff7fbe37189 100644 GIT binary patch delta 48 vcmewy^f_pPnX0*wp@F%Hk%_q`m%eX)ic4Zis)B}#m5~8R945ChT0#>5Wi<^V delta 48 vcmewy^f_pPnW~wQk)g3E5NmSj`{t*(B$lKqXt-Dz85kKFz~weZOK1WBW5o>+ diff --git a/results/analysis2.R b/results/analysis2.R index 4af75ed..952db12 100644 --- a/results/analysis2.R +++ b/results/analysis2.R @@ -41,10 +41,10 @@ energy60Baseline=energy60%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id="i energy60=energy60%>%left_join(energy60Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) energy60=energy60%>%mutate(ovhd=energy*100/energy_baseline-100) energy60=energy60%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),"%)")) -success60Snd=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=r_(mean(nSend)),type="Sender") -success60Rcv=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=r_(mean(nSend)),type="Receiver") +success60Snd=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success60Rcv=data%>%filter(wakeupfor==60)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") success60=rbind(success60Snd,success60Rcv) -success60=success60%>%rowwise()%>%mutate(success_txt=paste0("[",success,"]")) +success60=success60%>%rowwise()%>%mutate(success_txt=paste0("[",r_(success),"]")) energy60=energy60%>%left_join(success60)%>%rowwise()%>%mutate(infos=paste0(ovhd_txt,"\n{",r_(energy/success_orig),"}")) energy60=energy60%>%mutate(type=factor(type,levels = c("Sender","Receiver"))) @@ -70,10 +70,10 @@ energy180Baseline=energy180%>%filter(simkey=="baseline")%>%uncount(nsimkeys,.id= energy180=energy180%>%left_join(energy180Baseline,by=c("simkey","wireless","type"),suffix = c("","_baseline")) energy180=energy180%>%mutate(ovhd=energy*100/energy_baseline-100) energy180=energy180%>%rowwise()%>%mutate(ovhd_txt=paste0("(",s_(ovhd),r_(ovhd),"%)")) -success180Snd=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=r_(mean(nSend)),type="Sender") -success180Rcv=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=r_(mean(nSend)),type="Receiver") +success180Snd=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Sender") +success180Rcv=data%>%filter(wakeupfor==180)%>%filter(isSender!=0)%>%group_by(simkey,wireless,wakeupfor)%>%summarise(success_orig=mean(nSend),success=mean(nSend),type="Receiver") success180=rbind(success180Snd,success180Rcv) -success180=success180%>%rowwise()%>%mutate(success_txt=paste0("[",success,"]")) +success180=success180%>%rowwise()%>%mutate(success_txt=paste0("[",r_(success),"]")) energy180=energy180%>%left_join(success180)%>%rowwise()%>%mutate(infos=paste0(ovhd_txt,"\n{",r_(energy/success_orig),"}")) energy180=energy180%>%mutate(type=factor(type,levels = c("Sender","Receiver")))