X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftable.ml;h=21ea213aeec0df9a8711bcdde3827dede6954686;hb=b1dd0048c707c1d459667946912346680e34dd02;hp=3d372eca395d5486d03342d0b6e717b432dcc2a8;hpb=333d2789a5dd6b7395b5fedbcdd670e103e0eb4b;p=tatoo.git

diff --git a/src/table.ml b/src/table.ml
index 3d372ec..21ea213 100644
--- a/src/table.ml
+++ b/src/table.ml
@@ -1,10 +1,4 @@
 
-type move = Self
-	    | Firstchild
-	    | Nextsibling
-	    | Revfirstchild
-	    | Prevsibling
-
 type query_tree_desc = Binop of op * query_tree * query_tree
 		       | Axis of Xpath.Ast.axis * query_tree
 		       | Start 
@@ -20,17 +14,79 @@ and query_tree = {
 }
 
 
+module QTree = struct
+  type t = query_tree
+  let rec equal q1 q2 =
+    q1 == q2 ||
+      (q1.id == q2.id && q1.id != -1) ||
+      match q1.desc, q2.desc with
+	| Binop(op1,qt1,qt2),Binop(op2,qt3,qt4)-> op1==op2&& (equal qt1 qt3 && equal qt2 qt4) 
+							   
+	| Axis(a1,qt1),Axis(a2,qt2) -> compare_axis a1 a2 && equal 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 hash q = 
+    if q.hash != -1 then q.hash
+    else match q.desc with
+	Dom -> 1
+      | Start -> 3
+      | Tag(s,_) -> 5 + 17*QNameSet.hash s
+      | Axis(a,q) -> 7 + 17 * Hashtbl.hash a + 23* hash q
+      | Binop(op,q1,q2) -> 11 + 17* Hashtbl.hash op + 23* hash q1 + 27* hash q2
+
+end
+
+
+module QTreeHash = Hashtbl.Make(QTree)
 
-
-
-
-
-(*28/01/2014  
-  parametres : tree  l'arbre xml
-               n     un noeud
-               m     move   
-  retour :un noeud qui correspond ॆ la relation r
-*)
+let compare_node tree a b =
+  compare (Naive_tree.preorder tree a ) (Naive_tree.preorder tree b )
+
+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 merge_list t l1 l2 =
+  match l1,l2 with
+    | [],l2 -> l2
+    | l1,[] -> l1
+    | h1::ll1, h2::ll2 -> if (comp_node t h2 h1) then h1:: (merge_list t ll1 l2)
+      else if (comp_node t h1 h2) then h2:: (merge_list t l1 ll2)
+      else h1::(merge_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 print_node_list tree l =
   List.iter (fun node ->
@@ -57,126 +113,137 @@ and print_binop fmt o =
     | Inter -> Format.fprintf fmt "Inter"
     | Diff -> Format.fprintf fmt "Diff"
 
-let rec eval_relation tree m n =
-  match m with
-      Self -> n
-    | Firstchild ->  Naive_tree.first_child tree n
-    | Nextsibling -> Naive_tree.next_sibling tree n
-    | Revfirstchild -> Naive_tree.parent_of_first tree n
-    | Prevsibling -> Naive_tree.prev_sibling tree n
-
-(*28/01/2014  
-  parametres : tree  l'arbre xml
-               ls    l'ensemble de noeuds
-               m     move   
-  retour : l'ensemble de noeuds qui correspondent ॆ la relation r
-*)
-
-
-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
-      Self -> ls
-    | r -> List.filter (fun n -> n != Naive_tree.nil)
-           (List.map (eval_relation tree r) ls) 
 	   
+let rec compare_node_list tree l1 l2 =
+  match l1,l2 with
+      [],[] -> 0
+    | _,[] -> 1
+    | [],_ -> -1
+    | n1::ll1,n2::ll2 -> let b = compare_node tree n1 n2 in
+			 if b=0 then compare_node_list tree ll1 ll2 
+			 else b
+
+let get_list_ordred tree ll =
+  let l1 = List.fold_left (fun acc l -> merge_list tree acc l) [] ll in
+  List.rev l1
+
+let get_descendant tree ln =
+  let rec aux n acc =
+    if n == Naive_tree.nil then  acc
+    else let n1 = Naive_tree.first_child tree n in 
+	 let acc1 = aux n1 (n::acc) in
+	 let n2 = Naive_tree.next_sibling tree n in
+	 let acc2 = aux n2 acc1 in
+	 acc2
+  in
+  let ll = List.map (fun n -> 
+    let n1 = Naive_tree.first_child tree n in
+    aux n1 [] ) ln in
+  get_list_ordred tree ll
+ (* let l = List.fold_left (fun acc n -> if List.mem n acc then acc 
+    else let n1 = Naive_tree.first_child tree n in
+	 aux n1 acc) [] ln 
+  in
+  List.rev l *)
+
+let get_child tree ln =
+  let rec aux n acc =
+    if n == Naive_tree.nil then acc
+    else 
+      let n1 = Naive_tree.next_sibling tree n in
+      aux n1 (n::acc)
+  in
+  let ll = List.map (fun  n->
+    let n1 = Naive_tree.first_child tree n in
+    aux n1 [] )  ln in
+  get_list_ordred tree ll
+
+  
+let get_followingSibling tree ln =
+  let rec aux n acc =
+    let n1 = Naive_tree.next_sibling tree n in
+    if n1 == Naive_tree.nil then acc
+    else aux n1 (n1::acc)
+  in
+  let ll = List.map (fun n -> aux n [] ) ln in
+  get_list_ordred tree ll
+  
+ 
+let rec get_firstBling tree n pred =
+  if n== Naive_tree.nil then pred
+  else get_firstBling tree (Naive_tree.prev_sibling tree n) n
+    
+let get_parent tree ln =
+  List.fold_left (fun acc n ->
+    let n1 = get_firstBling tree n Naive_tree.nil in
+    let n2 = Naive_tree.parent_of_first tree n1 in
+    if n2 != Naive_tree.nil then union_list tree [n2] acc   
+    else acc
+  ) [] ln
+ 
 
-(*28/01/2014  
-  parametres : tree  l'arbre xml
-               ls    l'ensemble de noeuds
-               m     move   
-  retour : l'ensemble de noeuds qui correspondent ॆ des relations lr
-*)
-
-and eval_star tree ls lr =
-  let h = Hashtbl.create 17 in
-  let q = Queue.create () in
-  List.iter ( fun e -> Queue.add e q ) ls;
-  while not (Queue.is_empty q ) do
-    let n = Queue.pop q in
-    if not (Hashtbl.mem h n) then begin
-      Hashtbl.add h n ();
-      List.iter ( fun r -> let m = eval_relation tree r n in
-			   if m != Naive_tree.nil && not (Hashtbl.mem h m ) then begin
-			     
-			     Queue.add m q; end
-      ) lr
-    end
-  done;
-  let l = Hashtbl.fold (fun k _ acc -> k::acc) h [] in
-  List.sort (compare_node tree) l
+let get_ancestor tree ln =
+  let rec aux tree l1 acc =
+    match l1 with
+	[] -> acc
+      | _ -> let ll1 = get_parent tree l1 in
+	     let acc1 = union_list tree acc ll1 in
+	     aux tree ll1  acc1
+  in  
+  let l = aux tree ln [] in
+  l
+
+let get_preSibling tree ln =
+  let rec aux n acc =
+    let n1 = Naive_tree.prev_sibling tree n in
+    if n1 == Naive_tree.nil then acc
+    else aux n1 (n1::acc)
+  in
+  let ll = List.map (fun n -> aux n [] ) ln in
+  List.fold_left (fun acc l1 -> union_list tree acc l1) [] ll 
+  
     
-(*28/01/2014  
-  parametres : tree  l'arbre xml
-               ls    l'ensemble de noeuds
-               a     axis   
-  retour : l'ensemble de noeuds qui correspondent ॆ l'axe
-*)
-
-let keep_elements t l = (*
-   List.filter (fun n -> match Naive_tree.kind t n with
-     | Element | Text | Document | Attribute -> true | _ -> false) l
-			*) l
-
-let keep_attributs t l = (*
-  List.filter (fun n -> match Naive_tree.kind t n with
-    | Attribute ->true | _ -> false) *) l
 
 let rec eval_axis tree ls a =
   let open Xpath.Ast in
 	match a with
 	    Self -> ls
 	      
-	  | Attribute -> let lfc = eval_move tree ls Firstchild in
-			 let lc = eval_star tree lfc [Nextsibling] in
-			 keep_attributs tree lc
+	  | Attribute -> get_child tree ls
 	    
-	  | Child -> let lfc = eval_move tree ls Firstchild in
-		     let lc = eval_star tree lfc [Nextsibling] in
-		     keep_elements tree lc
+	  | Child -> get_child tree ls
 		       
-	  | Descendant c -> let lfc = eval_move tree ls Firstchild in		     
-			    let ls2 = eval_star tree lfc [Firstchild;Nextsibling] in
+	  | Descendant c -> let ls2 = get_descendant tree ls in
 			    let ldes =
-			    if not c then ls2
-			    else List.merge (compare_node tree) ls2 ls
+			      if not c then ls2
+			      else union_list tree ls2 ls
 			    in
-			    keep_elements tree ldes
+			    ldes
 			      
-	  | FollowingSibling -> let lnexts = eval_move tree ls Nextsibling in
-				let lfs = eval_star tree lnexts [Nextsibling] in
-				keep_elements tree lfs
+	  | FollowingSibling -> get_followingSibling tree ls
 				  
-	  | Parent -> let lprevs = eval_star tree ls [Prevsibling] in
-		      let lp = eval_move tree lprevs Revfirstchild in
-		      keep_elements tree lp
+	  | Parent -> get_parent tree ls
 			
-	  | Ancestor b -> let ls2 = eval_star tree ls [Revfirstchild;Prevsibling] in
-			  let ls3 = eval_move tree ls2 Revfirstchild in
+	  | Ancestor b -> 
+			  let ls3 = get_ancestor tree ls in
 			  let lac =
 			  if not b then ls3
-			  else List.merge (compare_node tree ) ls3 ls
+			  else union_list tree ls3 ls    
 			  in
-			  keep_elements tree lac
+			  lac
 			    
-	  | PrecedingSibling -> let ls2 = eval_star tree ls [Prevsibling] in
-				let lps = eval_move tree ls2 Prevsibling in
-				keep_elements tree lps
+	  | PrecedingSibling -> get_preSibling tree ls
 				  
 	  | Preceding -> let ls2 = eval_axis tree ls (Ancestor true) in
 			 let ls3 = eval_axis tree ls2 PrecedingSibling in
 			 let lp = eval_axis tree ls3 (Descendant true) in
-			 keep_elements tree lp
+			 lp
 			 
 	  | Following -> let ls2 = eval_axis tree ls (Ancestor true) in
 			 let ls3 = eval_axis tree ls2 FollowingSibling in
 			 let lf = eval_axis tree ls3 (Descendant true) in
-			 keep_elements tree lf
-
-
-
+			 lf
+