From 6c8d7be706ed934ea675855d624b7deb1df9d5b3 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 1 Nov 2019 17:15:04 +0000 Subject: [PATCH] Fix typo --- scripts/Makefile | 4 ++-- scripts/boxplot.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 5851d22..423efab 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -254,7 +254,7 @@ lightning-fastcount: lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-client 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \ lightning-client 7500 40 172 12 fast_count=5!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000. \ lightning-server 7500 40 172 12 fast_count=1!tick_tock=1!measlat=1!window=2000, \ lightning-server 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \ lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ @@ -266,7 +266,7 @@ lightning-fastcount: lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ lightning-server 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \ lightning-server 7500 40 172 12 fast_count=5!tick_tock=0!measlat=1!window=2000, \ - lightning-server 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000, \ + lightning-server 7500 40 172 12 fast_count=6!tick_tock=0!measlat=1!window=2000. \ tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \ diff --git a/scripts/boxplot.py b/scripts/boxplot.py index c5036c2..396d6a5 100755 --- a/scripts/boxplot.py +++ b/scripts/boxplot.py @@ -18,12 +18,13 @@ for line in sys.stdin: d[conf][(run,way,packet_id)] = min(latency, d[conf][(run,way,packet_id)]) #print("strat,window,decile,latency") -print("links,strat,decile,latency") +print("fast_count,strat,decile,latency") for conf,value in d.items(): s = sorted(value.values()) szs = len(s) #m = re.match(r".*tick_tock=(\d+).+window=(\d+)", conf) - m = re.match(r"^(\d+).*tick_tock=(\d+)", conf) + m = re.match(r".*fast_count=(\d+)!tick_tock=(\d+)", conf) + #m = re.match(r"^(\d+).*tick_tock=(\d+)", conf) print(f"{m[1]},{m[2]},MIN,{s[0]}") print(f"{m[1]},{m[2]},D0.1,{s[int(szs*0.001)]}") print(f"{m[1]},{m[2]},D1,{s[int(szs*0.01)]}")