From 8c39751a11201ecf4d0d45046876f03cd323e9f6 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sat, 2 Nov 2019 17:53:27 +0100 Subject: [PATCH] Prepare for complementary --- r/config_light.R | 33 ++++++++++++++++++++------------- scripts/Makefile | 26 +++++++++++++------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/r/config_light.R b/r/config_light.R index f2aeb15..efae1d5 100644 --- a/r/config_light.R +++ b/r/config_light.R @@ -4,18 +4,20 @@ library(plyr) library(dplyr) library(cowplot) -d <- read.csv("../../donar-res/tmp_light/boxplot4.csv") +d <- read.csv("../../donar-res/tmp_light/window3.csv") +d <- d %>% mutate (window = window / 1000) d$strat <- as.factor(d$strat) d$window <- as.factor(d$window) #d$decile <- factor(d$decile, levels = c("MIN", "D0.1", "D1", "D25", "D50", "D75", "D99", "D99.9")) -d$decile <-factor(d$decile,levels=c("MAX", "D99.9", "D99", "D75", "D50", "D25", "D1", "D0.1", "MIN")) +d$percentile <-factor(d$percentile,levels=c("MAX", "P99.9", "P99", "P75", "P50", "P25", "P1", "P0.1", "MIN")) d$strat <- revalue(d$strat, c("1"="T", "0"="D")) d <- d %>% mutate (lat = latency / 1000) -gd <- ggplot(sqldf("select * from d where decile != 'MAX'") %>% arrange(decile), aes(x=strat:window,y=lat,group=decile,fill=decile)) + +gd <- ggplot(sqldf("select * from d where percentile != 'MAX' and percentile != 'P1' and percentile != 'P0.1'") %>% arrange(percentile), aes(x=strat:window,y=lat,group=percentile,fill=percentile)) + geom_bar(stat='identity', position='identity') + scale_fill_grey() + ylab("Latency (ms)") + - xlab("Strategy:Window") + + xlab("Strategy:Window (sec)") + + labs(fill="Percentile") + coord_cartesian(ylim=c(0,600)) + geom_hline(yintercept = 200) + geom_hline(yintercept = 400) + @@ -25,25 +27,26 @@ e <- read.csv("../../donar-res/tmp_light/links3.csv") e$strat <- as.factor(e$strat) e$links <- as.factor(e$links) e$strat <- revalue(e$strat, c("1"="T", "0"="D")) -e$decile <-factor(e$decile,levels=c("MAX", "D99.9", "D99", "D75", "D50", "D25", "D1", "D0.1", "MIN")) +e$percentile <-factor(e$percentile,levels=c("MAX", "P99.9", "P99", "P75", "P50", "P25", "P1", "P0.1", "MIN")) e <- e %>% mutate (lat = latency / 1000) -ge <- ggplot(sqldf("select * from e where decile != 'MAX'") %>% arrange(decile), aes(x=strat:links,y=lat,group=decile,fill=decile)) + +ge <- ggplot(sqldf("select * from e where percentile != 'MAX' and percentile != 'P1' and percentile != 'P0.1' and links != 6 and links != 4") %>% arrange(percentile), aes(x=strat:links,y=lat,group=percentile,fill=percentile)) + geom_bar(stat='identity', position='identity') + scale_fill_grey() + ylab("Latency (ms)") + xlab("Strategy:Links") + + labs(fill="Percentile") + geom_hline(yintercept = 200) + geom_hline(yintercept = 400) + coord_cartesian(ylim=c(0,600)) + theme_classic() -f <- read.csv("../../donar-res/tmp_light/boxplot3.csv") +f <- read.csv("../../donar-res/tmp_light/fast3.csv") f$strat <- as.factor(f$strat) f$strat <- revalue(f$strat, c("1"="T", "0"="D")) f$fast_count <- as.factor(f$fast_count) -f$decile <-factor(f$decile,levels=c("MAX", "D99.9", "D99", "D75", "D50", "D25", "D1", "D0.1", "MIN")) +f$percentile <-factor(f$percentile,levels=c("MAX", "P99.9", "P99", "P75", "P50", "P25", "P1", "P0.1", "MIN")) f <- f %>% mutate (lat = latency / 1000) -gf <- ggplot(sqldf("select * from f where decile != 'MAX'") %>% arrange(decile), aes(x=strat:fast_count,y=lat,group=decile,fill=decile)) + +gf <- ggplot(sqldf("select * from f where percentile != 'MAX' and percentile != 'D1' and percentile != 'D0.1'") %>% arrange(percentile), aes(x=strat:fast_count,y=lat,group=percentile,fill=percentile)) + geom_bar(stat='identity', position='identity') + scale_fill_grey() + geom_hline(yintercept = 200) + @@ -51,17 +54,20 @@ gf <- ggplot(sqldf("select * from f where decile != 'MAX'") %>% arrange(decile), coord_cartesian(ylim=c(0,600)) + ylab("Latency (ms)") + xlab("Strategy:Fast Links") + + labs(fill="Percentile") + theme_classic() -g <- read.csv("../../donar-res/tmp_light/boxplot6.csv") +plot_grid(gd, ge, gf, ncol=1) + ggsave("light_config.png", dpi=300, dev='png', height=17, width=15, units="cm") + +g <- read.csv("../../donar-res/tmp_light/guards.csv") g$strat <- as.factor(g$strat) g$strat <- revalue(g$strat, c("1"="T", "0"="D")) g$guard <- as.factor(g$guard) g$guard <- revalue(g$guard, c("guard_1"="1", "guard_3"="3", "guard_5"="5", "guard_7"="7", "guard_9"="9", "guard_11"="11", "simple"="inf")) g$guard <- factor(g$guard, levels=c("1", "3", "5", "7", "9", "11", "inf")) -g$decile <-factor(g$decile,levels=c("MAX", "D99.9", "D99", "D75", "D50", "D25", "D1", "D0.1", "MIN")) +g$percentile <-factor(g$percentile,levels=c("MAX", "P99.9", "P99", "P75", "P50", "P25", "P1", "P0.1", "MIN")) g <- g %>% mutate (lat = latency / 1000) -gg <- ggplot(sqldf("select * from g where decile != 'MAX'") %>% arrange(decile), aes(x=strat:guard,y=lat,group=decile,fill=decile)) + +gg <- ggplot(sqldf("select * from g where percentile != 'MAX' and percentile != 'P1' and percentile != 'P0.1' ") %>% arrange(percentile), aes(x=strat:guard,y=lat,group=percentile,fill=percentile)) + geom_bar(stat='identity', position='identity') + scale_fill_grey() + geom_hline(yintercept = 200) + @@ -71,4 +77,5 @@ gg <- ggplot(sqldf("select * from g where decile != 'MAX'") %>% arrange(decile), xlab("Strategy:Guards") + theme_classic() -plot_grid(gd, ge, gf, ncol=1) + ggsave("light_config.png", dpi=300, dev='png', height=20, width=20, units="cm") +gg + ggsave("light_guards.png", dpi=300, dev='png', height=7, width=15, units="cm") + diff --git a/scripts/Makefile b/scripts/Makefile index 207f33c..1e0613f 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -230,19 +230,19 @@ lightning-links: lightning-complementarity: ./run-3 \ - 32,lightning_complementarity. \ - lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 350 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=4!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 350 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 350 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=4!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 350 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \ + 64,lightning_complementarity. \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 350 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 350 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 350 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 350 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ lightning-fastcount: ./run-3 \