From be996dd3bfaca7d68376294da76b534fccd9f52a Mon Sep 17 00:00:00 2001 From: George Milescu Date: Tue, 10 Aug 2010 13:09:34 +0200 Subject: [PATCH] Updated run_campaign to use rsync without --del; corrected test-scenario-pre-post-nop-many.r Signed-off-by: George Milescu --- ControlScripts/run_campaign.sh | 2 +- TestSpecs/test-scenario-pre-post-nop-many.r | 47 +++++++++++++++------ 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh index dbe0557..d0cbbfa 100755 --- a/ControlScripts/run_campaign.sh +++ b/ControlScripts/run_campaign.sh @@ -124,5 +124,5 @@ echo "done" # Publishing results to swarm echo -n "Publishing results to swarm.cs.pub.ro..." -rsync -avP --del --exclude OldResults ${RESULTS_FOLDER_REL_PATH}/ george@swarm.cs.pub.ro:public_html/p2p-next/proxy-service-tests/ &>> $ERR_LOG +rsync -avP --exclude OldResults ${RESULTS_FOLDER_REL_PATH}/ george@swarm.cs.pub.ro:public_html/p2p-next/proxy-service-tests/ &>> $ERR_LOG echo "done" diff --git a/TestSpecs/test-scenario-pre-post-nop-many.r b/TestSpecs/test-scenario-pre-post-nop-many.r index 8f18372..03ea40a 100644 --- a/TestSpecs/test-scenario-pre-post-nop-many.r +++ b/TestSpecs/test-scenario-pre-post-nop-many.r @@ -16,29 +16,43 @@ rm(args) # read data from the data file seeder=read.table(paste(target_folder, "p2p-next-01-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-03-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-04-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-05-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-06-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-07-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-08-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-09-105.log.data", sep="/"), header=T, sep=" ") -leecher=read.table(paste(target_folder, "p2p-next-10-105.log.data", sep="/"), header=T, sep=" ") +leecher01=read.table(paste(target_folder, "p2p-next-03-105.log.data", sep="/"), header=T, sep=" ") +leecher02=read.table(paste(target_folder, "p2p-next-04-105.log.data", sep="/"), header=T, sep=" ") +leecher03=read.table(paste(target_folder, "p2p-next-05-105.log.data", sep="/"), header=T, sep=" ") +leecher04=read.table(paste(target_folder, "p2p-next-06-105.log.data", sep="/"), header=T, sep=" ") +leecher05=read.table(paste(target_folder, "p2p-next-07-105.log.data", sep="/"), header=T, sep=" ") +leecher06=read.table(paste(target_folder, "p2p-next-08-105.log.data", sep="/"), header=T, sep=" ") +leecher07=read.table(paste(target_folder, "p2p-next-09-105.log.data", sep="/"), header=T, sep=" ") +leecher08=read.table(paste(target_folder, "p2p-next-10-105.log.data", sep="/"), header=T, sep=" ") # transform KB/s to Mbit/s -leecher$dlspeed <- leecher$dlspeed*8/1000 +leecher01$dlspeed <- leecher01$dlspeed*8/1000 +leecher02$dlspeed <- leecher02$dlspeed*8/1000 +leecher03$dlspeed <- leecher03$dlspeed*8/1000 +leecher04$dlspeed <- leecher04$dlspeed*8/1000 +leecher05$dlspeed <- leecher05$dlspeed*8/1000 +leecher06$dlspeed <- leecher06$dlspeed*8/1000 +leecher07$dlspeed <- leecher07$dlspeed*8/1000 +leecher08$dlspeed <- leecher08$dlspeed*8/1000 # plot dlspeed-percent data p <- ggplot() + -geom_point(aes(x=leecher$percent, y=leecher$dlspeed, label="Leecher"), size=1) + +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) + theme_bw() + scale_x_continuous("Percent", limits=c(0, 100), breaks=seq(0, 100, 10)) + scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) + coord_cartesian() + scale_colour_manual("Legend") + -opts(title=paste(campaign_name, "test-scenario-pre-post-nop-many: a test swarm (1 Seeder, 8 Leechers), all peers have an 8 Mbit/s BW (upload-only)", sep="\n")) +opts(title=paste(campaign_name, "test-scenario-pre-post-nop-many: a test swarm (1 Seeder, 8 Leechers), all peers have an 8 Mbit/s upload BW limitation", sep="\n")) # plot data as an eps file postscript(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-percent.eps", sep="/")) @@ -54,13 +68,20 @@ dev.off() # plot dlspeed-time data p <- ggplot() + -geom_point(aes(x=leecher$time, y=leecher$dlspeed, label="Leecher"), size=1) + +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) + theme_bw() + scale_x_continuous("Time(s)") + scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) + coord_cartesian() + scale_colour_manual("Legend") + -opts(title=paste(campaign_name, "test-scenario-pre-post-nop-many: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW upload-only", sep="\n")) +opts(title=paste(campaign_name, "test-scenario-pre-post-nop-many: a test swarm (1 Seeder, 8 Leechers), all peers have an 8 Mbit/s upload BW limitation", sep="\n")) # plot data as an eps file postscript(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-time.eps", sep="/")) -- 2.20.1