From ff0d1111e34d2aba9b6454e0c95b67bd38ba392c Mon Sep 17 00:00:00 2001
From: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>
Date: Fri, 30 Jan 2009 05:24:49 +0000
Subject: [PATCH] .

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@97 3cdefd35-fc62-479d-8e8d-bae585ffb9ca
---
 benchmark/benchmark.ml                | 8 ++++----
 benchmark/{config.ml => config.ml.in} | 6 ++----
 benchmark/main.ml                     | 9 +++++----
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename benchmark/{config.ml => config.ml.in} (76%)

diff --git a/benchmark/benchmark.ml b/benchmark/benchmark.ml
index 5418b64..c726166 100644
--- a/benchmark/benchmark.ml
+++ b/benchmark/benchmark.ml
@@ -258,10 +258,10 @@ struct
 				 else Printf.printf "With output : \t%!";
 				 for i = 1 to Conf.num_runs do
 				   let s = extract(run_query (k==1) (j==1) qnum docnum qset) in
-				     if sres.(j).query_execution_time > s.query_execution_time
-				     then sres.(j) <- s;
-				     if (k==1) then
-				       sres.(j).memory_usage <- s.memory_usage;
+				     sres.(j).query_execution_time <- s.query_execution_time;
+				     sres.(j).query_compile_time <- s.query_compile_time;
+				     if j == 1 then sres.(j).serialization_time <- s.serialization_time;
+				     if k == 1 then sres.(j).memory_usage <- s.memory_usage;
 				     Printf.printf "pass %i ... %!" i;
 				 done;
 				 Printf.printf "Ok\n%!";		       
diff --git a/benchmark/config.ml b/benchmark/config.ml.in
similarity index 76%
rename from benchmark/config.ml
rename to benchmark/config.ml.in
index 422c0c4..5d63b48 100644
--- a/benchmark/config.ml
+++ b/benchmark/config.ml.in
@@ -2,7 +2,7 @@
 let documents = [ "../tests/tiny.xml" ]
 
 (* semi-colon separated list of XPath queries *)
-let queries = [ "//para[ contains(.,\"international\") ]//acronym"; "//*//*//*//*"; "/*"; "//part//text()" ]
+let queries = [ "//*" ]
 
 
 (* I is the initial configuration
@@ -25,7 +25,5 @@ module I = INIT_TESTER (CONF)
 
 module TEST = 
   MK (SXSI) 
-    (MK (XsltProc) 
-       (MK (QizxOpen) 
-	  (MK (SaxonBXQuery) (I))))
+	  (MK (SaxonBXQuery) (I))
 
diff --git a/benchmark/main.ml b/benchmark/main.ml
index 111f421..b80faed 100644
--- a/benchmark/main.ml
+++ b/benchmark/main.ml
@@ -114,9 +114,10 @@ let l = TEST.test_engine [] (make_queryset
 
 List.iter (function (e,d),s -> 
 	     Printf.printf "\n--------------  %s   -----------------" e;
-	     Array.iter ( fun i ->
-	       print_newline ();
-	       print_newline ();
-	       print_stats Format.std_formatter i) (List.hd s);
+	     List.iter (fun k -> 
+			  Array.iter ( fun i ->
+					 print_newline ();
+					 print_newline ();
+					 print_stats Format.std_formatter i) k) s;
 	     Printf.printf "\n----------------------------------------\n"
 	  ) l
-- 
2.17.1