Merged -correctxpath branch

[SXSI/xpathcomp.git] / unit_test.ml

diff --git a/unit_test.ml b/unit_test.ml
index f6cf23a..ff8d573 100644 (file)
--- a/unit_test.ml
+++ b/unit_test.ml
@@ -29,21 +29,23 @@ then
 
     
 let doc = 
-  try
-    Tree.Binary.parse_xml_uri Sys.argv.(1) 
-  with
-    | _ ->(
        try 
          Tree.Binary.load Sys.argv.(1) 
        with
          | _ -> 
-             Printf.printf "Error parsing document\n";
-             exit 2)
+             (     try
+                     Tree.Binary.parse_xml_uri Sys.argv.(1) 
+                   with
+                     | _ ->(
+                         
+                         Printf.printf "Error parsing document\n";
+                         exit 2))
 ;;
 let _ = Tag.init (Tree.Binary.tag_pool doc)
 ;;
-let tags = (collect_tags doc)
-;;
+(*
+  let tags = (collect_tags doc)
+  ;;
 (*
 let _ = Tree.Binary.test_xml_tree Format.std_formatter tags doc
 ;;
@@ -130,7 +132,7 @@ let _ = Printf.printf "==> %i nodes\n" (Ata.TS.length r)
 (* let _ = Ata.TS.iter (fun t -> Tree.Binary.print_xml_fast stdout t; print_newline();) r *)
 ;;
 
-*)
+*) *)
 let time f x =
   let t1 = Unix.gettimeofday () in
   let r = f x in
@@ -139,5 +141,8 @@ let time f x =
     Printf.eprintf "  %fms\n%!" t ;
     r
 ;;
+let _ = Printf.eprintf "Timing full //keyword ... "
+let x = List.length (time (Tree.Binary.time_xml_tree doc) (Tag.tag "keyword"))
 let _ = Printf.eprintf "Timing jump //keyword ... "
-let _ = time Tree.Binary.test_jump doc (Tag.tag "keyword")
+let y = List.length (time (Tree.Binary.time_xml_tree2 doc) (Tag.tag "keyword"))
+let _ = Printf.eprintf "coherant : %b\n" (x=y)