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

diff --git a/main.ml b/main.ml
index c53edf2..aed4ebb 100644
--- a/main.ml
+++ b/main.ml
@@ -6,8 +6,7 @@
 (******************************************************************************)
 INCLUDE "debug.ml"
 
-open Automaton
-
+open Ata
 
 let l = ref [] ;;
 let time f x =
@@ -23,46 +22,68 @@ 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
+    let _ = Tag.init (Tree.tag_pool v) in
       Printf.eprintf "Parsing query : ";    
       let query = try
 	time
 	  XPath.Parser.parse_string query
       with
 	  Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
-      in      
+      in
+	XPath.Ast.print Format.err_formatter query;
+	Format.fprintf Format.err_formatter "\n%!";
+(*	Printf.eprintf "Dummy iteration : ";
+	time (fill_hashtag) v;
+	Printf.eprintf "Dummy iteration (tag access cached) : ";
+	time (fill_hashtag) v;
+*)
 	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);
+	let auto,ltags,contains = time XPath.Compile.compile  query in 
+	let _ = Ata.dump Format.err_formatter auto in
+	let _ = Printf.eprintf "%!" in
+	let _ = match contains with
+	    None -> ()
+	  | Some s -> 
+	      let r = Tree.count v s 
+	      in
+		Printf.eprintf "Global count is %i, using " r;
+		if r < 60000 then begin
+		  Printf.eprintf "TextCollection contains\nCalling global contains : ";
+		  time (Tree.init_contains v) s
+		end
+		else begin
+		  Printf.eprintf "Naive contains\nCalling global contains : ";
+		  time (Tree.init_naive_contains v) s
+		end
+	in
+	  Printf.eprintf "Execution time %s : " (if !Options.count_only then "(counting only)" else "");
 	  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())
+	    if !Options.count_only then
+	      let r = time ( run_count auto  )v in
+	      let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
+	      in ()
+	    else      
+(*	      let _ = Gc.set ({ Gc.get() with Gc.max_overhead = 1000000; Gc.space_overhead = 100 }) in  *)
+	      let result,rcount = time (if !Options.time then run_time auto else run auto) v in	  
+	      	Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
+		Printf.eprintf "\n%!";
+	      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";				
+				TS.iter (fun t -> 
+					   Tree.print_xml_fast oc t;
+					   output_char oc '\n') result) ();
+	      end;
+	  end;
+	  let _ = Ata.dump Format.err_formatter auto in
+	  Printf.eprintf "Total running time : %fms\n%!" (total_time())
 ;;
 		
-
 Options.parse_cmdline();;
 
 let v = 
@@ -70,19 +91,19 @@ let v =
   then 
     begin
       Printf.eprintf "Loading from file : ";
-      time (Tree.Binary.load  ~sample:!Options.sample_factor )
+      time (Tree.load  ~sample:!Options.sample_factor )
 	(Filename.chop_suffix !Options.input_file ".srx");
     end
   else 
     let v = 
-      time (fun () -> let v = Tree.Binary.parse_xml_uri !Options.input_file;
+      time (fun () -> let v = Tree.parse_xml_uri !Options.input_file;
 	    in Printf.eprintf "Parsing document : %!";v
 	   ) () 
     in
       if !Options.save_file <> ""
       then begin
 	Printf.eprintf "Writing file to disk : ";
-	time (Tree.Binary.save v) !Options.save_file;
+	time (Tree.save v) !Options.save_file;
       end;
       v
 in
@@ -91,6 +112,7 @@ in
 IFDEF DEBUG
 THEN
 Printf.eprintf "\n=================================================\nDEBUGGING\n%!";
+
 Tree.DEBUGTREE.print_stats Format.err_formatter;;
 Gc.full_major()
 ENDIF