Remplacer la fonction List.sort par les fonctions d'evaluations. La liste de fonction...

[tatoo.git] / src / query_tree.ml

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 5999df6..a818047 100644 (file)
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -1,9 +1,12 @@
 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)
+                    let acc1 = get_descendant tree [root] in
+                    root::acc1
 
 let element_by_tag tree tagset kind = let dom = all_nodes tree in
                              List.filter (fun c ->
@@ -87,32 +90,7 @@ let compile_xpath p = match p with
   | [p] -> compile_single_path p
   | p::r -> List.fold_left (fun acc p -> mk_node (Binop (Union , acc, compile_single_path p) )) (compile_single_path p) r
 
-let comp_node t n1 n2 = (Naive_tree.preorder t n1) < (Naive_tree.preorder t n2)
-
-
-let rec union_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> l2
-    | l1, [] -> l1
-    | h1::ll1, h2::ll2 -> if (comp_node t h2 h1) then h2 :: (union_list t l1 ll2)
-      else if (comp_node t h1 h2) then h1::(union_list t ll1 l2)
-      else h1 ::(union_list t ll1 ll2)
-
-let rec inter_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> []
-    | l1, [] -> []
-    | h1::ll1, h2::ll2 -> if (comp_node t h1 h2) then inter_list t ll1 l2
-      else if (comp_node t h2 h1) then inter_list t l1 ll2
-      else h1 :: (inter_list t ll1 ll2)
 
-let rec diff_list t l1 l2 =
-  match l1,l2 with
-    | [],l2 -> []
-    | l1, [] -> l1
-    | h1::ll1, h2::ll2 -> if (comp_node t h1 h2) then h1::(diff_list t ll1 l2)
-      else if (comp_node t h2 h1)  then h2 :: (diff_list t l1 ll2)
-      else diff_list t ll1 ll2
 
 
 let do_debug = ref false
@@ -131,33 +109,78 @@ let debug tree q l =
     Format.pp_print_flush Format.std_formatter ();
   end
 
-let table_query_tree = Hashtbl.create 97 
 
-  
-let rec eval_query_tree tree start q =
+
+
+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 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
-       Hashtbl.find table_query_tree q
+       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_query_tree tree start q1 in
+         | Axis (a,q1) -> let ls = eval_qtree tree start q1 in
                           eval_axis tree ls a                     
          | Binop (op,q1,q2)-> begin
-           let ls1 = eval_query_tree tree start q1 in
-           let ls2 = eval_query_tree tree start q2 in
+           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
-       Hashtbl.add table_query_tree q res;
+       QTreeHash.add table_qtree q res;
        compteur := !compteur + (List.length res);
        res
     end