From af64dd20ef845daabe4d63ea34723d94d3a20c35 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 19 Jul 2011 18:19:04 +0200
Subject: [PATCH] In run-all: simplify the names of the output files.

Before:
  .../results/plat_${PLATFORM}/topo_${TOPOLOGY}/algo_${ALGO}/loba_${PARAM}.out

After:
  .../results/plat_${PLATFORM}/topo_${TOPOLOGY}/algo_${ALGO}_${VARIANT}.out

with VARIANT being "plain" or "bookkeeping".
---
 Experimentations/run-all | 15 ++++++++++-----
 TODO                     |  7 -------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Experimentations/run-all b/Experimentations/run-all
index 9d43542..581ee1f 100755
--- a/Experimentations/run-all
+++ b/Experimentations/run-all
@@ -100,9 +100,9 @@ for plat in "${PLATFORMS[@]}"; do
     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"
-            [ $debug = 0 ] && mkdir -p "$algo_output"
             args=(
                 -T"$topo"
                 -a"$algo"
@@ -111,11 +111,16 @@ for plat in "${PLATFORMS[@]}"; do
                 -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"
-                cmd=( "$LOBA" "${COMMON_OPTS[@]}" $bk "${args[@]}" )
+                cmd+=( "${args[@]}" )
                 log "Run: ${cmd[@]}"$'\n'"... &> $outf"
                 if [ $overwrite = 0 -a -e "$outf" ]; then
                     log "already run !"
diff --git a/TODO b/TODO
index fcd2d79..e9efed0 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,3 @@
-* In run-all:
-  - Use more legible names for generated files.
-    Current problems are:
-    . file names are too long.
-    . MORE_ARGS do not appear in file name.
-    Why not simply using file names "plain.out", and "bookkeeping.out"?
-
 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.
-- 
2.39.5