TestSpecs/gen: corrections to generation scripts

diff --git a/TestSpecs/gen/rgen b/TestSpecs/gen/rgen
index 56c5501..75d01e3 100755 (executable)
--- a/TestSpecs/gen/rgen
+++ b/TestSpecs/gen/rgen
@@ -44,6 +44,9 @@ test_is_leecher()
 parse_comment
 
 cat <<END
+# import ggplot2
+library(ggplot2)
+
 # Read transmitted command line arguments
 args <- commandArgs(trailingOnly = TRUE)
 
@@ -139,7 +142,7 @@ while read server port user remote_path remote_if dl_bw dl_burst ul_bw ul_burst
                continue
        fi
        cat <<END
-geom_point(aes(x=leecher${index}\$percent, y=leecher${index}\$dlspeed, label="Leecher ${index}"), size=1) +
+geom_point(aes(x=leecher${index}\$time, y=leecher${index}\$dlspeed, label="Leecher ${index}"), size=1) +
 END
        ((index++))
 done < <(grep -v '^#\|^[ \t]*$' ${scenario_file})

diff --git a/TestSpecs/gen/tgen b/TestSpecs/gen/tgen
index 049e78a..c7f4919 100755 (executable)
--- a/TestSpecs/gen/tgen
+++ b/TestSpecs/gen/tgen
@@ -30,7 +30,7 @@ parse_bw()
 parse_file()
 {
        size=$(echo "" | awk -v var="$1" '{print var + 0;}')
-       echo "Data.$size.ct.torrent"
+       echo "Data.${size}M.ct.torrent"
 }
 
 generate_scenario()
@@ -61,7 +61,7 @@ generate_scenario()
        index=0
        for sys_index in 01 03 04 05 06 07 08 09 10; do
                for ce_index in 1 2 3 4 5 6 7 8 9 10; do
-                       echo -en "p2p-next-$sys_index.ncit.pub.ro\t\t"
+                       echo -en "p2p-next-$sys_index.grid.pub.ro\t\t"
                        echo -en "1$(printf %02g $ce_index)22\t\t"
                        echo -en "p2p\t\t"
                        echo -en "/home/p2p/george\t"
@@ -136,7 +136,7 @@ while IFS="," read exp_no num_seeders num_leechers num_peers num_conn down_bw up
               <td>${num_seeders}</td>
               <td>${num_leechers}</td>
               <td>TODO</td>
-              <td><a href="${campaign_name}/${campaign_name}-${exp_no}.png">dlspeed vs percent</a>; <a href="${campaign_name}/${campaign_name}-${exp_no}.png">dlspeed vs time</a></td>
+              <td><a href="${campaign_name}-${exp_no}/${campaign_name}-${exp_no}-dlspeed-percent.png">dlspeed vs percent</a>; <a href="${campaign_name}-${exp_no}/${campaign_name}-${exp_no}-dlspeed-time.png">dlspeed vs time</a></td>
             </tr>
 END
 done < $input