X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fquery_tree.ml;fp=src%2Fquery_tree.ml;h=6d9e6bded13e2d9aa1538937dac3783beec81871;hp=9297d3a29248c857b8916f507e00a488d3d485d1;hb=a7acc5b68cd4850b1bce020421087788a57b4eab;hpb=f0406bb418d8b742ffdb4b001ecd178f5b7d1271

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 9297d3a..6d9e6bd 100644
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -1,6 +1,8 @@
 open Table
 
 let compteur = ref 0
+let table_query_tree = Hashtbl.create 97 
+let table_qtree = QTreeHash.create 97
 
 let all_nodes tree = let root = Naive_tree.root tree in
 		     eval_axis tree [root] (Descendant true)
@@ -131,7 +133,7 @@ let debug tree q l =
     Format.pp_print_flush Format.std_formatter ();
   end
 
-let table_query_tree = Hashtbl.create 97 
+
 
 
 let rec compare_query_tree q1 q2 =
@@ -184,3 +186,61 @@ let rec eval_query_tree tree start q =
   in
   debug tree q resultat;
   resultat
+
+let mini_id = ref 0
+let mini_table = QTreeHash.create 17 
+
+let rec minimize_qtree q =
+   if q.id != -1 then q
+   else
+    try
+      QTreeHash.find mini_table q
+    with Not_found ->
+      let mdesc =
+	match q.desc with
+	    (Start | Dom | Tag _) as d -> d
+	  | Binop(op,q1,q2) -> let mq1 = minimize_qtree q1 in
+			       let mq2 = minimize_qtree q2 in
+			       Binop(op,mq1,mq2)
+	  | Axis(a,q1) -> let mq1 = minimize_qtree q1 in
+			  Axis(a,mq1)	      
+      in
+      q.desc <- mdesc;
+      q.hash <- QTree.hash q;
+      q.id <- !mini_id;
+      incr mini_id;
+      QTreeHash.add mini_table q q;
+      q
+
+
+	  
+let rec eval_qtree tree start q =
+  let resultat = 
+    begin
+      try
+	QTreeHash.find table_qtree q
+      with Not_found ->	
+	let res =
+	match q.desc with
+	  | Start -> start
+	  | Dom ->  all_nodes tree 	    
+	  | Tag (t,k) -> element_by_tag tree t k 		     
+	  | Axis (a,q1) -> let ls = eval_qtree tree start q1 in
+			   eval_axis tree ls a 			   
+	  | Binop (op,q1,q2)-> begin
+	    let ls1 = eval_qtree tree start q1 in
+	    let ls2 = eval_qtree tree start q2 in
+	    match op with	  
+	      | Union -> union_list tree ls1 ls2	    
+	      | Inter -> inter_list tree ls1 ls2
+	      | Diff -> diff_list tree ls1 ls2
+	  end
+	in
+	let res = List.sort (Table.compare_node tree) res in
+	QTreeHash.add table_qtree q res;
+	compteur := !compteur + (List.length res);
+	res
+    end
+  in
+  debug tree q resultat;
+  resultat