X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Fquery_tree.ml;h=d9e6adac4a0d4c2668bbc9c426b5acfb441ba66f;hb=22cf9c6f33dfad88aa57e58c132bef1459768210;hp=9dcd0d51ae10e50d821956ebe23b28f369b35cf4;hpb=c7229e6e3c000938a74abeb52749f62a65c3bbfd;p=tatoo.git

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 9dcd0d5..d9e6ada 100644
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -1,17 +1,19 @@
 open Table
 
-let compteur = ref 0
-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 query_tree_size = ref 0
 
-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 table_qtree = QTreeHash.create 97
+		  	
+
+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}
 
@@ -145,23 +147,24 @@ let rec eval_qtree tree start q =
 	let res =
 	match q.desc with
 	  | Start -> start
-	  | Dom ->  all_nodes tree 	    
+	  | Dom -> Bitvector.create ~init:true (Naive_tree.size 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 			   
+	  | 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
+	    Table.node_compteur := !Table.node_compteur + 2*Bitvector.length v1; 
 	    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);
 	res
     end
   in
-  debug tree q resultat;
+ (* debug tree q resultat;*)
+  incr query_tree_size;
   resultat