Reverted extract-all and extract-all-inv to use original log files from run-all

diff --git a/Experimentations/extract-all b/Experimentations/extract-all
index 6cb1b657623c6c64252e9fcf365bc54514aca1f0..02b6e9dc1fa16d90499cb04dcfc0e67d0fdc25eb 100755 (executable)
--- a/Experimentations/extract-all
+++ b/Experimentations/extract-all
@@ -128,7 +128,7 @@ for plat in "${PLATFORMS[@]}"; do
                                for bk in "" "-b"; do
                                        tmp=$(outfile "loba" $bk "${args[@]}")
                                        infile="$algo_output/$tmp.out"
                                for bk in "" "-b"; do
                                        tmp=$(outfile "loba" $bk "${args[@]}")
                                        infile="$algo_output/$tmp.out"

-                                       variable=$(awk '/'"$target_param"'/{print $'"$target_position"'}' "$infile")
+                                       variable=$(tail -17 "$infile" | awk '/'"$target_param"'/{print $'"$target_position"'}')

                                        log "Reading $target_param from $infile : $variable"
                                        mediantexline=$(echo -e "$mediantexline&$variable\t")
                                        echo  -e "$algo$bk\t$variable\n" >> "$topo_data_out"
                                        log "Reading $target_param from $infile : $variable"
                                        mediantexline=$(echo -e "$mediantexline&$variable\t")
                                        echo  -e "$algo$bk\t$variable\n" >> "$topo_data_out"

diff --git a/Experimentations/extract-all-inv b/Experimentations/extract-all-inv
index dfa4c60e9af24548cc7c371fa3341512021e7f5d..41e6ece91a0bd2b6a2768e63b3f422af0179cf02 100755 (executable)
--- a/Experimentations/extract-all-inv
+++ b/Experimentations/extract-all-inv
@@ -124,7 +124,7 @@ for plat in "${PLATFORMS[@]}"; do
                                                target_position=${params_pos[$target_i]};
                                                        outfilesuffix=$(outfile  "${target_param[@]}")
                                                topo_data_out="$plat_output/data_$topo-$outfilesuffix.tex"
                                                target_position=${params_pos[$target_i]};
                                                        outfilesuffix=$(outfile  "${target_param[@]}")
                                                topo_data_out="$plat_output/data_$topo-$outfilesuffix.tex"

-                                               variable=$(awk '/'"$target_param"'/{print $'"$target_position"'}' "$infile")
+                                               variable=$(tail -17 "$infile" | awk '/'"$target_param"'/{print $'"$target_position"'}')

                                                log "Reading $target_param from $infile : $variable"
                                                mediantexline=$(echo -e "$mediantexline&$variable\t")
                                                echo  -e "$algo$bk\t$variable\n" >> "$topo_data_out"
                                                log "Reading $target_param from $infile : $variable"
                                                mediantexline=$(echo -e "$mediantexline&$variable\t")
                                                echo  -e "$algo$bk\t$variable\n" >> "$topo_data_out"

diff --git a/Experimentations/run-all b/Experimentations/run-all
index 60bfa07fffeeba020b5c01c1cab4ff4b29eae2f0..d423b4d15d29aab2c6aae739e7e769a65a280aa6 100755 (executable)
--- a/Experimentations/run-all
+++ b/Experimentations/run-all
@@ -108,7 +108,9 @@ for plat in "${PLATFORMS[@]}"; do
                     log "skipped (dry-run)"
                 else
                     echo "# ${cmd[@]}" > "$out"
                     log "skipped (dry-run)"
                 else
                     echo "# ${cmd[@]}" > "$out"

-                    "${cmd[@]}" >> "$out" 2>&1
+                       out2="/tmp/tmp_loba.o"
+                    "${cmd[@]}" > "$out2" 2>&1
+                   tail -17 "$out2" >> "$out" 

                     tail -n4 "$out"
                 fi
             done
                     tail -n4 "$out"
                 fi
             done

diff --git a/Experimentations/sample_parameters b/Experimentations/sample_parameters
index f4d740dd4fc13d24f3c9964d095bfc6fd4920424..264b504e0b1971b26fbad8325e24a3750afbedf0 100644 (file)
--- a/Experimentations/sample_parameters
+++ b/Experimentations/sample_parameters
@@ -15,6 +15,8 @@ ALGORITHMS=(
     besteffort
     makhoul
     simple
     besteffort
     makhoul
     simple

+    lln
+    bulk

 )
 
 # the different platform files
 )
 
 # the different platform files


@@ -23,16 +25,16 @@ PLATFORMS=(
 )
 
 # number of hosts
 )
 
 # number of hosts

-NHOSTS=0
+NHOSTS=64

 
 # total load
 
 # total load

-LOAD=1000
+LOAD=6400

 
 # time limit for the simulation
 DEADLINE=10000
 
 # optional: path to binary (default: ./loba)
 
 # time limit for the simulation
 DEADLINE=10000
 
 # optional: path to binary (default: ./loba)

-#LOBA=./loba
+LOBA=../loba

 
 # optional: path to results (default: ./results)
 #RESULTS=./results
 
 # optional: path to results (default: ./results)
 #RESULTS=./results