From add8a8f29aaa96941aab924b7bce0afd0a46e780 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Wed, 18 Sep 2019 11:05:21 +0200
Subject: [PATCH] WIP

---
 r/thunder_configure.R |  5 ++---
 scripts/Makefile      | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/r/thunder_configure.R b/r/thunder_configure.R
index 37c7f25..4be1642 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_19.csv")
+thunder_ms <- read.csv("thunder_configure_21.csv")
 
 thunder_ms <- sqldf("select run,ident,jmax,links,latency, CAST(latency as real) / 1000. as lat_ms from thunder_ms")
 thunder_ms$links <- as.factor(thunder_ms$links)
@@ -37,7 +37,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_19_bw.csv")
+thunder_bw <- read.csv("thunder_configure_21_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)
@@ -252,7 +252,6 @@ library(purrr)
 library(tidyr) 
 
 tor_lat_stack <- tor_multi_lat %>%
-    
     dplyr::group_by(run,conf) %>%
     dplyr::summarise(
       id = paste(first(run),first(conf)),
diff --git a/scripts/Makefile b/scripts/Makefile
index bb5bd10..98a0c2d 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -591,3 +591,28 @@ tor_just_many_latencies:
 tor_just_many_latencies_parse:
 	@. parse_lib.sh && \
 	parse_latency tor_just_many_latencies 39
+
+thunder_configure_2_part_parse:
+	@. parse_lib.sh && \
+	parse_thunder thunder_configure_2 ${nrep}
+
+thunder_configure_2_part_parse_bw:
+	@. parse_lib.sh && \
+	parse_thunder_bw thunder_configure_2 ${nrep}
+
+thunder_configure_2_part_parse_links:
+	@. parse_lib.sh && \
+	parse_thunder_links thunder_configure_2 ${nrep}
+
+thunder_configure_2_part_parse_drop:
+	@. parse_lib.sh && \
+	parse_thunder_drop thunder_configure_2 ${nrep}
+
+thunder_configure_2_part_parse_drop_burst:
+	@. parse_lib.sh && \
+	parse_thunder_drop_burst thunder_configure_2 ${nrep}
+
+thunder_configure_2_part_parse_red:
+	@. parse_lib.sh && \
+	parse_thunder_red thunder_configure_2 ${nrep}
+