Latest version including generation of topologies, add no pcap data by default

diff --git a/run b/run
index f07ec1222badd26da57b80ccd86c475cb155b566..4d5f40dd49028c3c0475015575a3343636f48c5e 100755 (executable)
--- a/run
+++ b/run
@@ -7,7 +7,10 @@ function runtest {
        for testno in *
        do
                if [ -d $testno ]; then
+                       popd > /dev/null
                        _runtest $testno
+                       pushd . > /dev/null
+                       cd "`dirname "$0"`"
                fi
        done;
        popd > /dev/null
@@ -20,14 +23,70 @@ function _runtest {
 
 function __runtest {
        ___runtest $1 $2 static
-       ___runtest $1 $2 dynamic
+       #___runtest $1 $2 dynamic
 }
 
 function ___runtest {
        pushd . > /dev/null
        cd "`dirname "$0"`/../code/"
        mkdir -p ../simulations/$1/$2/$3
-       ./waf --run "simulation --network=../simulations/$1/topology --data=../simulations/$1/data --csma=../simulations/$1/$2/$3/csma --ip=../simulations/$1/$2/$3/ip --pcap=../simulations/$1/$2/$3/pcap --link=$2 --state=../simulations/$1/$2/$3/state --routing=$3"
+
+       echo "$1 $2 $3"
+
+       #./waf --run "simulation --network=../simulations/$1/topology --data=../simulations/$1/data --csma=../simulations/$1/$2/$3/csma --ip=../simulations/$1/$2/$3/ip --pcap=../simulations/$1/$2/$3/pcap --link=$2 --state=../simulations/$1/$2/$3/state --routing=$3"
+
+       ./waf --run "simulation --network=../simulations/$1/topology --data=../simulations/$1/data --csma=../simulations/$1/$2/$3/csma --ip=../simulations/$1/$2/$3/ip --link=$2 --state=../simulations/$1/$2/$3/state" #--routing=$3
+       ./waf --run "analysis --topology=../simulations/$1/topology --data=../simulations/$1/data --csma=../simulations/$1/$2/$3/csma --state=../simulations/$1/$2/$3/state --link=$2 --output=../simulations/$1/$2/$3/analysis --dot=../simulations/$1/$2/$3/dot --graph=../simulations/$1/$2/$3/graph" 
+       popd > /dev/null
+}
+
+function generate {
+       _generate 24 tree 7
+}
+
+function _generate {
+       __generate $1 $2 $3 2
+       __generate $1 $2 $3 3
+       __generate $1 $2 $3 4
+       __generate $1 $2 $3 5
+       __generate $1 $2 $3 6
+       __generate $1 $2 $3 7
+       __generate $1 $2 $3 8
+       __generate $1 $2 $3 9
+       __generate $1 $2 $3 10
+       __generate $1 $2 $3 11
+       __generate $1 $2 $3 12
+       __generate $1 $2 $3 13
+       __generate $1 $2 $3 14
+       __generate $1 $2 $3 15
+       __generate $1 $2 $3 16
+       __generate $1 $2 $3 17
+       __generate $1 $2 $3 18
+       __generate $1 $2 $3 19
+       __generate $1 $2 $3 20
+       __generate $1 $2 $3 21
+       __generate $1 $2 $3 22
+       __generate $1 $2 $3 23
+       __generate $1 $2 $3 24
+       __generate $1 $2 $3 25
+       __generate $1 $2 $3 26
+       __generate $1 $2 $3 27
+       __generate $1 $2 $3 28
+       __generate $1 $2 $3 29
+       __generate $1 $2 $3 30
+       __generate $1 $2 $3 31
+}
+
+function __generate {
+       ___generate $1 $2 "$4,3" $3 $4
+}
+
+function ___generate {
+       pushd . > /dev/null
+       cd "`dirname "$0"`/../code/"
+       echo "../simulations/$4-$5/topology"
+       mkdir -p ../simulations/$4-$5
+       ./waf --run "generator --hosts=$1 --type=$2 --size=$3 --file=../simulations/$4-$5/topology"
        popd > /dev/null
 }
 
@@ -44,7 +103,11 @@ if [ $# == 2 ]; then
 fi
 
 if [ $# == 1 ]; then
-       _runtest $1
+       if [ $1 == "generate" ]; then 
+               generate
+       else 
+               _runtest $1
+       fi
        exit
 fi
 
@@ -53,6 +116,8 @@ if [ $# == 0 ]; then
        exit
 fi
 
-echo "Usage: $0 [ test [ linklayer [ routing ] ] ]"
+echo "Usage: "
+echo " $0 [ test [ linklayer [ routing ] ] ]"
+echo " $0 generate"
 exit