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

diff --git a/src/query_tree.ml b/src/query_tree.ml
index 679d992..d9e6ada 100644
--- a/src/query_tree.ml
+++ b/src/query_tree.ml
@@ -1,6 +1,7 @@
 open Table
 
-let compteur = ref 0
+let query_tree_size = ref 0
+
 let table_qtree = QTreeHash.create 97
 		  	
 
@@ -147,17 +148,13 @@ let rec eval_qtree tree start q =
 	match q.desc with
 	  | Start -> start
 	  | Dom -> Bitvector.create ~init: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 v = eval_qtree tree start q1 in
 			   eval_axis tree v a 			   
 	  | Binop (op,q1,q2)-> begin
 	    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 -> Bitvector.union v1 v2	    
 	      | Inter -> Bitvector.inter v1 v2
@@ -165,9 +162,9 @@ let rec eval_qtree tree start q =
 	  end
 	in
 	QTreeHash.add table_qtree q res;
-	compteur := !compteur + Bitvector.length res; (*????8*)
 	res
     end
   in
  (* debug tree q resultat;*)
+  incr query_tree_size;
   resultat