ConfigFiles: add scenario-pre-post-no to campaign-pre-post

(comment out scenario-pre-post-no for now)

diff --git a/ConfigFiles/campaign-pre-post.cfg b/ConfigFiles/campaign-pre-post.cfg
index b03d5b9..8825e9a 100644 (file)
--- a/ConfigFiles/campaign-pre-post.cfg
+++ b/ConfigFiles/campaign-pre-post.cfg
@@ -2,5 +2,6 @@
 # Description:
 #   * pre-run and post-run scripts-aware campaign
 #
-# ScenarioDescription  PlotScript
-scenario-pre-post.cfg  scenario-pre-post.r
+# ScenarioDescription          PlotScript
+scenario-pre-post.txt          scenario-pre-post.r
+#scenario-pre-post-nop.txt     scenario-pre-post-nop.r

diff --git a/ConfigFiles/campaign-pre-post.html b/ConfigFiles/campaign-pre-post.html
index 34aefa0..30b8394 100644 (file)
--- a/ConfigFiles/campaign-pre-post.html
+++ b/ConfigFiles/campaign-pre-post.html
@@ -106,7 +106,7 @@
     <div id="content">
       <div id="centered-content">
 
-        <table id="box-table-a" summary="Campaign-rd results">
+        <table id="box-table-a" summary="campaign-pre-post results">
           <thead>
             <tr>
               <th scope="col">Name</th>
@@ -118,11 +118,18 @@
           </thead>
           <tbody>
             <tr>
-              <td>scenario-rd</td>
+              <td>scenario-pre-post</td>
               <td>1</td>
               <td>1</td>
               <td>8 Mbit/s up/down</td>
-              <td><a href="scenario-rd/scenario-rd-dlspeed-percent.png">dlspeed vs percent</a>; <a href="scenario-rd/scenario-rd-dlspeed-time.png">dlspeed vs time</a></td>
+              <td><a href="scenario-pre-post/scenario-pre-post-dlspeed-percent.png">dlspeed vs percent</a>; <a href="scenario-pre-post/scenario-pre-post-dlspeed-time.png">dlspeed vs time</a></td>
+            </tr>
+            <tr>
+              <td>scenario-pre-post-nop</td>
+              <td>1</td>
+              <td>1</td>
+              <td>8 Mbit/s up/down</td>
+              <td><a href="scenario-pre-post-nop/scenario-pre-post-nop-dlspeed-percent.png">dlspeed vs percent</a>; <a href="scenario-pre-post-nop/scenario-pre-post-nop-dlspeed-time.png">dlspeed vs time</a></td>
             </tr>
           </tbody>
         </table>

diff --git a/ConfigFiles/scenario-pre-post-nop.r b/ConfigFiles/scenario-pre-post-nop.r
index 906c1de..96c7747 100644 (file)
--- a/ConfigFiles/scenario-pre-post-nop.r
+++ b/ConfigFiles/scenario-pre-post-nop.r
@@ -31,15 +31,15 @@ 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, "Scenario-rd: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
+opts(title=paste(campaign_name, "scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "scenario-rd-dlspeed-percent.eps", sep="/"))
+postscript(paste(target_folder, "scenario-pre-post-nop-dlspeed-percent.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "scenario-rd-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "scenario-pre-post-nop-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()
 
@@ -53,14 +53,14 @@ 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, "Scenario-rd: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
+opts(title=paste(campaign_name, "scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "scenario-rd-dlspeed-time.eps", sep="/"))
+postscript(paste(target_folder, "scenario-pre-post-nop-dlspeed-time.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "scenario-rd-dlspeed-time.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "scenario-pre-post-nop-dlspeed-time.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()

diff --git a/ConfigFiles/scenario-pre-post.r b/ConfigFiles/scenario-pre-post.r
index 906c1de..c5a8a3f 100644 (file)
--- a/ConfigFiles/scenario-pre-post.r
+++ b/ConfigFiles/scenario-pre-post.r
@@ -34,7 +34,7 @@ scale_colour_manual("Legend") +
 opts(title=paste(campaign_name, "Scenario-rd: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "scenario-rd-dlspeed-percent.eps", sep="/"))
+postscript(paste(target_folder, "scenario-pre-post-dlspeed-percent.eps", sep="/"))
 print(p)
 dev.off()