From 917a6227b46efd8f77ff9a507c8c93e0be6ce5ac Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Thu, 15 Dec 2022 15:53:03 +0100 Subject: Minor changes --- analysis/analysis.R | 5 +- analysis/days.R | 77 ++++++++++++++++++--- analysis/figures/combined.pdf | Bin 1123336 -> 1131846 bytes analysis/figures/delta_energy.csv | 17 +++++ .../figures/dimension_energy-coverage-policy.pdf | Bin 139310 -> 139310 bytes .../dimension_energy-coverage-wakeupfor.pdf | Bin 137643 -> 137643 bytes analysis/figures/dimension_energy-coverage.pdf | Bin 98704 -> 98701 bytes analysis/figures/knn_elbow_NoHintIsFALSE.pdf | Bin 5324 -> 5324 bytes analysis/figures/knn_elbow_NoHintIsTRUE.pdf | Bin 5290 -> 5290 bytes analysis/figures/months_accuracy.pdf | Bin 11833 -> 6894 bytes analysis/figures/months_energy.pdf | Bin 0 -> 11690 bytes analysis/figures/months_f1-score.pdf | Bin 8120 -> 8120 bytes analysis/figures/random_inputs_NoHintIsFALSE.pdf | Bin 159779 -> 159775 bytes analysis/figures/random_inputs_NoHintIsTRUE.pdf | Bin 159245 -> 159240 bytes analysis/figures/tree_FALSE.pdf | Bin 9593 -> 9580 bytes analysis/figures/tree_TRUE.pdf | Bin 7964 -> 7974 bytes analysis/learning.R | 6 +- 17 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 analysis/figures/delta_energy.csv create mode 100644 analysis/figures/months_energy.pdf diff --git a/analysis/analysis.R b/analysis/analysis.R index bd27626..90874ed 100644 --- a/analysis/analysis.R +++ b/analysis/analysis.R @@ -20,7 +20,7 @@ nwireless=2 nsimkey=4 nsimulations=nseed*nwakeupfor*nwireless*nsimkey # Must be 3200 -if(FALSE){ # Toggle +if(F){ # Toggle ## Load data data=read_csv("../CCGRID2022.csv")%>%distinct() # Note that in the data experiment wireless=="lora",seed==1,wakeupfor==60,simkey=="baseline" is present 2 times in the CSV file tmp_data_coverage=data%>%group_by(simkey,wireless,wakeupfor,seed)%>%mutate(coverage=sum(nDataRcv))%>%ungroup()%>%filter(isSender==1)%>%select(simkey,wireless,wakeupfor,seed,coverage) @@ -50,11 +50,12 @@ GG_VARIOUS=function(){ scale_shape_manual(values=c(22, 15, 16,1))+labs(shape="Policy",color="Policy")+ theme_bw()+ guides(colour = guide_legend(override.aes = list(alpha = 1)))+ - facet_wrap(~wakeupfor+wireless,scale="free")+scale_color_viridis(discrete=TRUE)+ + facet_wrap(~wakeupfor+wireless,scale="free")+scale_color_viridis(discrete=TRUE,option="B")+ theme(legend.position = c(0.15,0.87), legend.background = element_rect(fill = "white", color = "black",size=0.8))+ scale_x_continuous(breaks=seq(0,12)) ggsave("figures/dimension_energy-coverage.pdf") + stopifnot(1) ## Dimension Energy/Coverage Wakeupfor ggplot(data_seed%>%mutate(wakeupfor=as.character(wakeupfor)), aes(coverage,energy,color=wakeupfor))+geom_point(alpha=0.5)+labs(color="Policy")+theme(legend.position="top")+ diff --git a/analysis/days.R b/analysis/days.R index 2b671d1..2155819 100644 --- a/analysis/days.R +++ b/analysis/days.R @@ -94,24 +94,41 @@ generate_accuracy_for=function(ignore_hint=FALSE,seed_max=200,attempts_max=2,wrl } -generate_accuracy = function(wireless,wakeupfor,steps=10, accuracy=10,ignore_hint=TRUE){ +generate_accuracy_energy = function(wireless,wakeupfor,steps=10, accuracy=10,ignore_hint=TRUE){ npolicies=4 - if(ignore_hint){npolicies=npolicies-1} + data_seed_for_energy=data_seed%>%ungroup() + if(ignore_hint){npolicies=npolicies-1;data_seed_for_energy=data_seed%>%filter(simkey!="hint")} + data_seed_for_energy=data_seed_for_energy%>%filter(wireless==!!wireless,wakeupfor==!!wakeupfor) ## Generate inputs result=tibble() + result_energy=tibble() for(i in seq(1,160,by=steps)){ # We stop at 80% of the data (this way test set is at least 20%) acc=generate_accuracy_for(ignore_hint=ignore_hint,seed=i,attempts_max=accuracy,wrl=wireless,wuf=wakeupfor) + result_energy=rbind(result_energy,data_seed_for_energy%>%filter(seed<=i)%>%summarize(energy=sum(energy),seed_max=i,days=i*npolicies,months=days/30,setup=paste0(!!wireless," ",!!wakeupfor,"s"),wireless=!!wireless,wakeupfor=!!wakeupfor)) result=rbind(result,acc) } - result%>%mutate(days=seed_max*npolicies,months=days/30) # Since 3 policies (since ignore_hint=TRUE) + list(accuracy=result%>%mutate(days=seed_max*npolicies,months=days/30), # Since 3 policies (since ignore_hint=TRUE) + energy=result_energy) } +result_energy_policy=rbind(data_seed, + data_seed%>%mutate(seed=seed+200), + data_seed%>%mutate(seed=seed+400), + data_seed%>%mutate(seed=seed+600)) # Almost same as if each experiment run 4 times more seed seed +result_energy_policy=result_energy_policy%>%group_by(wireless,wakeupfor,simkey)%>%mutate(energy=cumsum(energy),setup=paste0(wireless," ",wakeupfor,"s"),days=seed,months=days/30) + # Generate accuracy for each wireless and uptime if(F){ # Toggle to train -accuracy=rbind(generate_accuracy("lora",60), - generate_accuracy("lora",180), - generate_accuracy("nbiot",60), - generate_accuracy("nbiot",180)) + lora60=generate_accuracy_energy("lora",60) + lora180=generate_accuracy_energy("lora",180) + nbiot60=generate_accuracy_energy("nbiot",60) + nbiot180=generate_accuracy_energy("nbiot",180) + accuracy=rbind(lora60$accuracy,lora180$accuracy,nbiot60$accuracy,nbiot180$accuracy) + energy=rbind(lora60$energy, + lora180$energy, + nbiot60$energy, + nbiot180$energy) +# energy$setup=factor(energy$setup,levels=c("lora 60s","nbiot 60s","lora 180s", "nbiot 180s"),ordered=TRUE) } ## Summarize result_summary=accuracy%>%group_by(wireless,wakeupfor,months,model)%>% @@ -127,6 +144,44 @@ metrics_peak=result_summary%>%group_by(wireless,wakeupfor,model)%>% summarize(max_accuracy=max(mean_accuracy)) + + + + +result_energy_policy=result_energy_policy%>%filter(days %in% !!energy$days) +csv_table=result_energy_policy%>% + full_join(energy,by=c("days","wireless","wakeupfor"),suffix=c("","_training")) +csv_table=csv_table%>%group_by(wireless,wakeupfor)%>%summarize(delta=energy-energy_training,simkey=simkey,days=days,months=months) + + +write("wireless,wakeupfor,policy,slope,intercept","figures/delta_energy.csv") +csv_table%>%group_by(wireless,wakeupfor,simkey)%>%group_walk(function(data,grp){ + grp=as.list(grp) + reg=lm(delta/1e3 ~ months,data) + slope=round(as.numeric(reg$coefficients["months"]),digits=1) + intercept=round(as.numeric(reg$coefficients[1]),digits=1) + print(paste0("Wireless=",grp$wireless," Wakeupfor=",grp$wakeupfor," Policy=",grp$simkey," Slope=",slope," Intercept=",intercept)) + write(paste(grp$wireless,grp$wakeupfor,grp$simkey,slope,intercept,sep=","),"figures/delta_energy.csv",append=T) +}) + + +ggplot(csv_table,aes(months,delta/1e3,color=simkey,shape=simkey))+ + geom_line(size=1.2)+geom_point(size=3)+ylab("Delta in energy (kJ)")+xlab("Training months")+ + facet_wrap(~wireless+wakeupfor,scale="free")+ + scale_color_viridis(discrete=TRUE,option="H",end=0.95) + +stopifnot(1) + +ggplot(data=energy,aes(months,energy/1e6,group=setup,fill=setup))+ + geom_bar(stat="identity",position="dodge")+ + scale_fill_viridis(discrete=TRUE,option="D")+ + labs(fill="Nodes wireless technology and uptime")+theme(legend.position=c(0.2,0.75))+ + scale_x_continuous(breaks = seq(0, 15, by = 1))+ + xlab("Number of months")+ylab("Energy consumption (MJ)")+ + geom_point(data=result_energy_policy%>%filter(simkey=="hintandextended"),aes(months,energy/1e6,group=setup,color=simkey),size=1)+facet_wrap(~wireless+wakeupfor) +ggsave("figures/months_energy.pdf",width=8.5,height=4) + + ggplot(data=result_summary%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(linetype=model))+ geom_line(aes(months,mean_f1_baseline,color="Baseline"),size=1.2)+ geom_line(aes(months,mean_f1_extended,color="Extended"),size=1.2)+ @@ -144,11 +199,11 @@ ggplot(data=result_summary%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(l xlab("Training months")+ylab("Classes F1-Score")+ scale_color_viridis(discrete=TRUE,end=0.7) ggsave("figures/months_f1-score.pdf",width=8.5,height=6) -stopifnot(1) + ## Plot Merge Accuracy -ggplot(data=result_summary%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(months,mean_accuracy,color=model,shape=model))+ - geom_point(size=3)+geom_line(size=1.2)+xlab("Training months")+ylab("Model accuracy")+labs(color="Models",shape="Models")+ +ggplot(data=result_summary%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(months,mean_accuracy))+ + geom_line(aes(linetype=model),size=1.2)+xlab("Training months")+ylab("Model accuracy")+labs(linetype="Models")+ scale_x_continuous(breaks = seq(0, 15, by = 1))+ scale_y_continuous(breaks = seq(0, 1, by = 0.1))+ facet_wrap(~wireless+wakeupfor)+ @@ -158,7 +213,7 @@ ggplot(data=result_summary%>%mutate(model=ifelse(model=="knn","KNN","DT")),aes(m legend.background = element_rect(fill = "white", color = "black",size=0.8))+ scale_color_viridis(discrete=TRUE,end=0.7) ggsave("figures/months_accuracy.pdf",width=8.5,height=6) - +stopifnot(1) ## Plot accuracy + F1-Score sapply(c("knn","tree"),function(grp){ diff --git a/analysis/figures/combined.pdf b/analysis/figures/combined.pdf index 4d4b866..68e9bd3 100644 Binary files a/analysis/figures/combined.pdf and b/analysis/figures/combined.pdf differ diff --git a/analysis/figures/delta_energy.csv b/analysis/figures/delta_energy.csv new file mode 100644 index 0000000..3b622ef --- /dev/null +++ b/analysis/figures/delta_energy.csv @@ -0,0 +1,17 @@ +wireless,wakeupfor,policy,slope,intercept +lora,60,baseline,-16.3,-0.7 +lora,60,extended,6.4,-0.5 +lora,60,hint,-14.2,-0.5 +lora,60,hintandextended,10.1,-0.6 +lora,180,baseline,-20.3,0.1 +lora,180,extended,-14.5,0.1 +lora,180,hint,93.9,-2.3 +lora,180,hintandextended,35,0.7 +nbiot,60,baseline,-2.9,-2.4 +nbiot,60,extended,-2.4,-2 +nbiot,60,hint,6.5,-1.5 +nbiot,60,hintandextended,5.3,0.3 +nbiot,180,baseline,-31.6,2.8 +nbiot,180,extended,-36.2,2.7 +nbiot,180,hint,78.1,2.2 +nbiot,180,hintandextended,67.5,0.9 diff --git a/analysis/figures/dimension_energy-coverage-policy.pdf b/analysis/figures/dimension_energy-coverage-policy.pdf index 8798a50..a0f62c2 100644 Binary files a/analysis/figures/dimension_energy-coverage-policy.pdf and b/analysis/figures/dimension_energy-coverage-policy.pdf differ diff --git a/analysis/figures/dimension_energy-coverage-wakeupfor.pdf b/analysis/figures/dimension_energy-coverage-wakeupfor.pdf index 77c2b09..99607a5 100644 Binary files a/analysis/figures/dimension_energy-coverage-wakeupfor.pdf and b/analysis/figures/dimension_energy-coverage-wakeupfor.pdf differ diff --git a/analysis/figures/dimension_energy-coverage.pdf b/analysis/figures/dimension_energy-coverage.pdf index 91c195f..76d9306 100644 Binary files a/analysis/figures/dimension_energy-coverage.pdf and b/analysis/figures/dimension_energy-coverage.pdf differ diff --git a/analysis/figures/knn_elbow_NoHintIsFALSE.pdf b/analysis/figures/knn_elbow_NoHintIsFALSE.pdf index 31eb996..2499924 100644 Binary files a/analysis/figures/knn_elbow_NoHintIsFALSE.pdf and b/analysis/figures/knn_elbow_NoHintIsFALSE.pdf differ diff --git a/analysis/figures/knn_elbow_NoHintIsTRUE.pdf b/analysis/figures/knn_elbow_NoHintIsTRUE.pdf index 96072cc..7737b06 100644 Binary files a/analysis/figures/knn_elbow_NoHintIsTRUE.pdf and b/analysis/figures/knn_elbow_NoHintIsTRUE.pdf differ diff --git a/analysis/figures/months_accuracy.pdf b/analysis/figures/months_accuracy.pdf index 51c8440..3bf5b94 100644 Binary files a/analysis/figures/months_accuracy.pdf and b/analysis/figures/months_accuracy.pdf differ diff --git a/analysis/figures/months_energy.pdf b/analysis/figures/months_energy.pdf new file mode 100644 index 0000000..7a5bb39 Binary files /dev/null and b/analysis/figures/months_energy.pdf differ diff --git a/analysis/figures/months_f1-score.pdf b/analysis/figures/months_f1-score.pdf index 42557a8..1880ffb 100644 Binary files a/analysis/figures/months_f1-score.pdf and b/analysis/figures/months_f1-score.pdf differ diff --git a/analysis/figures/random_inputs_NoHintIsFALSE.pdf b/analysis/figures/random_inputs_NoHintIsFALSE.pdf index 3795adc..450a430 100644 Binary files a/analysis/figures/random_inputs_NoHintIsFALSE.pdf and b/analysis/figures/random_inputs_NoHintIsFALSE.pdf differ diff --git a/analysis/figures/random_inputs_NoHintIsTRUE.pdf b/analysis/figures/random_inputs_NoHintIsTRUE.pdf index c5a7506..61098e0 100644 Binary files a/analysis/figures/random_inputs_NoHintIsTRUE.pdf and b/analysis/figures/random_inputs_NoHintIsTRUE.pdf differ diff --git a/analysis/figures/tree_FALSE.pdf b/analysis/figures/tree_FALSE.pdf index fd9f08d..8ecbe5d 100644 Binary files a/analysis/figures/tree_FALSE.pdf and b/analysis/figures/tree_FALSE.pdf differ diff --git a/analysis/figures/tree_TRUE.pdf b/analysis/figures/tree_TRUE.pdf index 56466fc..95f9025 100644 Binary files a/analysis/figures/tree_TRUE.pdf and b/analysis/figures/tree_TRUE.pdf differ diff --git a/analysis/learning.R b/analysis/learning.R index 7273338..da444d8 100644 --- a/analysis/learning.R +++ b/analysis/learning.R @@ -164,7 +164,7 @@ generate_inputs=function(ignore_hint=FALSE) { ## Prints print(paste0("Accuracy: KNN=",knn_accuracy,"% CART=",tree_accuracy,"%")) pdf(paste0("figures/tree_",as.character(ignore_hint),".pdf")) - tree_plot=rpart.plot(tree,box.palette=as.list(viridis::viridis(4,begin=0.48))) + tree_plot=rpart.plot(tree,box.palette=as.list(viridis::viridis(4,begin=0.48)),tweak=1.111) silent_call=dev.off() ## Notes: KNN accuracy jump to 76% and CART to 80% accuracy without the hint policy @@ -210,5 +210,5 @@ generate_inputs=function(ignore_hint=FALSE) { } ## Generate inputs -#generate_inputs(FALSE) -#generate_inputs(TRUE) +generate_inputs(FALSE) +generate_inputs(TRUE) -- cgit v1.2.3