Removes doubled vnet.json files from scenario resources

scripts/others/start-sweep.sh

@@ -48,7 +48,7 @@ do
             for k in "${k_paths[@]}"
             do
                 export RUN_NAME="${a}_${s}_l${l}_k${k}"
-                export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/$s/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
+                export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/40-vnets/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
                 echo "#"
                 echo "# => Using ARGS: $ARGS"
                 echo "#"

scripts/others/start.sh

@@ -8,7 +8,7 @@ source env.sh
 # Config
 export DATE=$(date +"%FT%H-%M-%S")
 export JAR="iflye.jar"
-export ARGS="-a pm -o total-comm-a -e emoflon_wo_update -l 2 -s resources/two-tier-4-pods/snet.json -v resources/two-tier-4-pods/vnets.json -c metrics/$DATE.csv -i 600"
+export ARGS="-a pm -o total-comm-a -e emoflon_wo_update -l 2 -s resources/two-tier-4-pods/snet.json -v resources/40-vnets/vnets.json -c metrics/$DATE.csv -i 600"
 
 # Make sure that folder for hipe-network exists
 mkdir -p bin

scripts/start-args.sh

@@ -50,7 +50,7 @@ for ((i=1;i<=$r;i++));
 do
     # Without memory measurement
     export RUN_NAME="${a}_${s}_l${l}_k${k}_run${i}"
-    export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/$s/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
+    export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/40-vnets/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
     echo "#"
     echo "# => Using ARGS: $ARGS"
     echo "#"

scripts/start-args_relaxed.sh

@@ -50,7 +50,7 @@ for ((i=1;i<=$r;i++));
 do
     # Without memory measurement
     export RUN_NAME="${a}_${s}_l${l}_k${k}_relaxed_scaled_run${i}"
-    export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/$s/vnets.json -c ./metrics/$RUN_NAME.csv -i 600 --ilpopttol 0.01 --ilpobjscaling 0.001"
+    export ARGS="-a $a -o total-comm-c -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/40-vnets/vnets.json -c ./metrics/$RUN_NAME.csv -i 600 --ilpopttol 0.01 --ilpobjscaling 0.001"
     echo "#"
     echo "# => Using ARGS: $ARGS"
     echo "#"

scripts/start-args_taf.sh

@@ -50,7 +50,7 @@ for ((i=1;i<=$r;i++));
 do
     # Without memory measurement
     export RUN_NAME="${a}_${s}_l${l}_k${k}_run${i}_taf"
-    export ARGS="-a $a -o total-taf-comm -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/$s/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
+    export ARGS="-a $a -o total-taf-comm -e emoflon_wo_update -l $l -k $k -s resources/$s/snet.json -v resources/40-vnets/vnets.json -c ./metrics/$RUN_NAME.csv -i 600"
     echo "#"
     echo "# => Using ARGS: $ARGS"
     echo "#"