Refactor print-test-results

[hercules2020/kcf.git] / print-test-results

diff --git a/print-test-results b/print-test-results
index 50027de80754b53ffeab100aa434105917ebeb51..fa4b04ce7c5bcb16e405f9fc19ec12dee126a604 100755 (executable)
--- a/print-test-results
+++ b/print-test-results
@@ -1,7 +1,10 @@
 #!/bin/bash
 set -e
 
-expected_accuracy=([bag]=0.53 [ball1]=0.70 [car1]=0.35 [book]=0.19)
+declare -A expected_accuracy
+
+expected_accuracy=([bag]=0.53 [ball1-correct]=0.65 [ball1]=0.27 [car1]=0.35 [book]=0.19
+                  [bmx]=0.38 [crossing]=0.48 [racing]=0.52)
 
 for i in "$@"; do
     [[ "$i" =~ build-(.*)/kcf_vot-(.*)-(.*).log ]]
@@ -9,15 +12,17 @@ for i in "$@"; do
     flags=${BASH_REMATCH[3]}
     seq=${BASH_REMATCH[2]}
 
-    result=$(grep 'Average accuracy:' $i || :)
-    if [[ "$result" =~ Average\ accuracy:\ ([0-9.]+) ]]; then
-       if [[ $(echo "${BASH_REMATCH[1]} >= ${expected_accuracy[$seq]}"|bc) -eq 1 ]]; then
+    result=$(grep 'Average accuracy:' $i | sed -e 's/Average/Avg./g' -e 's/processing //' || :)
+    expected="${expected_accuracy[$seq]:-0}"
+    if [[ "$result" =~ accuracy:\ ([0-9.]+) ]]; then
+       result+=" >= $expected"
+       if [[ $(echo "${BASH_REMATCH[1]} >= ${expected}"|bc) -eq 1 ]]; then
            status=ok
        else
-           status=BAD
+           status=ACCURACY
        fi
     else
        status=FAILED
     fi
     echo ! "$seq;$flags;$build;$result;$status"
-done | sort | column -t -s";"
+done | sort -t";" $SORT_FLAGS | column -t -s";"