X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fquery_tree.ml;h=5f3c113d2464a43cd4c127de14a31f99f093a9ec;hb=5a2f69473adac536c778653a9f6c4d1267510945;hp=5999df69a637d928907b5b8741da656cba4494a9;hpb=333d2789a5dd6b7395b5fedbcdd670e103e0eb4b;p=tatoo.git

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 5999df6..5f3c113 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,9 +133,29 @@ 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 =
+     q1.id==q2.id|| match q1.desc,q2.desc with
+     | Binop(op1,qt1,qt2),Binop(op2,qt3,qt4)->op1==op2&& ((compare_query_tree qt1 qt3 && compare_query_tree qt2 qt4) 
+							  ||  (compare_query_tree qt1 qt4 && compare_query_tree qt2 qt3))
+     | Axis(a1,qt1),Axis(a2,qt2) -> compare_axis a1 a2 && compare_query_tree qt1 qt2
+     | Tag(t1,k1),Tag(t2,k2) ->t1==t2&& k1==k2
+     | Dom,Dom | Start,Start ->true
+     | _,_ ->false
+
+and compare_axis a1 a2 =
+  match a1,a2 with
+      Self ,Self | Attribute, Attribute | Child , Child | Parent , Parent
+    | FollowingSibling , FollowingSibling 	   
+    | PrecedingSibling , PrecedingSibling
+    | Preceding , Preceding | Following , Following -> true
+    | Descendant b1, Descendant b2 -> b1==b2 
+    | Ancestor b1, Ancestor b2 -> b1==b2
+    | _,_ -> false
+
+
 let rec eval_query_tree tree start q =
   let resultat = 
     begin
@@ -164,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 = Tas.sort_of_list tree res in
+	QTreeHash.add table_qtree q res;
+	compteur := !compteur + (List.length res);
+	res
+    end
+  in
+  debug tree q resultat;
+  resultat