From 0b736c9a276a3aaed682efeba6cc2f28cb5dbe41 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 16 Sep 2019 16:37:38 +0200
Subject: [PATCH] Change measure jmax

---
 r/thunder_configure.R |  6 +++---
 scripts/Makefile      | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/r/thunder_configure.R b/r/thunder_configure.R
index 5664774..7e9bfe0 100644
--- a/r/thunder_configure.R
+++ b/r/thunder_configure.R
@@ -3,7 +3,7 @@ library(sqldf)
 library(plyr)
 library(cowplot)
 
-thunder_ms <- read.csv("thunder_configure_10.csv")
+thunder_ms <- read.csv("thunder_configure_11.csv")
 
 thunder_ms <- sqldf("select run,jmax,links,latency, CAST(latency as real) / 1000. as lat_ms from thunder_ms")
 thunder_ms$links <- as.factor(thunder_ms$links)
@@ -19,7 +19,7 @@ v1 <- ggplot(data = thunder_ms, aes(x = jmax, y=lat_ms, fill=links)) +
 
 v1 + ggsave("thunder_configure_ms.png", dpi=300, dev='png', height=5, width=15, units="cm")
 
-thunder_rcv <- sqldf("select run,jmax,links,(6000-COUNT(latency)*1.0)/6000 as dlv from thunder_ms group by jmax,links,run")
+thunder_rcv <- sqldf("select run,jmax,links,(9900-COUNT(latency)*1.0)/9900 as dlv from thunder_ms group by jmax,links,run")
 thunder_rcv$jmax <- as.factor(thunder_rcv$jmax)
 thunder_rcv$links <- as.factor(thunder_rcv$links)
 v2 <- ggplot(data = thunder_rcv, aes(x = jmax, y=dlv, fill=links)) +
@@ -30,7 +30,7 @@ v2 <- ggplot(data = thunder_rcv, aes(x = jmax, y=dlv, fill=links)) +
   xlab("max allowed jitter") +
   theme_classic()
 
-thunder_bw <- read.csv("thunder_configure_10_bw.csv")
+thunder_bw <- read.csv("thunder_configure_11_bw.csv")
 thunder_bw <- sqldf("select run,jmax,links,udp_sent,udp_rcv,cells_sent,cells_rcv,1.0*cells_sent/udp_sent as sent_ratio,1.0*cells_rcv/udp_rcv as rcv_ratio from thunder_bw where udp_sent > 4000")
 thunder_bw$jmax <- as.factor(thunder_bw$jmax)
 thunder_bw$links <- as.factor(thunder_bw$links)
diff --git a/scripts/Makefile b/scripts/Makefile
index af6ddc2..d31dfb1 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -232,33 +232,33 @@ thunder_configure_2_full:
 	./run-3 \
 		3,thunder_configure_2. \
 		thunder-client 9900 30 100 2 50, \
-		  thunder-client 9900 30 100 2 100, \
 		  thunder-client 9900 30 100 2 150, \
-		  thunder-client 9900 30 100 2 200, \
 		  thunder-client 9900 30 100 2 250, \
-		  thunder-client 9900 30 100 2 300, \
 		  thunder-client 9900 30 100 2 350, \
+		  thunder-client 9900 30 100 2 450, \
+		  thunder-client 9900 30 100 2 550, \
+		  thunder-client 9900 30 100 2 650, \
 		  thunder-client 9900 30 100 4 50, \
-		  thunder-client 9900 30 100 4 100, \
 		  thunder-client 9900 30 100 4 150, \
-		  thunder-client 9900 30 100 4 200, \
 		  thunder-client 9900 30 100 4 250, \
-		  thunder-client 9900 30 100 4 300, \
 		  thunder-client 9900 30 100 4 350, \
+		  thunder-client 9900 30 100 4 450, \
+		  thunder-client 9900 30 100 4 550, \
+		  thunder-client 9900 30 100 4 650, \
 		  thunder-client 9900 30 100 6 50, \
-		  thunder-client 9900 30 100 6 100, \
 		  thunder-client 9900 30 100 6 150, \
-		  thunder-client 9900 30 100 6 200, \
 		  thunder-client 9900 30 100 6 250, \
-		  thunder-client 9900 30 100 6 300, \
 		  thunder-client 9900 30 100 6 350, \
+		  thunder-client 9900 30 100 6 450, \
+		  thunder-client 9900 30 100 6 550, \
+		  thunder-client 9900 30 100 6 650, \
 		  thunder-client 9900 30 100 8 50, \
-		  thunder-client 9900 30 100 8 100, \
 		  thunder-client 9900 30 100 8 150, \
-		  thunder-client 9900 30 100 8 200, \
 		  thunder-client 9900 30 100 8 250, \
-		  thunder-client 9900 30 100 8 300, \
-		  thunder-client 9900 30 100 8 350. \
+		  thunder-client 9900 30 100 8 350, \
+		  thunder-client 9900 30 100 8 450, \
+		  thunder-client 9900 30 100 8 550, \
+		  thunder-client 9900 30 100 8 650. \
 		thunder-server 2 50, \
 		  thunder-server 2 100, \
 		  thunder-server 2 150, \