X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=dc2cb3e7ac790b16506794c8ca29e6653e65644c;hb=329088598ab63bc2d67ff0dfc4f54e90f5d4f283;hp=cb890e7a375aee9dd38344886f9502242cbb95db;hpb=6a7025fee3c050eff58baa536a14d80baf5c1b87;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index cb890e7..dc2cb3e 100644
--- a/main.ml
+++ b/main.ml
@@ -14,6 +14,7 @@ let disabled_gc = { Gc.get() with
 		      Gc.max_overhead = 1000000; 
 		      Gc.space_overhead = 100 }
 let hash x = 131*x/(x-1+1)
+
 let test_loop tree tag =
   let t' = Tree.tagged_desc tree tag  Tree.root in
   let f = Hashtbl.create 4096
@@ -25,6 +26,20 @@ let test_loop tree tag =
   in
   Hashtbl.add f (hash 101) g;
   (Hashtbl.find f (hash 101)) t' Tree.root
+
+let test_full tree = 
+  let root = Tree.root in
+  let fin = Tree.closing tree root in
+  let rec loop t = if t <= fin then
+  let tag = Tree.tag tree t in
+(*  let _ = Tag.to_string tag in *)
+  if tag == Tag.pcdata then (ignore (Tree.get_text tree t)); 
+  let t = (Obj.magic ((Obj.magic t) + 1)) in
+  loop t
+  in
+  loop root
+
+
 let test_loop2 tree tag =
   let t' = Tree.tagged_desc tree tag  Tree.root in
   let f = Hashtbl.create 4096
@@ -51,10 +66,12 @@ let main v query_string output =
       in
 (*      let _ = Printf.eprintf "Timing //keyword :" in
       let r = time (test_loop v) (Tag.tag "keyword") in
-      let _ = Printf.eprintf "Count is %i\n%!" r in *)
+      let _ = Printf.eprintf "Count is %i\n%!" r in 
       let _ = Printf.eprintf "Timing //keyword 2:" in
       let r = time (test_loop2 v) (Tag.tag "keyword") in
-      let _ = Printf.eprintf "Count is %i\n%!" r in 
+      let _ = Printf.eprintf "Count is %i\n%!" r in  
+      let _ = Printf.eprintf "Timing //node() :" in
+      let _ = time (test_full)  v in      *)
       XPath.Ast.print Format.err_formatter query;
       Format.fprintf Format.err_formatter "\n%!";
       Printf.eprintf "Compiling query : ";
@@ -120,8 +137,10 @@ let main v query_string output =
 		  let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
 		  in ()
 		else      
-		  let result = time (top_down auto) v in	  
-		  let rcount = IdSet.length result in
+		let module GR = Ata.Test(struct let doc = v end) in
+		  let result = time (GR.top_down auto) v in
+		  let _ = Printf.eprintf "Counting results " in
+		  let rcount = time (GR.Results.length) result in
 	      	    Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
 		    Printf.eprintf "\n%!";
 		    begin
@@ -130,13 +149,13 @@ let main v query_string output =
 			| 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";				
-				      IdSet.iter (fun t -> 
-						    Tree.print_xml_fast oc v t;
-						    output_char oc '\n';
-
-						 ) result) ();
+				    (*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";*)
+				     GR.Results.iter (fun t -> 
+						  Tree.print_xml_fast3 v t oc;
+							(*output_char oc '\n'; *)				
+					       ) result) ();
 		    end;
 	  end;
 	  let _ = Gc.set enabled_gc in