complexmat: Move CPU-only methods from .hpp to .cpp

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

diff --git a/print-test-results b/print-test-results
index f58705d17dd7e4fd98ff7b68b2a5e63534c5a923..4b9b1953926d3454c769ab30c3689aa6ff077070 100755 (executable)
--- a/print-test-results
+++ b/print-test-results
@@ -12,8 +12,8 @@ for i in "$@"; do
     flags=${BASH_REMATCH[3]}
     seq=${BASH_REMATCH[2]}
 
-    result=$(grep 'Average accuracy:' $i || :)
-    if [[ "$result" =~ Average\ accuracy:\ ([0-9.]+) ]]; then
+    result=$(grep 'Average accuracy:' $i | sed -e 's/Average/Avg./g' -e 's/processing //' || :)
+    if [[ "$result" =~ accuracy:\ ([0-9.]+) ]]; then
        result+=" >= ${expected_accuracy[$seq]}"
        if [[ $(echo "${BASH_REMATCH[1]} >= ${expected_accuracy[$seq]:-0}"|bc) -eq 1 ]]; then
            status=ok
@@ -24,4 +24,4 @@ for i in "$@"; do
        status=FAILED
     fi
     echo ! "$seq;$flags;$build;$result;$status"
-done | sort | column -t -s";"
+done | sort -t";" $SORT_FLAGS | column -t -s";"