.

[SXSI/xpathcomp.git] / main.ml

diff --git a/main.ml b/main.ml
index 10fd915..e7bdd35 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -24,7 +24,15 @@ let total_time () =  List.fold_left (+.) 0. !l;;
 let test filename query output = 
   Printf.eprintf "Parsing document : %!";
   let v = time Tree.Binary.parse_xml_uri filename in
-  Tree.Binary.print_xml_fast stderr v
+(*    Tree.dump v;
+    Printf.eprintf "\n\n\n\n\n%!";
+    Tree.Binary.print_xml_fast stderr v  *)
+    Printf.eprintf "Full Traversal\n%!";
+    time (Tree.full_traversal) v;
+    Printf.eprintf "Traversal\n%!";
+    time (Tree.traversal) v;
+    Printf.eprintf "CPP Traversal\n%!";
+    time (Tree.cpp_traversal) v
 
 
 let main filename query output =
@@ -33,7 +41,6 @@ let main filename query output =
     MM(v,__LOCATION__);
     a := Some (v);
     a := None;
-    Tree.Binary.print_xml_fast stderr v;
     Printf.eprintf "Parsing query : ";    
     let query = try
       time
@@ -48,9 +55,9 @@ let main filename query output =
 
        Printf.eprintf "TopDown (No BackTrack) : \n";
        time (fun v -> ignore (TopDown.accept auto v)) v;
-       P(Printf.eprintf "Max states in TopDownNOBT : %i\n%!" auto.max_states);
+       Printf.eprintf "Number of nodes in the result set : %i\n" (BST.cardinal auto.result);
        begin
-         match output with
+         match output with
            | None -> ()
            | Some f ->