From: Aberrahmane Sider Date: Thu, 26 May 2011 13:17:24 +0000 (+0100) Subject: Reverted extract-all and extract-all-inv to use original log files from run-all X-Git-Tag: v0.1~61 X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/cd83815d1aaa00919c7f972eeba5be8ceb2a9f18 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 6cb1b65..02b6e9d 100755 --- 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" - 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" diff --git a/Experimentations/extract-all-inv b/Experimentations/extract-all-inv index dfa4c60..41e6ece 100755 --- 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" - 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" diff --git a/Experimentations/run-all b/Experimentations/run-all index 60bfa07..d423b4d 100755 --- 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" - "${cmd[@]}" >> "$out" 2>&1 + out2="/tmp/tmp_loba.o" + "${cmd[@]}" > "$out2" 2>&1 + tail -17 "$out2" >> "$out" tail -n4 "$out" fi done diff --git a/Experimentations/sample_parameters b/Experimentations/sample_parameters index f4d740d..264b504 100644 --- a/Experimentations/sample_parameters +++ b/Experimentations/sample_parameters @@ -15,6 +15,8 @@ ALGORITHMS=( besteffort makhoul simple + lln + bulk ) # the different platform files @@ -23,16 +25,16 @@ PLATFORMS=( ) # number of hosts -NHOSTS=0 +NHOSTS=64 # total load -LOAD=1000 +LOAD=6400 # 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