X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=8bb6b4465d23ce8cf39115b3a5cfcb119addc2af;hb=55ee2680ca6d4e952cb800c529d45e064a2eff1c;hp=f440b3a7b893c4949f601d4bcded37b48e296a87;hpb=7b6e25ac7c3b4e06c8386c1090bb69ae97a47143;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index f440b3a..8bb6b44 100644
--- a/main.ml
+++ b/main.ml
@@ -9,10 +9,12 @@ open Ata
 INCLUDE "utils.ml"
 let () = init_timer();;
 
-let enabled_gc = Gc.get()
-let disabled_gc = { Gc.get() with
-		      Gc.max_overhead = 1000000; 
-		      Gc.space_overhead = 100 }
+let default_gc = Gc.get()
+let tuned_gc = { Gc.get() with
+		   Gc.minor_heap_size = 4*1024*1024;
+		   Gc.major_heap_increment = 1024*1024;
+		   Gc.max_overhead = 1000000;
+		  }
 let hash x = 131*x/(x-1+1)
 
 let test_loop tree tag =
@@ -93,11 +95,11 @@ let main v query_string output =
 	  Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
       in
       let _ = Printf.eprintf "Number of nodes %i\n%!" (Tree.size v) in
-      let _ = test_text v in
-(*      let _ = Tree.stats v in
-      let _ = Printf.eprintf "Timing first_child/next_sibling %!" in
-      let _ = time (Tree.benchmark_fcns)  v in
-      let _ = Printf.eprintf "Timing last_child/prev_sibling %!" in
+(*      let _ = test_text v in *)
+(*      let _ = Tree.stats v in *)
+      let _ = Printf.eprintf "Timing first_child/next_sibling %!" in  
+      let _ = time ~count:3 (Tree.benchmark_fcns)  v in  
+   (*   let _ = Printf.eprintf "Timing last_child/prev_sibling %!" in
       let _ = time (Tree.benchmark_lcps)  v in
       let _ = Printf.eprintf "Timing jump to a %!" in
       let _ = time (Tree.benchmark_jump v) (Tag.tag "a")  in      
@@ -165,7 +167,7 @@ let main v query_string output =
 	  begin
 	    let _ = Gc.full_major();Gc.compact() in
 	    let _ = Printf.eprintf "%!" in
-(*	    let _ = Gc.set (disabled_gc) in *)
+	    let _ = Gc.set (tuned_gc) in 
 	      if !Options.backward && ((snd test_list) != `NOTHING )then 
 		if !Options.count_only then
 		let r = time_mem (bottom_up_count auto v )(snd test_list)  in
@@ -195,14 +197,14 @@ let main v query_string output =
 		  if !Options.backward then Printf.eprintf "WARNING: couldn't find a jumping point, running top-down\n" 
 		in
 		if !Options.count_only then
-		  let r = time_mem ( top_down_count auto ) v in 
+		  let r = time ~count:5 ( top_down_count1 auto ) v in 
 		  let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
 		  in ()
 		else      
-		let module GR = Ata.Test(struct let doc = v end) in
-		  let result = time_mem (GR.top_down auto) v in
+		let module GR = Ata(*.Test(struct let doc = v end) *) in
+ 		  let result = time ~count:5 (GR.top_down1 auto) v in
 		  let _ = Printf.eprintf "Counting results " in
-		  let rcount = time (GR.Results.length) result in
+		  let rcount = time (IdSet.length) result in
 	      	    Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
 		    Printf.eprintf "\n%!";
 		    begin
@@ -210,31 +212,19 @@ let main v query_string output =
 			| None -> ()
 			| Some f ->		      
 			    Printf.eprintf "Serializing results : ";
-			    time( fun () ->
-				    (*let oc = open_out f in *)
-				    let oc = Unix.openfile f [ Unix.O_WRONLY;Unix.O_TRUNC;Unix.O_CREAT] 0o644 in
-				      (*output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";*)
-				    let t1 = ref (Unix.gettimeofday()) in
-				    let count = ref 1 in
-				    let old_count = ref 1 in
-				     GR.Results.iter (fun t -> 
-							incr count;
-							begin
-							  if (!count mod 15) == 0
-							  then
-							  let t2 =  Unix.gettimeofday() in
-							  let _ = Printf.eprintf "Printing %i elements in %f ms\n"
-							    (!count - !old_count) (1000. *.(t2 -. !t1))
-							  in
-							  ( old_count := !count; t1 := Unix.gettimeofday())
-							end;
-							Tree.print_xml_fast3 v t oc;
-							(*output_char oc '\n'; *)				
-						     ) result) ();
-		    end;
+			    let oc = 
+			      Unix.openfile f [ Unix.O_WRONLY;Unix.O_TRUNC;Unix.O_CREAT] 0o644 
+			    in
+			    time( 
+			      IdSet.iter (
+				fun t ->				  
+				  
+				  Tree.print_xml_fast3 v t oc;
+				
+			      )) result ;
+ end;
 	  end;
-	  let _ = Gc.set enabled_gc in
-	    Printf.eprintf "Total running time : %fms\n%!" (total_time())
+	  Printf.eprintf "Total running time : %fms\n%!" (total_time())
 ;;
 
 Options.parse_cmdline();;
@@ -262,3 +252,5 @@ let v =
 in
   main v !Options.query !Options.output_file;;
 
+
+