X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftable_driver.ml;h=d42743e28d9207621756ec69383de75292228512;hb=72818d02fb469c39a3d8043300152beae3e7e162;hp=64d1a1dae72a1448419d59c46f387128cc09a17c;hpb=72880536f01e8260441efda43430f893e8e4595b;p=tatoo.git

diff --git a/src/table_driver.ml b/src/table_driver.ml
index 64d1a1d..d42743e 100644
--- a/src/table_driver.ml
+++ b/src/table_driver.ml
@@ -18,24 +18,32 @@ let main () =
     close_fd(); 
     doc
   in
-  (*Hashtbl.clear Query_tree.table_query_tree;  il faut vider le hashtbl?????????????????*)
   let queries =
     List.map ( fun q ->
       parse_xpath q) 
       !Table_options.queries
   in
+  let t1 = Unix.gettimeofday () in
   let query_tree_list =
     List.map (fun query -> compile_xpath query) queries
   in
-     List.iter ( fun q -> 
-      let res = eval_query_tree doc [ (Naive_tree.root doc) ] q in
-      print_string "<xml_result num=\"1\" >\n";
-      print_node_list doc res;
-      print_string "</xml_result>\n"
-    ) query_tree_list ;
+  let mini_qtree_list = 
+    List.map (fun qtree -> Query_tree.minimize_qtree qtree) query_tree_list 
+  in
+  let root = Bitvector.create (Naive_tree.size doc) in
+  Bitvector.set root 0 true;
+  List.iter ( fun q -> 
+    let v = eval_qtree doc root q in
+    let res = decode_bit doc v in
+    print_string "<xml_result num=\"1\" >\n";
+    print_node_list doc res;
+    print_string "</xml_result>\n";
+  ) mini_qtree_list ;
   
+  let t2 = Unix.gettimeofday () in
+  let t = (t2 -. t1) *. 1000. in
   let _ = if !Table_options.count then 
-       Format.fprintf Format.std_formatter "there are %i nodes\n" !Query_tree.compteur;
+       Format.fprintf Format.std_formatter "there are %i nodes\nit takes %fms\n" !Query_tree.compteur t;
   in
   exit 0