X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=8b2bc463484ab69ada58872bd80ac46851e61492;hb=f84dd2f6de7d5da16da729dc2e91cbdeb3585d75;hp=c53edf29a97a32dd5460c015f83fbe8abe5df382;hpb=9abf8a6f78264fbf4eec1676b4a26018967c97e6;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index c53edf2..8b2bc46 100644
--- a/main.ml
+++ b/main.ml
@@ -6,7 +6,7 @@
 (******************************************************************************)
 INCLUDE "debug.ml"
 
-open Automaton
+open Ata
 
 
 let l = ref [] ;;
@@ -23,13 +23,6 @@ let total_time () =  List.fold_left (+.) 0. !l;;
 
 
 let main v query output =
-    (* 
-  (* Just a trick to allow the C++ code to print debugging stuff first *)  
-       let v = time (fun () -> let v = Tree.Binary.parse_xml_uri filename;
-       in Printf.eprintf "Parsing document : %!";v
-       ) () 
-       in
-    *)
     let _ = Tag.init (Tree.Binary.tag_pool v) in
       Printf.eprintf "Parsing query : ";    
       let query = try
@@ -41,25 +34,22 @@ let main v query output =
 	Printf.eprintf "Compiling query : ";
 	let auto = time XPath.Compile.compile  query in
 	  XPath.Ast.print Format.err_formatter query;
-	  Format.eprintf "\n%!";
-	  (*		Format.eprintf "Internal rep of the tree is :\n%!";
-			Tree.Binary.dump v;			      *)
 	  Printf.eprintf "Execution time : ";
-	  time (fun v -> ignore (TopDown.accept auto v)) v;
-	  Printf.eprintf "Number of nodes in the result set : %i\n" (BST.cardinal auto.result);
-	  begin
- 	    match output with
-	      | None -> ()
-	      | Some f ->
-		  
-		  Printf.eprintf "Serializing results : ";
-		time( fun () ->
-			let oc = open_out f in
-			  output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-			  BST.iter (fun t -> Tree.Binary.print_xml_fast oc t;
-				      output_char oc '\n') auto.result) ();
-	end;
-	Printf.eprintf "Total time : %fms\n Coherence : %i\n%!" (total_time())
+	  let result = time (BottomUpNew.run auto) v in
+	    Printf.eprintf "Number of nodes in the result set : %i\n" (List.length result);
+	    begin
+ 	      match output with
+		| None -> ()
+		| Some f ->
+		    
+		    Printf.eprintf "Serializing results : ";
+		    time( fun () ->
+			    let oc = open_out f in
+			      output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+			      List.iter (fun t -> Tree.Binary.print_xml_fast oc t;
+					   output_char oc '\n') result) ();
+	    end;
+	    Printf.eprintf "Total time : %fms\n Coherence : %i\n%!" (total_time())
 ;;
 		
 
@@ -91,6 +81,8 @@ in
 IFDEF DEBUG
 THEN
 Printf.eprintf "\n=================================================\nDEBUGGING\n%!";
+Format.eprintf "\nAutomaton is:\n%!";
+Ata.dump Format.err_formatter auto;
 Tree.DEBUGTREE.print_stats Format.err_formatter;;
 Gc.full_major()
 ENDIF