X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=ab043b7749872a731780c28e981492d7da1be9d4;hb=52101d20031fd52639753282519b8a45e26ecb5d;hp=8b2bc463484ab69ada58872bd80ac46851e61492;hpb=d64e3a3a9ef6329caafdba848ef78427fce0d689;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index 8b2bc46..ab043b7 100644
--- a/main.ml
+++ b/main.ml
@@ -8,7 +8,6 @@ INCLUDE "debug.ml"
 
 open Ata
 
-
 let l = ref [] ;;
 let time f x =
   let t1 = Unix.gettimeofday () in
@@ -30,29 +29,60 @@ let main v query output =
 	  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;
-	  Printf.eprintf "Execution 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;
+	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.Binary.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.Binary.init_contains v) s
+		end
+		else begin
+		  Printf.eprintf "Naive contains\nCalling global contains : ";
+		  time (Tree.Binary.init_naive_contains v) s
+		end
+	in
+	  Printf.eprintf "Execution time %s : " (if !Options.count_only then "(counting only)" else "");
+	  begin
+	    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 = time (if !Options.time then run_time auto else run auto) v in	  
+	      	Printf.eprintf "Number of nodes in the result set : %i\n" (TS.length result);
+		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.rev_iter (fun t -> output_string oc "----------\n";
+					   Tree.Binary.print_xml_fast oc t;
 					   output_char oc '\n') result) ();
-	    end;
-	    Printf.eprintf "Total time : %fms\n Coherence : %i\n%!" (total_time())
+	      end;
+	  end;
+	  Printf.eprintf "Total running time : %fms\n%!" (total_time())
 ;;
 		
-
 Options.parse_cmdline();;
 
 let v = 
@@ -81,8 +111,7 @@ 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