Ajoute le module Tas pour remplacer la fonction List.sort.

Mise a jour la fonction eval_star et la fonction eval_qtree (remplace List.sort)
Dans le module Tas il y a des fonctions ci-dessous:
1) val size : 'a tas -> int
2) val height : 'a tas -> int
3) val equilibre : 'a tas -> bool
4) val is_tas : int tas -> bool   ------- il faut ameliorer
5) val pop : Naive_tree.t -> Naive_tree.node tas -> Naive_tree.node
6) val push : Naive_tree.t -> Naive_tree.node tas -> Naive_tree.node -> Naive_tree.node tas
7) val tas_of_list : Naive_tree.t -> Naive_tree.node list -> Naive_tree.node tas
8) val list_of_tas : Naive_tree.t -> Naive_tree.node tas -> Naive_tree.node list
9) val is_empty : Naive_tree.node tas ->bool
10) val sort_of_list : Naive_tree.t -> Naive_tree.node list -> Naive_tree.node list

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 6d9e6bd..5f3c113 100644 (file)
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -236,7 +236,7 @@ let rec eval_qtree tree start q =
              | Diff -> diff_list tree ls1 ls2
          end
        in
-       let res = List.sort (Table.compare_node tree) res in
+       let res = Tas.sort_of_list tree res in
        QTreeHash.add table_qtree q res;
        compteur := !compteur + (List.length res);
        res

diff --git a/src/table.ml b/src/table.ml
index f0e24ee..76a88ce 100644 (file)
--- a/src/table.ml
+++ b/src/table.ml
@@ -56,7 +56,80 @@ end
 
 module QTreeHash = Hashtbl.Make(QTree)
 
+let compare_node tree a b =
+  compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b )
+
+module Tas = struct
+type 'a tas =
+  | Vide
+  | Noeud of 'a tas * 'a * 'a tas
+
+let comp_node tree a b = (Naive_tree.preorder tree a )< (Naive_tree.preorder tree b )
+  
+let rec size t =
+  match t with
+      Vide -> 0
+    | Noeud (t1,racine,t2) -> 1+ size t1 + size t2
+
+let rec height t =
+  match t with
+      Vide -> 0
+    | Noeud (t1,racine,t2) -> 1 + max (height t1) (height t2)
+
+let equilibre t =
+  let rec aux t =
+    match t with
+       Vide -> 0
+      | Noeud (t1,racine,t2) -> 1 + min (aux t1) (aux t2)
+  in
+  let max_h = height t in
+  let min_h = aux t in
+  if max_h- min_h >1 then false
+  else true
+
+let  is_tas t =
+  if not (equilibre t) then false
+  else
+    let rec aux n t =
+      match t with
+         Vide -> true
+       | Noeud (Vide,racine,Vide)  -> racine >= n
+       | Noeud (t1,racine, t2) -> (aux racine t1) && (aux racine t2)
+    in
+    aux 0 t
+
+let rec pop tree t =
+  match t with
+      Vide -> failwith "Tas vide"
+    | Noeud (t1, racine, t2) ->  begin
+      match t1,t2 with 
+         Vide,t2 -> t2
+       | t1,Vide -> t1
+       | Noeud (t3,r1,t4),Noeud (t5,r2,t6) -> if comp_node tree r1 r2 then Noeud (pop tree t1, r1,t2)
+         else Noeud (pop tree t2, r2, t1)   
+    end
+
+let rec push tree t a =
+  match t with
+      Vide -> Noeud(Vide,a,Vide)
+    | Noeud (t1,r,t2) ->  if comp_node tree a r then Noeud (t2,a,push tree t1 r)
+      else Noeud(t2,r, push tree t1 a)
+
+let tas_of_list tree l =
+  List.fold_left (push tree) Vide l
+
+let is_empty t = (size t )== 0
 
+let rec list_of_tas tree t =
+  match t with
+      Vide -> []
+    | Noeud(t1,r,t2) -> r::(list_of_tas tree  (pop tree t))
+
+let sort_of_list tree l =
+  let t = tas_of_list tree l in
+  list_of_tas tree t
+
+end
 
 (*28/01/2014  
   parametres : tree  l'arbre xml
@@ -106,8 +179,7 @@ let rec eval_relation tree m n =
 *)
 
 
-let compare_node tree a b =
-  compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b ) 
+ 
 
 let rec eval_move tree ls m =
   match m with
@@ -139,7 +211,7 @@ and eval_star tree ls lr =
     end
   done;
   let l = Hashtbl.fold (fun k _ acc -> k::acc) h [] in
-  List.sort (compare_node tree) l
+  Tas.sort_of_list tree l
     
 (*28/01/2014  
   parametres : tree  l'arbre xml