X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fquery_tree.ml;h=d9a226fe973933688cbf57d5014c90594f43d96e;hb=72818d02fb469c39a3d8043300152beae3e7e162;hp=a81804792e063f7f381c816cef6e2e8b542238fa;hpb=11fd750e5f19e421768ec72c511b631e7b009365;p=tatoo.git

diff --git a/src/query_tree.ml b/src/query_tree.ml
index a818047..d9a226f 100644
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -1,17 +1,18 @@
 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
-		     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 ->
-				Tree.NodeKind.is_a (Naive_tree.kind tree c) kind &&
-				QNameSet.mem (Naive_tree.tag tree c) tagset ) dom
+		  	
+
+let element_by_tag tree tagset kind = let v = Bitvector.create (Naive_tree.size tree) in
+				      for i=0 to (Bitvector.length v)-1 do
+					let c = Naive_tree.by_preorder tree i in
+					if (Tree.NodeKind.is_a (Naive_tree.kind tree c) kind &&
+					      QNameSet.mem (Naive_tree.tag tree c) tagset )
+					then Bitvector.set v i true
+				      done;
+				      v
+			 
 
 let mk_node q = {desc = q; id = -1; hash = -1}
 
@@ -109,28 +110,6 @@ let debug tree q l =
     Format.pp_print_flush Format.std_formatter ();
   end
 
-
-
-
-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 
 
@@ -167,23 +146,28 @@ let rec eval_qtree tree start q =
 	let res =
 	match q.desc with
 	  | Start -> start
-	  | Dom ->  all_nodes tree 	    
+	  | Dom -> (* Bitvector.create true (Naive_tree.size tree)*)
+	    let v = Bitvector.create (Naive_tree.size tree) in
+	    for i=0 to (Bitvector.length v)-1 do
+	      Bitvector.set v i true
+	    done;
+	    v
 	  | 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 			   
+	  | Axis (a,q1) -> let v = eval_qtree tree start q1 in
+			   eval_axis tree v a 			   
 	  | Binop (op,q1,q2)-> begin
-	    let ls1 = eval_qtree tree start q1 in
-	    let ls2 = eval_qtree tree start q2 in
+	    let v1 = eval_qtree tree start q1 in
+	    let v2 = 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
+	      | Union -> Bitvector.union v1 v2	    
+	      | Inter -> Bitvector.inter v1 v2
+	      | Diff -> Bitvector.diff  v1 v2
 	  end
 	in
 	QTreeHash.add table_qtree q res;
-	compteur := !compteur + (List.length res);
+	compteur := !compteur + Bitvector.length res; (*????8*)
 	res
     end
   in
-  debug tree q resultat;
+ (* debug tree q resultat;*)
   resultat