.

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@93 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/benchmark/config.ml b/benchmark/config.ml
index 01aee85..7719818 100644 (file)
--- a/benchmark/config.ml
+++ b/benchmark/config.ml
@@ -1,8 +1,8 @@
 (* semi-colon separated list of input documents *)
-let documents = [ "../tests/tiny.srx" ]
+let documents = [ "../tests/tiny.xml" ]
 
 (* semi-colon separated list of XPath queries *)
-let queries = [ "/*" ]
+let queries = [ "//*[ contains(.//para//self::text(),\"international\") ]//para//acronym" ]
 
 
 (* I is the initial configuration
@@ -16,12 +16,12 @@ module CONF : CONFIGURATION =
 struct
   let path = "."
   let result_basename = "test"
-  let num_runs = 1
+  let num_runs = 2
   let run_with_output = true
   let run_without_output = true
 end
 
 module I = INIT_TESTER (CONF)
 
-module TEST = MK (SXSI) (I)
+module TEST = MK (SXSI) (MK (SaxonBXQuery) (I))
 

diff --git a/benchmark/main.ml b/benchmark/main.ml
index ae45a49..fff21c3 100644 (file)
--- a/benchmark/main.ml
+++ b/benchmark/main.ml
@@ -62,7 +62,9 @@ struct
   let reference = false
   let time_factor = 1.0
   let mk_queryfile b doc q out = ()
-  let mk_cmdline b qout qfile doc q = [ doc; q ]@ (if b then [qout] else [])
+  let mk_cmdline b qout qfile doc q = 
+    let doc' = (Filename.chop_suffix doc ".xml")^".srx" in
+      [ doc'; q ]@ (if b then [qout] else [])
   let parse_rules = 
     [  ( ".*Parsing document :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
         [ Input_parsing_time 1]);