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

diff --git a/main.ml b/main.ml
index 8b2bc46..50dd048 100644
--- a/main.ml
+++ b/main.ml
@@ -22,6 +22,84 @@ let time f x =
 let total_time () =  List.fold_left (+.) 0. !l;;
 
 
+let test_slashslash tree k =
+  let test =
+    match k with "*" -> TagSet.remove (Tag.tag "") TagSet.star
+      | s -> TagSet.singleton (Tag.tag k)
+  in
+  let attorstring = TagSet.cup TagSet.pcdata TagSet.attribute in
+  let rec aux t acc =
+    if Tree.Binary.is_node t
+    then      
+      let tag = Tree.Binary.tag t in
+	  let l = Tree.Binary.first_child t 
+	  and r = Tree.Binary.next_sibling t
+	  in
+	  let acc = 
+	    if TagSet.mem tag test
+	    then
+	      TS.append t acc
+	    else
+	      acc
+	  in
+	  let rl = if TagSet.mem tag attorstring then acc else aux l acc 
+	  in aux r rl
+    else
+      acc
+  in
+  let _ = Printf.eprintf "Testing optimal //%s ... " k in
+  let r = time (aux tree ) TS.empty in
+  Printf.eprintf "Result set is %i nodes\n%!" (TS.length r)
+
+
+let test_jump tree k =
+  let ttag = Tag.tag k in
+
+  let rec loop acc tree = 
+    if Tree.Binary.is_node tree 
+    then
+      let acc = TS.cons tree acc in
+	loop acc (Tree.Binary.tagged_next tree ttag)
+    else
+      acc
+    
+  in
+  let _ = Printf.eprintf "Testing jumping for tag %s ... " k in
+  let r = time (loop TS.empty ) (Tree.Binary.tagged_next tree ttag) in
+    Printf.eprintf "Result set is %i nodes\n%!" (TS.length r)
+
+
+
+let test_traversal tree k =
+  let ttag = Tag.tag k in
+  let iid t = if Tree.Binary.is_node t then Tree.Binary.id t else -1 in
+  let rec aux t =
+    if Tree.Binary.is_node t
+    then      
+      let tag = Tree.Binary.tag t in
+      let l = Tree.Binary.first_child t 
+      and r = Tree.Binary.next_sibling t
+      in
+      let _ = Printf.eprintf "Tree with id %i and tag=%s, tagged_desc %s is %i tagged_foll is %i, tagged_next is %i\n%!"
+	(Tree.Binary.id t) (Tag.to_string tag) (k) 
+	(iid (Tree.Binary.tagged_desc t ttag))
+	(iid (Tree.Binary.tagged_foll t ttag))
+	(iid (Tree.Binary.tagged_next t ttag))
+      in
+	aux l;
+	aux r;
+
+    else 
+      ()
+  in
+    aux tree
+  
+let test_count_subtree tree k =
+  let ttag = Tag.tag k in
+  let _ = Printf.eprintf "Counting subtrees with tag %s ... %!" k in
+  let r = time(Tree.Binary.subtree_tags tree) ttag in
+    Printf.eprintf "%i nodes \n%!" r
+
 let main v query output =
     let _ = Tag.init (Tree.Binary.tag_pool v) in
       Printf.eprintf "Parsing query : ";    
@@ -30,13 +108,21 @@ 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      
-	Printf.eprintf "Compiling query : ";
+      in
+	XPath.Ast.print Format.err_formatter query;
+	Format.fprintf Format.err_formatter "\n%!";
+	Printf.eprintf "Compiling query : ";	
 	let auto = time XPath.Compile.compile  query in
-	  XPath.Ast.print Format.err_formatter query;
+	
+	let _ = Ata.dump Format.err_formatter auto ;
+		  Format.fprintf Format.err_formatter "\n%!"
+	in
+	let _ = test_count_subtree v "keyword" in
+	let _ = test_jump v "keyword" in
+
 	  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);
+	  let result = time (BottomUpNew.run auto) v in	  
+	    Printf.eprintf "Number of nodes in the result set : %i\n" (TS.length result);
 	    begin
  	      match output with
 		| None -> ()
@@ -46,10 +132,12 @@ let main v query output =
 		    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;
+			      TS.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())
+	(*    	let _ = Ata.dump Format.err_formatter auto  in
+		  Format.fprintf Format.err_formatter "\n%!"; *)
+	      Printf.eprintf "Total time : %fms\n%!" (total_time())
 ;;
 		
 
@@ -81,8 +169,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