Parameterize the exit on convergence.

[loba.git] / Experimentations / run-all

diff --git a/Experimentations/run-all b/Experimentations/run-all
index 9d4354292b0c7fab232ef51bae877ea7f873d6b2..95d70b1ec8d0f955540455c66392a06a07a2c5ee 100755 (executable)
--- a/Experimentations/run-all
+++ b/Experimentations/run-all
@@ -70,7 +70,6 @@ variable_check DEADLINE
 : ${LOBA:=$PWD/loba}
 
 COMMON_OPTS=(
 : ${LOBA:=$PWD/loba}
 
 COMMON_OPTS=(

-    --cfg=contexts/factory:raw

     "${MORE_ARGS[@]}"
 )
 
     "${MORE_ARGS[@]}"
 )
 


@@ -100,9 +99,9 @@ for plat in "${PLATFORMS[@]}"; do
     plat_output="$RESULTS/plat_$tmp"
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"
     plat_output="$RESULTS/plat_$tmp"
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"

+        [ $debug = 0 ] && mkdir -p "$topo_output"

         for algo in "${ALGORITHMS[@]}"; do
             algo_output="$topo_output/algo_$algo"
         for algo in "${ALGORITHMS[@]}"; do
             algo_output="$topo_output/algo_$algo"

-            [ $debug = 0 ] && mkdir -p "$algo_output"

             args=(
                 -T"$topo"
                 -a"$algo"
             args=(
                 -T"$topo"
                 -a"$algo"


@@ -111,11 +110,16 @@ for plat in "${PLATFORMS[@]}"; do
                 -t"$DEADLINE"
                 "$plat"
             )
                 -t"$DEADLINE"
                 "$plat"
             )

-            for bk in "" "-b"; do
-                tmp=$(outfile "loba" $bk "${args[@]}")
-                out="$algo_output/$tmp.out"
+            for bk in "plain" "bookkeeping"; do
+                cmd=( "$LOBA" "${COMMON_OPTS[@]}" )
+                case "$bk" in
+                    "plain") : ;;
+                    "bookkeeping") cmd+=( "-b" ) ;;
+                    *) die "internal error (bk = \"$bk\")" ;;
+                esac
+                out="${algo_output}_${bk}.out"

                 outf="$out$outsuffix"
                 outf="$out$outsuffix"

-                cmd=( "$LOBA" "${COMMON_OPTS[@]}" $bk "${args[@]}" )
+                cmd+=( "${args[@]}" )

                 log "Run: ${cmd[@]}"$'\n'"... &> $outf"
                 if [ $overwrite = 0 -a -e "$outf" ]; then
                     log "already run !"
                 log "Run: ${cmd[@]}"$'\n'"... &> $outf"
                 if [ $overwrite = 0 -a -e "$outf" ]; then
                     log "already run !"