X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=tests%2Fnon_regression_tests%2Fsxsi.sh;h=6221e8312c48345b544c391db0bb7a28d7ea4fca;hb=refs%2Fheads%2Ftrack-xml-tree-better-doc;hp=f1948ea555fa7ffc703806552a24cceec7d01696;hpb=4b52da1a20a4fe031930bb96d2ca46bec06dc529;p=SXSI%2Fxpathcomp.git

diff --git a/tests/non_regression_tests/sxsi.sh b/tests/non_regression_tests/sxsi.sh
index f1948ea..6221e83 100755
--- a/tests/non_regression_tests/sxsi.sh
+++ b/tests/non_regression_tests/sxsi.sh
@@ -1,27 +1,35 @@
 #!/bin/bash
 
+source utils.sh
+
 function do_sxsi() {
     query="$1"
+    count="$4"
     doc=`basename "$2" .xml`.srx
     repeat="$3"
     TIME_MAT=""
     TIME_COUNT=""
     TIME_PRINT=""
     NUM_RESULTS=""
-    output=`./main.native -v -c -b "$doc" "$query" 2>&1`
+    output=`./main.native -r "$3" -c -b "$doc" "$query" 2>&1`
     echo "$output" >> sxsi_debug.log
-    NUM_RESULT=`echo "$output" | grep "Number of nodes " | grep -o '[0-9]*'`
-    time=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | grep -o '[0-9.]*'`
-    TIME_COUNT=`echo "$time" | sort -g | head -1`
-
-    output=`./main.native -b "$doc" "$query" /dev/null 2>&1`
-    mtime=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | grep -o '[0-9.]*'`
-    ptime=`echo "$output" | grep "Serializing" | grep -o '[0-9.]*'`
-    TIME_MAT=`echo "$mtime" | sort -g | head -1`
-    TIME_PRINT="$ptime"
+    NUM_RESULT=`echo "$output" | grep "Number of results" | grep -o '[0-9]*'`
+    time=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | cut -f1 -d ':' | grep -o '[0-9.]*'`
+    TIME_COUNT=`echo "$time" | tail -n +2 | average`
+    if [ -z "$count" ]
+    then
+	output=`./main.native -b -r "$3" "$doc" "$query" /dev/null 2>&1`
+	mtime=`echo "$output" | grep "Execution time" | cut -f 2 -d',' | cut -f1 -d ':'| grep -o '[0-9.]*'`
+	ptime=`echo "$output" | grep 'Serialization time' | cut -f 3 -d ' ' | grep -o '[0-9.]*'`
+	TIME_MAT=`echo "$mtime" | tail -n +2 | average`
+	TIME_PRINT="$ptime"
+    else
+	TIME_MAT="999999"
+	TIME_PRINT="0"
+    fi
 
-    echo "$TIME_COUNT" 
-    echo "$TIME_MAT" 
+    echo "$TIME_COUNT"
+    echo "$TIME_MAT"
     echo "$TIME_PRINT"
     echo $NUM_RESULT
 }