TestSpecs: correct some R scripts that generated duplicate download vs. percent graphics

diff --git a/TestSpecs/test-scenario-pre-post-nop-all.r b/TestSpecs/test-scenario-pre-post-nop-all.r
index 641da8c..c404fb9 100644 (file)
--- a/TestSpecs/test-scenario-pre-post-nop-all.r
+++ b/TestSpecs/test-scenario-pre-post-nop-all.r
@@ -310,95 +310,95 @@ dev.off()
 
 # plot dlspeed-time data
 p <- ggplot() + 
-geom_point(aes(x=leecher01$percent, y=leecher01$dlspeed, label="Leecher 01"), size=1) +
-geom_point(aes(x=leecher02$percent, y=leecher02$dlspeed, label="Leecher 02"), size=1) +
-geom_point(aes(x=leecher03$percent, y=leecher03$dlspeed, label="Leecher 03"), size=1) +
-geom_point(aes(x=leecher04$percent, y=leecher04$dlspeed, label="Leecher 04"), size=1) +
-geom_point(aes(x=leecher05$percent, y=leecher05$dlspeed, label="Leecher 05"), size=1) +
-geom_point(aes(x=leecher06$percent, y=leecher06$dlspeed, label="Leecher 06"), size=1) +
-geom_point(aes(x=leecher07$percent, y=leecher07$dlspeed, label="Leecher 07"), size=1) +
-geom_point(aes(x=leecher08$percent, y=leecher08$dlspeed, label="Leecher 08"), size=1) +
-geom_point(aes(x=leecher09$percent, y=leecher09$dlspeed, label="Leecher 09"), size=1) +
-geom_point(aes(x=leecher10$percent, y=leecher10$dlspeed, label="Leecher 10"), size=1) +
-geom_point(aes(x=leecher11$percent, y=leecher11$dlspeed, label="Leecher 11"), size=1) +
-geom_point(aes(x=leecher12$percent, y=leecher12$dlspeed, label="Leecher 12"), size=1) +
-geom_point(aes(x=leecher13$percent, y=leecher13$dlspeed, label="Leecher 13"), size=1) +
-geom_point(aes(x=leecher14$percent, y=leecher14$dlspeed, label="Leecher 14"), size=1) +
-geom_point(aes(x=leecher15$percent, y=leecher15$dlspeed, label="Leecher 15"), size=1) +
-geom_point(aes(x=leecher16$percent, y=leecher16$dlspeed, label="Leecher 16"), size=1) +
-geom_point(aes(x=leecher17$percent, y=leecher17$dlspeed, label="Leecher 17"), size=1) +
-geom_point(aes(x=leecher18$percent, y=leecher18$dlspeed, label="Leecher 18"), size=1) +
-geom_point(aes(x=leecher19$percent, y=leecher19$dlspeed, label="Leecher 19"), size=1) +
-geom_point(aes(x=leecher20$percent, y=leecher20$dlspeed, label="Leecher 20"), size=1) +
-geom_point(aes(x=leecher21$percent, y=leecher21$dlspeed, label="Leecher 21"), size=1) +
-geom_point(aes(x=leecher22$percent, y=leecher22$dlspeed, label="Leecher 22"), size=1) +
-geom_point(aes(x=leecher23$percent, y=leecher23$dlspeed, label="Leecher 23"), size=1) +
-geom_point(aes(x=leecher24$percent, y=leecher24$dlspeed, label="Leecher 24"), size=1) +
-geom_point(aes(x=leecher25$percent, y=leecher25$dlspeed, label="Leecher 25"), size=1) +
-geom_point(aes(x=leecher26$percent, y=leecher26$dlspeed, label="Leecher 26"), size=1) +
-geom_point(aes(x=leecher27$percent, y=leecher27$dlspeed, label="Leecher 27"), size=1) +
-geom_point(aes(x=leecher28$percent, y=leecher28$dlspeed, label="Leecher 28"), size=1) +
-geom_point(aes(x=leecher29$percent, y=leecher29$dlspeed, label="Leecher 29"), size=1) +
-geom_point(aes(x=leecher30$percent, y=leecher30$dlspeed, label="Leecher 30"), size=1) +
-geom_point(aes(x=leecher31$percent, y=leecher31$dlspeed, label="Leecher 31"), size=1) +
-geom_point(aes(x=leecher32$percent, y=leecher32$dlspeed, label="Leecher 32"), size=1) +
-geom_point(aes(x=leecher33$percent, y=leecher33$dlspeed, label="Leecher 33"), size=1) +
-geom_point(aes(x=leecher34$percent, y=leecher34$dlspeed, label="Leecher 34"), size=1) +
-geom_point(aes(x=leecher35$percent, y=leecher35$dlspeed, label="Leecher 35"), size=1) +
-geom_point(aes(x=leecher36$percent, y=leecher36$dlspeed, label="Leecher 36"), size=1) +
-geom_point(aes(x=leecher37$percent, y=leecher37$dlspeed, label="Leecher 37"), size=1) +
-geom_point(aes(x=leecher38$percent, y=leecher38$dlspeed, label="Leecher 38"), size=1) +
-geom_point(aes(x=leecher39$percent, y=leecher39$dlspeed, label="Leecher 39"), size=1) +
-geom_point(aes(x=leecher40$percent, y=leecher40$dlspeed, label="Leecher 40"), size=1) +
-geom_point(aes(x=leecher41$percent, y=leecher41$dlspeed, label="Leecher 41"), size=1) +
-geom_point(aes(x=leecher42$percent, y=leecher42$dlspeed, label="Leecher 42"), size=1) +
-geom_point(aes(x=leecher43$percent, y=leecher43$dlspeed, label="Leecher 43"), size=1) +
-geom_point(aes(x=leecher44$percent, y=leecher44$dlspeed, label="Leecher 44"), size=1) +
-geom_point(aes(x=leecher45$percent, y=leecher45$dlspeed, label="Leecher 45"), size=1) +
-geom_point(aes(x=leecher46$percent, y=leecher46$dlspeed, label="Leecher 46"), size=1) +
-geom_point(aes(x=leecher47$percent, y=leecher47$dlspeed, label="Leecher 47"), size=1) +
-geom_point(aes(x=leecher48$percent, y=leecher48$dlspeed, label="Leecher 48"), size=1) +
-geom_point(aes(x=leecher49$percent, y=leecher49$dlspeed, label="Leecher 49"), size=1) +
-geom_point(aes(x=leecher50$percent, y=leecher50$dlspeed, label="Leecher 50"), size=1) +
-geom_point(aes(x=leecher51$percent, y=leecher51$dlspeed, label="Leecher 51"), size=1) +
-geom_point(aes(x=leecher52$percent, y=leecher52$dlspeed, label="Leecher 52"), size=1) +
-geom_point(aes(x=leecher53$percent, y=leecher53$dlspeed, label="Leecher 53"), size=1) +
-geom_point(aes(x=leecher54$percent, y=leecher54$dlspeed, label="Leecher 54"), size=1) +
-geom_point(aes(x=leecher55$percent, y=leecher55$dlspeed, label="Leecher 55"), size=1) +
-geom_point(aes(x=leecher56$percent, y=leecher56$dlspeed, label="Leecher 56"), size=1) +
-geom_point(aes(x=leecher57$percent, y=leecher57$dlspeed, label="Leecher 57"), size=1) +
-geom_point(aes(x=leecher58$percent, y=leecher58$dlspeed, label="Leecher 58"), size=1) +
-geom_point(aes(x=leecher59$percent, y=leecher59$dlspeed, label="Leecher 59"), size=1) +
-geom_point(aes(x=leecher60$percent, y=leecher60$dlspeed, label="Leecher 60"), size=1) +
-geom_point(aes(x=leecher61$percent, y=leecher61$dlspeed, label="Leecher 61"), size=1) +
-geom_point(aes(x=leecher62$percent, y=leecher62$dlspeed, label="Leecher 62"), size=1) +
-geom_point(aes(x=leecher63$percent, y=leecher63$dlspeed, label="Leecher 63"), size=1) +
-geom_point(aes(x=leecher64$percent, y=leecher64$dlspeed, label="Leecher 64"), size=1) +
-geom_point(aes(x=leecher65$percent, y=leecher65$dlspeed, label="Leecher 65"), size=1) +
-geom_point(aes(x=leecher66$percent, y=leecher66$dlspeed, label="Leecher 66"), size=1) +
-geom_point(aes(x=leecher67$percent, y=leecher67$dlspeed, label="Leecher 67"), size=1) +
-geom_point(aes(x=leecher68$percent, y=leecher68$dlspeed, label="Leecher 68"), size=1) +
-geom_point(aes(x=leecher69$percent, y=leecher69$dlspeed, label="Leecher 69"), size=1) +
-geom_point(aes(x=leecher70$percent, y=leecher70$dlspeed, label="Leecher 70"), size=1) +
-geom_point(aes(x=leecher71$percent, y=leecher71$dlspeed, label="Leecher 71"), size=1) +
-geom_point(aes(x=leecher72$percent, y=leecher72$dlspeed, label="Leecher 72"), size=1) +
-geom_point(aes(x=leecher73$percent, y=leecher73$dlspeed, label="Leecher 73"), size=1) +
-geom_point(aes(x=leecher74$percent, y=leecher74$dlspeed, label="Leecher 74"), size=1) +
-geom_point(aes(x=leecher75$percent, y=leecher75$dlspeed, label="Leecher 75"), size=1) +
-geom_point(aes(x=leecher76$percent, y=leecher76$dlspeed, label="Leecher 76"), size=1) +
-geom_point(aes(x=leecher77$percent, y=leecher77$dlspeed, label="Leecher 77"), size=1) +
-geom_point(aes(x=leecher78$percent, y=leecher78$dlspeed, label="Leecher 78"), size=1) +
-geom_point(aes(x=leecher79$percent, y=leecher79$dlspeed, label="Leecher 79"), size=1) +
-geom_point(aes(x=leecher80$percent, y=leecher80$dlspeed, label="Leecher 80"), size=1) +
-geom_point(aes(x=leecher81$percent, y=leecher81$dlspeed, label="Leecher 81"), size=1) +
-geom_point(aes(x=leecher82$percent, y=leecher82$dlspeed, label="Leecher 82"), size=1) +
-geom_point(aes(x=leecher83$percent, y=leecher83$dlspeed, label="Leecher 83"), size=1) +
-geom_point(aes(x=leecher84$percent, y=leecher84$dlspeed, label="Leecher 84"), size=1) +
-geom_point(aes(x=leecher85$percent, y=leecher85$dlspeed, label="Leecher 85"), size=1) +
-geom_point(aes(x=leecher86$percent, y=leecher86$dlspeed, label="Leecher 86"), size=1) +
-geom_point(aes(x=leecher87$percent, y=leecher87$dlspeed, label="Leecher 87"), size=1) +
-geom_point(aes(x=leecher88$percent, y=leecher88$dlspeed, label="Leecher 88"), size=1) +
-geom_point(aes(x=leecher89$percent, y=leecher89$dlspeed, label="Leecher 89"), size=1) +
+geom_point(aes(x=leecher01$time, y=leecher01$dlspeed, label="Leecher 01"), size=1) +
+geom_point(aes(x=leecher02$time, y=leecher02$dlspeed, label="Leecher 02"), size=1) +
+geom_point(aes(x=leecher03$time, y=leecher03$dlspeed, label="Leecher 03"), size=1) +
+geom_point(aes(x=leecher04$time, y=leecher04$dlspeed, label="Leecher 04"), size=1) +
+geom_point(aes(x=leecher05$time, y=leecher05$dlspeed, label="Leecher 05"), size=1) +
+geom_point(aes(x=leecher06$time, y=leecher06$dlspeed, label="Leecher 06"), size=1) +
+geom_point(aes(x=leecher07$time, y=leecher07$dlspeed, label="Leecher 07"), size=1) +
+geom_point(aes(x=leecher08$time, y=leecher08$dlspeed, label="Leecher 08"), size=1) +
+geom_point(aes(x=leecher09$time, y=leecher09$dlspeed, label="Leecher 09"), size=1) +
+geom_point(aes(x=leecher10$time, y=leecher10$dlspeed, label="Leecher 10"), size=1) +
+geom_point(aes(x=leecher11$time, y=leecher11$dlspeed, label="Leecher 11"), size=1) +
+geom_point(aes(x=leecher12$time, y=leecher12$dlspeed, label="Leecher 12"), size=1) +
+geom_point(aes(x=leecher13$time, y=leecher13$dlspeed, label="Leecher 13"), size=1) +
+geom_point(aes(x=leecher14$time, y=leecher14$dlspeed, label="Leecher 14"), size=1) +
+geom_point(aes(x=leecher15$time, y=leecher15$dlspeed, label="Leecher 15"), size=1) +
+geom_point(aes(x=leecher16$time, y=leecher16$dlspeed, label="Leecher 16"), size=1) +
+geom_point(aes(x=leecher17$time, y=leecher17$dlspeed, label="Leecher 17"), size=1) +
+geom_point(aes(x=leecher18$time, y=leecher18$dlspeed, label="Leecher 18"), size=1) +
+geom_point(aes(x=leecher19$time, y=leecher19$dlspeed, label="Leecher 19"), size=1) +
+geom_point(aes(x=leecher20$time, y=leecher20$dlspeed, label="Leecher 20"), size=1) +
+geom_point(aes(x=leecher21$time, y=leecher21$dlspeed, label="Leecher 21"), size=1) +
+geom_point(aes(x=leecher22$time, y=leecher22$dlspeed, label="Leecher 22"), size=1) +
+geom_point(aes(x=leecher23$time, y=leecher23$dlspeed, label="Leecher 23"), size=1) +
+geom_point(aes(x=leecher24$time, y=leecher24$dlspeed, label="Leecher 24"), size=1) +
+geom_point(aes(x=leecher25$time, y=leecher25$dlspeed, label="Leecher 25"), size=1) +
+geom_point(aes(x=leecher26$time, y=leecher26$dlspeed, label="Leecher 26"), size=1) +
+geom_point(aes(x=leecher27$time, y=leecher27$dlspeed, label="Leecher 27"), size=1) +
+geom_point(aes(x=leecher28$time, y=leecher28$dlspeed, label="Leecher 28"), size=1) +
+geom_point(aes(x=leecher29$time, y=leecher29$dlspeed, label="Leecher 29"), size=1) +
+geom_point(aes(x=leecher30$time, y=leecher30$dlspeed, label="Leecher 30"), size=1) +
+geom_point(aes(x=leecher31$time, y=leecher31$dlspeed, label="Leecher 31"), size=1) +
+geom_point(aes(x=leecher32$time, y=leecher32$dlspeed, label="Leecher 32"), size=1) +
+geom_point(aes(x=leecher33$time, y=leecher33$dlspeed, label="Leecher 33"), size=1) +
+geom_point(aes(x=leecher34$time, y=leecher34$dlspeed, label="Leecher 34"), size=1) +
+geom_point(aes(x=leecher35$time, y=leecher35$dlspeed, label="Leecher 35"), size=1) +
+geom_point(aes(x=leecher36$time, y=leecher36$dlspeed, label="Leecher 36"), size=1) +
+geom_point(aes(x=leecher37$time, y=leecher37$dlspeed, label="Leecher 37"), size=1) +
+geom_point(aes(x=leecher38$time, y=leecher38$dlspeed, label="Leecher 38"), size=1) +
+geom_point(aes(x=leecher39$time, y=leecher39$dlspeed, label="Leecher 39"), size=1) +
+geom_point(aes(x=leecher40$time, y=leecher40$dlspeed, label="Leecher 40"), size=1) +
+geom_point(aes(x=leecher41$time, y=leecher41$dlspeed, label="Leecher 41"), size=1) +
+geom_point(aes(x=leecher42$time, y=leecher42$dlspeed, label="Leecher 42"), size=1) +
+geom_point(aes(x=leecher43$time, y=leecher43$dlspeed, label="Leecher 43"), size=1) +
+geom_point(aes(x=leecher44$time, y=leecher44$dlspeed, label="Leecher 44"), size=1) +
+geom_point(aes(x=leecher45$time, y=leecher45$dlspeed, label="Leecher 45"), size=1) +
+geom_point(aes(x=leecher46$time, y=leecher46$dlspeed, label="Leecher 46"), size=1) +
+geom_point(aes(x=leecher47$time, y=leecher47$dlspeed, label="Leecher 47"), size=1) +
+geom_point(aes(x=leecher48$time, y=leecher48$dlspeed, label="Leecher 48"), size=1) +
+geom_point(aes(x=leecher49$time, y=leecher49$dlspeed, label="Leecher 49"), size=1) +
+geom_point(aes(x=leecher50$time, y=leecher50$dlspeed, label="Leecher 50"), size=1) +
+geom_point(aes(x=leecher51$time, y=leecher51$dlspeed, label="Leecher 51"), size=1) +
+geom_point(aes(x=leecher52$time, y=leecher52$dlspeed, label="Leecher 52"), size=1) +
+geom_point(aes(x=leecher53$time, y=leecher53$dlspeed, label="Leecher 53"), size=1) +
+geom_point(aes(x=leecher54$time, y=leecher54$dlspeed, label="Leecher 54"), size=1) +
+geom_point(aes(x=leecher55$time, y=leecher55$dlspeed, label="Leecher 55"), size=1) +
+geom_point(aes(x=leecher56$time, y=leecher56$dlspeed, label="Leecher 56"), size=1) +
+geom_point(aes(x=leecher57$time, y=leecher57$dlspeed, label="Leecher 57"), size=1) +
+geom_point(aes(x=leecher58$time, y=leecher58$dlspeed, label="Leecher 58"), size=1) +
+geom_point(aes(x=leecher59$time, y=leecher59$dlspeed, label="Leecher 59"), size=1) +
+geom_point(aes(x=leecher60$time, y=leecher60$dlspeed, label="Leecher 60"), size=1) +
+geom_point(aes(x=leecher61$time, y=leecher61$dlspeed, label="Leecher 61"), size=1) +
+geom_point(aes(x=leecher62$time, y=leecher62$dlspeed, label="Leecher 62"), size=1) +
+geom_point(aes(x=leecher63$time, y=leecher63$dlspeed, label="Leecher 63"), size=1) +
+geom_point(aes(x=leecher64$time, y=leecher64$dlspeed, label="Leecher 64"), size=1) +
+geom_point(aes(x=leecher65$time, y=leecher65$dlspeed, label="Leecher 65"), size=1) +
+geom_point(aes(x=leecher66$time, y=leecher66$dlspeed, label="Leecher 66"), size=1) +
+geom_point(aes(x=leecher67$time, y=leecher67$dlspeed, label="Leecher 67"), size=1) +
+geom_point(aes(x=leecher68$time, y=leecher68$dlspeed, label="Leecher 68"), size=1) +
+geom_point(aes(x=leecher69$time, y=leecher69$dlspeed, label="Leecher 69"), size=1) +
+geom_point(aes(x=leecher70$time, y=leecher70$dlspeed, label="Leecher 70"), size=1) +
+geom_point(aes(x=leecher71$time, y=leecher71$dlspeed, label="Leecher 71"), size=1) +
+geom_point(aes(x=leecher72$time, y=leecher72$dlspeed, label="Leecher 72"), size=1) +
+geom_point(aes(x=leecher73$time, y=leecher73$dlspeed, label="Leecher 73"), size=1) +
+geom_point(aes(x=leecher74$time, y=leecher74$dlspeed, label="Leecher 74"), size=1) +
+geom_point(aes(x=leecher75$time, y=leecher75$dlspeed, label="Leecher 75"), size=1) +
+geom_point(aes(x=leecher76$time, y=leecher76$dlspeed, label="Leecher 76"), size=1) +
+geom_point(aes(x=leecher77$time, y=leecher77$dlspeed, label="Leecher 77"), size=1) +
+geom_point(aes(x=leecher78$time, y=leecher78$dlspeed, label="Leecher 78"), size=1) +
+geom_point(aes(x=leecher79$time, y=leecher79$dlspeed, label="Leecher 79"), size=1) +
+geom_point(aes(x=leecher80$time, y=leecher80$dlspeed, label="Leecher 80"), size=1) +
+geom_point(aes(x=leecher81$time, y=leecher81$dlspeed, label="Leecher 81"), size=1) +
+geom_point(aes(x=leecher82$time, y=leecher82$dlspeed, label="Leecher 82"), size=1) +
+geom_point(aes(x=leecher83$time, y=leecher83$dlspeed, label="Leecher 83"), size=1) +
+geom_point(aes(x=leecher84$time, y=leecher84$dlspeed, label="Leecher 84"), size=1) +
+geom_point(aes(x=leecher85$time, y=leecher85$dlspeed, label="Leecher 85"), size=1) +
+geom_point(aes(x=leecher86$time, y=leecher86$dlspeed, label="Leecher 86"), size=1) +
+geom_point(aes(x=leecher87$time, y=leecher87$dlspeed, label="Leecher 87"), size=1) +
+geom_point(aes(x=leecher88$time, y=leecher88$dlspeed, label="Leecher 88"), size=1) +
+geom_point(aes(x=leecher89$time, y=leecher89$dlspeed, label="Leecher 89"), size=1) +
 theme_bw() +
 scale_x_continuous("Time(s)") +
 scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) +

diff --git a/TestSpecs/test-scenario-pre-post-nop-many.r b/TestSpecs/test-scenario-pre-post-nop-many.r
index 03ea40a..6fbee7b 100644 (file)
--- a/TestSpecs/test-scenario-pre-post-nop-many.r
+++ b/TestSpecs/test-scenario-pre-post-nop-many.r
@@ -68,14 +68,14 @@ dev.off()
 
 # plot dlspeed-time data
 p <- ggplot() + 
-geom_point(aes(x=leecher01$percent, y=leecher01$dlspeed, label="Leecher 01"), size=1) +
-geom_point(aes(x=leecher02$percent, y=leecher02$dlspeed, label="Leecher 02"), size=1) +
-geom_point(aes(x=leecher03$percent, y=leecher03$dlspeed, label="Leecher 03"), size=1) +
-geom_point(aes(x=leecher04$percent, y=leecher04$dlspeed, label="Leecher 04"), size=1) +
-geom_point(aes(x=leecher05$percent, y=leecher05$dlspeed, label="Leecher 05"), size=1) +
-geom_point(aes(x=leecher06$percent, y=leecher06$dlspeed, label="Leecher 06"), size=1) +
-geom_point(aes(x=leecher07$percent, y=leecher07$dlspeed, label="Leecher 07"), size=1) +
-geom_point(aes(x=leecher08$percent, y=leecher08$dlspeed, label="Leecher 08"), size=1) +
+geom_point(aes(x=leecher01$time, y=leecher01$dlspeed, label="Leecher 01"), size=1) +
+geom_point(aes(x=leecher02$time, y=leecher02$dlspeed, label="Leecher 02"), size=1) +
+geom_point(aes(x=leecher03$time, y=leecher03$dlspeed, label="Leecher 03"), size=1) +
+geom_point(aes(x=leecher04$time, y=leecher04$dlspeed, label="Leecher 04"), size=1) +
+geom_point(aes(x=leecher05$time, y=leecher05$dlspeed, label="Leecher 05"), size=1) +
+geom_point(aes(x=leecher06$time, y=leecher06$dlspeed, label="Leecher 06"), size=1) +
+geom_point(aes(x=leecher07$time, y=leecher07$dlspeed, label="Leecher 07"), size=1) +
+geom_point(aes(x=leecher08$time, y=leecher08$dlspeed, label="Leecher 08"), size=1) +
 theme_bw() +
 scale_x_continuous("Time(s)") +
 scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) +