X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.ml;h=425fad65b6318349171b2948f549b065cc9fcf42;hb=0d7eadaaedb0e9b485242975263b8f0480fc2f39;hp=d17c0c85fb87cc87dd47dc61db5e21eaba663aeb;hpb=dc91851aaeac91a71eba2c266d0227adea0c5815;p=SXSI%2Fxpathcomp.git

diff --git a/ata.ml b/ata.ml
index d17c0c8..425fad6 100644
--- a/ata.ml
+++ b/ata.ml
@@ -1,12 +1,63 @@
 (* Todo refactor and remove this alias *)
 INCLUDE "debug.ml"
-module Tree = Tree.Binary
-
-
 let gen_id =
   let id = ref (-1) in
     fun () -> incr id;!id
 
+  module TS = 
+  struct
+    type t = Nil 
+	     | Sing of Tree.t 
+	     | Cons of Tree.t*t 
+	     | ConsCat of Tree.t * t * t 
+	     | Concat of t*t
+    let empty = Nil
+      
+    let cons e t = Cons(e,t)
+    let concat t1 t2 = Concat(t1,t2)
+    let append e t = Concat(t,Sing(e))
+
+     
+
+      
+    let fold f l acc = 
+      let rec loop acc = function
+	| Nil -> acc
+	| Sing e -> f e acc
+	| Cons (e,t) -> loop (f e acc) t
+	| ConsCat (e,t1,t2) -> loop (loop (f e acc) t1) t2
+	| Concat (t1,t2) -> loop (loop acc t1) t2
+      in
+	loop acc l
+
+    let length l = fold (fun _ x -> x+1) l 0
+      
+
+    let iter f l =
+      let rec loop = function
+	| Nil -> ()
+	| Sing e -> f e
+	| Cons (e,t) -> f e; loop t
+	| ConsCat(e,t1,t2) -> 
+	    f e; loop t1; loop t2
+	| Concat(t1,t2) -> loop t1;loop t2
+      in loop l
+
+  end
+
+
+
+let h_union = Hashtbl.create 4097
+
+let pt_cup s1 s2 = 
+  let h = (Ptset.hash s1)*(Ptset.hash s2) - ((Ptset.hash s2)+(Ptset.hash s1)) in
+    try
+      Hashtbl.find h_union h
+    with
+	| Not_found -> let s = Ptset.union s1 s2
+	  in
+	    Hashtbl.add h_union h s;s
+
 
 module State = struct
 
@@ -18,13 +69,7 @@ let mk_state = State.mk
 
 type state = State.t
 
-type predicate = [ `Left of (Tree.t -> bool) | `Right of (Tree.t -> bool) |
-		       `True
-		 ]
 
-let eval_pred t = 
-  function `True -> true
-    | `Left f | `Right f -> f t
 	
 type formula_expr = 
   | False | True
@@ -35,19 +80,19 @@ and formula = { fid: int;
 		fkey : int;
 		pos : formula_expr;
 		neg : formula;
-		st : (Ptset.t*Ptset.t)*(Ptset.t*Ptset.t);
+		st : (Ptset.t*Ptset.t*Ptset.t)*(Ptset.t*Ptset.t*Ptset.t);
 		size: int;
 	      }
     
 external hash_const_variant : [> ] -> int = "%identity" 
-external int_bool : bool -> int = "%identity"
+external vb : bool -> int = "%identity"
 
 let hash_node_form t = match t with 
   | False -> 0
   | True -> 1
-  | And(f1,f2) -> (2+17*f1.fkey + 37*f2.fkey) land max_int
-  | Or(f1,f2) -> (3+101*f1.fkey + 253*f2.fkey) land max_int
-  | Atom(v,b,s) -> ((hash_const_variant v) + (3846*(int_bool b) +257) + (s lsl 13 - s)) land max_int
+  | And(f1,f2) -> (2+17*f1.fkey + 37*f2.fkey) (*land max_int *)
+  | Or(f1,f2) -> (3+101*f1.fkey + 253*f2.fkey) (*land max_int *)
+  | Atom(v,b,s) -> ((hash_const_variant v) + (3846*(vb b) +257) + (s lsl 13 - s)) (*land max_int *)
 	
 
 module FormNode = 
@@ -70,12 +115,12 @@ module WH = Weak.Make(FormNode)
 
 let f_pool = WH.create 107
 
-let empty_pair = Ptset.empty,Ptset.empty
-let empty_quad = empty_pair,empty_pair
+let empty_triple = Ptset.empty,Ptset.empty,Ptset.empty
+let empty_hex = empty_triple,empty_triple
 
 let true_,false_ = 
-  let rec t = { fid = 1; pos = True; fkey=1; neg = f ; st = empty_quad; size =1; }
-  and f = { fid = 0; pos = False; fkey=0; neg = t; st = empty_quad; size = 1; }
+  let rec t = { fid = 1; pos = True; fkey=1; neg = f ; st = empty_hex; size =1; }
+  and f = { fid = 0; pos = False; fkey=0; neg = t; st = empty_hex; size = 1; }
   in 
     WH.add f_pool f;
     WH.add f_pool t;
@@ -107,21 +152,21 @@ let cons pos neg s1 s2 size1 size2 =
 let atom_  d p s = 
   let si = Ptset.singleton s in
   let ss = match d with
-    | `Left -> (si,Ptset.empty),empty_pair
-    | `Right -> empty_pair,(si,Ptset.empty)
-    | `LLeft -> (Ptset.empty,si),empty_pair
-    | `RRight -> empty_pair,(Ptset.empty,si)
+    | `Left -> (si,Ptset.empty,si),empty_triple
+    | `Right -> empty_triple,(si,Ptset.empty,si)
+    | `LLeft -> (Ptset.empty,si,si),empty_triple
+    | `RRight -> empty_triple,(Ptset.empty,si,si)
   in fst (cons (Atom(d,p,s)) (Atom(d,not p,s)) ss ss 1 1)
        
-let union_quad  ((l1,ll1),(r1,rr1))  ((l2,ll2),(r2,rr2)) =
-  (Ptset.union l1 l2 ,Ptset.union ll1 ll2),
-  (Ptset.union r1 r2 ,Ptset.union rr1 rr2)
+let union_hex  ((l1,ll1,lll1),(r1,rr1,rrr1))  ((l2,ll2,lll2),(r2,rr2,rrr2)) =
+  (pt_cup l1 l2 ,pt_cup ll1 ll2,pt_cup lll1 lll2),
+  (pt_cup r1 r2 ,pt_cup rr1 rr2,pt_cup rrr1 rrr2)
 
 let merge_states f1 f2 =
   let sp = 
-    union_quad f1.st f2.st
+    union_hex f1.st f2.st
   and sn = 
-    union_quad f1.neg.st f2.neg.st
+    union_hex f1.neg.st f2.neg.st
   in
     sp,sn
       
@@ -161,28 +206,46 @@ let and_ f1 f2 =
 
 let not_ f = f.neg
 
+let k_hash (s,t) = ((Ptset.hash s)) lsl 31  lxor (Tag.hash t) 
 
 module HTagSetKey = 
 struct 
   type t = Ptset.t*Tag.t 
-  let int_hash key = key lsl 31 lor (key lsl 8)
   let equal (s1,s2) (t1,t2) =  (s2 == t2) &&  Ptset.equal s1 t1
-  let hash (s,t) = int_hash (Ptset.hash s) lxor ( int_hash (Tag.hash t))
+  let hash = k_hash
 end
+
 module HTagSet = Hashtbl.Make(HTagSetKey)
 
+type dispatch = { first : Tree.t -> Tree.t;
+		  flabel : string;
+		  next : Tree.t -> Tree.t -> Tree.t;
+		  nlabel : string;
+		  consres : Tree.t -> TS.t -> TS.t -> bool -> bool -> TS.t
+		}
+
+type formlist = Nil | Cons of state*formula*int*formlist
+
+let f_hash (h,s,t) = h * 41+((Ptset.hash s) lsl 10 ) lxor (Ptset.hash t)*4097
+module HFormlistKey =
+struct
+  type t = int*Ptset.t*Ptset.t
+  let equal (h1,s1,t1) (h2,s2,t2) = h1==h2 && s1 == s2 && t1 == t2
+  let hash = f_hash
+end
+module HFormlist = Hashtbl.Make (HFormlistKey)
+
 type t = { 
     id : int;
     mutable states : Ptset.t;
     init : Ptset.t;
     mutable final : Ptset.t;
     universal : Ptset.t;
+    starstate : Ptset.t option;
     (* Transitions of the Alternating automaton *)
-    phi : (state,(TagSet.t*(bool*formula*predicate)) list) Hashtbl.t;
-    delta : (state*Tag.t, (bool*formula*predicate)) Hashtbl.t;
-(*    delta : (state,(bool*formula*predicate) TagMap.t) Hashtbl.t; *)
-    sigma : (bool*formula*(predicate list*predicate list)*bool) HTagSet.t;
-  }
+    phi : (state,(TagSet.t*(bool*formula*bool)) list) Hashtbl.t;
+    sigma : (dispatch*bool*formlist*Ptset.t*Ptset.t) HTagSet.t;
+}
 	   
   module Pair (X : Set.OrderedType) (Y : Set.OrderedType) =
   struct
@@ -196,7 +259,7 @@ type t = {
   module PL = Set.Make (Pair (Ptset) (Ptset))
 
 
-      let pr_st ppf l = Format.fprintf ppf "{";
+  let pr_st ppf l = Format.fprintf ppf "{";
     begin
       match l with
 	|	[] -> ()
@@ -246,7 +309,6 @@ type t = {
   			  pl2 acc )
   	      pl1 PL.empty
 
-
   and dnf f =
     try
       Hashtbl.find dnf_hash f.fid
@@ -296,28 +358,38 @@ type t = {
 		      Format.fprintf ppf "\n")l;
     
     Format.fprintf ppf "NFA transitions :\n------------------------------\n";
-    HTagSet.iter (fun (qs,t) (b,f,_,_) ->
-		    pr_st ppf (Ptset.elements qs);
-		    Format.fprintf ppf ",%s  %s " (Tag.to_string t) (if b then "=>" else "->");
-		    pr_frm ppf f;
-		    Format.fprintf ppf "(fid=%i) left=" f.fid;
-		    let (l,ll),(r,rr) = f.st in 
-		      pr_st ppf (Ptset.elements l);
-		      Format.fprintf ppf ", ";
-		      pr_st ppf (Ptset.elements ll);
+(*    HTagSet.iter (fun (qs,t) (disp,b,_,flist,_,_) ->
+		    let (ls,lls,_),(rs,rrs,_) = 
+		      List.fold_left (fun ((a1,b1,c1),(a2,b2,c2)) (_,f) ->
+					let (x1,y1,z1),(x2,y2,z2) = f.st in
+					  ((Ptset.union x1 a1),(Ptset.union y1 b1),(Ptset.union c1 z1)),
+					((Ptset.union x2 a2),(Ptset.union y2 b2),(Ptset.union c2 z2)))
+			((Ptset.empty,Ptset.empty,Ptset.empty),
+			 (Ptset.empty,Ptset.empty,Ptset.empty))
+			flist 
+		    in
+		      pr_st ppf (Ptset.elements qs);
+		      Format.fprintf ppf ",%s  %s " (Tag.to_string t) (if b then "=>" else "->");
+		      List.iter (fun (q,f) ->
+				   Format.fprintf ppf "\n%i," q;				  
+				   pr_frm ppf f)	   flist;
+		      Format.fprintf ppf "\nleft=";
+		      pr_st ppf (Ptset.elements ls);
+		      Format.fprintf ppf " , ";
+		      pr_st ppf (Ptset.elements lls);		       
 		      Format.fprintf ppf ", right=";
-		      pr_st ppf (Ptset.elements r);
+		      pr_st ppf (Ptset.elements rs);
 		      Format.fprintf ppf ", ";
-		      pr_st ppf (Ptset.elements rr);
-		      Format.fprintf ppf "\n";
-		 ) a.sigma;    
-    Format.fprintf ppf "=======================================\n"
+		      pr_st ppf (Ptset.elements rrs);
+		      Format.fprintf ppf ", first=%s, next=%s\n\n" disp.flabel disp.nlabel;
+      ) a.sigma;    *)
+    Format.fprintf ppf "=======================================\n%!"
     
   module Transitions = struct
-    type t = state*TagSet.t*bool*formula*predicate
+    type t = state*TagSet.t*bool*formula*bool
     let ( ?< ) x = x
-    let ( >< ) state (l,b) = state,(l,b,`True)
-    let ( ><@ ) state (l,b,p) = state,(l,b,p)
+    let ( >< ) state (l,b) = state,(l,b,false)
+    let ( ><@ ) state (l,b) = state,(l,b,true)
     let ( >=> ) (state,(label,mark,pred)) form = (state,label,mark,form,pred)
     let ( +| ) f1 f2 = or_ f1 f2
     let ( *& ) f1 f2 = and_ f1 f2
@@ -330,91 +402,38 @@ type t = {
   let equal_trans (q1,t1,m1,f1,_) (q2,t2,m2,f2,_) =
     (q1 == q2) && (TagSet.equal t1 t2) && (m1 == m2) && (equal_form f1 f2)
       
-  module TS = 
-  struct
-    type node = Nil | Cons of Tree.t * node | Concat of node*node
-    and t = { node : node; size : int }
-    let node n s = { node=n; size = s }
-
-    let empty = node Nil 0 
-      
-    let cons e t = node (Cons(e,t.node)) (t.size+1)
-    let concat t1 t2 = node (Concat (t1.node,t2.node)) (t1.size+t2.size)
-    let append = cons
-(*    let append e t = node (Concat(t.node,Cons(e,Nil))) (t.size+1) *)
-      
-    let to_list_rev t = 
-      let rec aux acc l rest =     
-	match l with
-	  | Nil -> begin
-	      match rest with 
-		| Nil -> acc
-		| Cons(e,t) -> aux (e::acc) t Nil
-		| Concat(t1,t2) -> aux acc t1 t2
-	    end
-	  | Cons(e,r) -> aux (e::acc) r rest
-	  | Concat(t1,t2) -> aux acc t1 (Concat(t2,rest))
-      in
-    aux [] t.node Nil
-
-    let length = function { size = s } -> s
-
-    let iter f { node = n } =
-      let rec loop = function
-	| Nil -> ()
-	| Cons(e,n) -> let _ = f e in loop n
-	| Concat(n1,n2) -> let _ = loop n1 in loop n2
-      in loop n
-
-    let rev_iter f { node = n } =
-      let rec loop = function
-	| Nil -> ()
-	| Cons(e,n) -> let _ = loop n in f e
-	| Concat(n1,n2) -> let _ = loop n2 in loop n1
-      in loop n
-
 
-    let find f { node = n } =
-      let rec loop = function
-	| Nil -> raise Not_found
-	| Cons(e,n) -> if f e then e else loop n
-	| Concat(n1,n2) -> try
-	    loop n1
-	  with
-	    | Not_found -> loop n2
-      in
-	loop n
-
-  end
-(*
-  module BottomUpJumpNew = struct
-
-*)  
-    module HFEval = Hashtbl.Make(
-      struct
-	type t = int*Ptset.t*Ptset.t
-	let equal (a,b,c) (d,e,f) =
-	  a==d && (Ptset.equal b e) && (Ptset.equal c f)
-	let hash (a,b,c) = 
-	  a+17*(Ptset.hash b) + 31*(Ptset.hash c)
-      end)
-      
-    let hfeval = HFEval.create 4097
-     
+  module HFEval = Hashtbl.Make(
+    struct
+      type t = int*Ptset.t*Ptset.t
+      let equal (a,b,c) (d,e,f) =
+	a==d && (Ptset.equal b e) && (Ptset.equal c f)
+      let hash (a,b,c) = 
+	a+17*(Ptset.hash b) + 31*(Ptset.hash c)
+    end)
+    
+  let hfeval = HFEval.create 4097
+    
 
     let eval_form_bool f s1 s2 =      
       let rec eval f = match f.pos with
-	| Atom((`Left|`LLeft),b,q) -> if b == (Ptset.mem q s1) then (true,true,false) else false,false,false
-	| Atom((`Right|`RRight),b,q) -> if b == (Ptset.mem q s2) then (true,false,true) else false,false,false
-	    (* test some inlining *)
+	  (* test some inlining *)
 	| True -> true,true,true
 	| False -> false,false,false
 	| _ ->
 	    try	  
-	       HFEval.find hfeval (f.fid,s1,s2) 
+	      HFEval.find hfeval (f.fid,s1,s2) 
 	    with
-	      |	Not_found -> let r = 
+	      |	Not_found -> let r = 		  
 		  match f.pos with
+		    | Atom((`Left|`LLeft),b,q) ->
+			if b == (Ptset.mem q s1) 
+			then (true,true,false) 
+			else false,false,false
+		    | Atom(_,b,q) -> 
+			if b == (Ptset.mem q s2) 
+			then (true,false,true)
+			else false,false,false			
 		    | Or(f1,f2) ->	    
 			let b1,rl1,rr1 = eval f1 
 			in
@@ -440,273 +459,260 @@ type t = {
       in eval f
 
 
-    let fstate_pool = Hashtbl.create 11
+    let h_formlist = HFormlist.create 511
+
+    let form_list_fold_left f acc fl =
+      let rec loop acc fl = 
+	match fl with
+	  | Nil -> acc
+	  | Cons(s,frm,h,fll) -> loop (f acc s frm h) fll
+      in
+	loop acc fl
 
-    let merge_pred a b = match a,b with
-      | Some(f1), Some(f2) -> Some(fun x -> f1 x || f2 x)
-      | None,None -> None
-      | None,Some(_) -> b
-      | Some(_),None -> a
 
-    let acc_pred p l1 l2 = match p with
-      | `Left _ -> p::l1,l2
-      | `Right _ -> l1,p::l2
-      | _ -> l1,l2
+    let rec eval_formlist s1 s2 = function
+      | Nil -> Ptset.empty,false,false,false
+      | Cons(q,f,h,fl) ->
+	  let k = (h,s1,s2)
+	  in
+	    try HFormlist.find h_formlist k
+	    with
+		Not_found ->
+		  let s,b',b1',b2' = eval_formlist s1 s2 fl in
+		  let b,b1,b2 = eval_form_bool f s1 s2 in
+		  let r = if b then (Ptset.add q s, b'||b, b1'||b1,b2'||b2)
+		  else s,b',b1',b2'
+		  in
+		    HFormlist.add h_formlist k r;r
 
 
+	      
+	      
+	      
+    let tags_of_state a q = Hashtbl.fold 
+      (fun p l acc -> 
+	 if p == q then
+	   List.fold_left 
+	     (fun acc (ts,(_,_,aux)) -> 
+		if aux then acc else
+		  TagSet.cup ts acc) acc l
+	 else acc) a.phi TagSet.empty
+    
+      
+
+    let tags a qs = 
+      let ts = Ptset.fold (fun q acc -> TagSet.cup acc (tags_of_state a q)) qs TagSet.empty
+      in
+	if TagSet.is_finite ts 
+	then `Positive(TagSet.positive ts)
+	else `Negative(TagSet.negative ts)
+      
+
+
+    let cons_res e s1 s2 b1 b2 =
+      if b1&&b2 then 
+	if s2 == TS.Nil && s1 == TS.Nil 
+	then TS.Sing e
+	else if s1 == TS.Nil
+	then TS.Cons (e,s2)
+	else if s2 == TS.Nil
+	then TS.Cons (e,s1)
+	else TS.ConsCat(e,s1,s2)
+      else if not(b1 || b2)
+      then TS.Sing e
+      else if b1 then if s1 == TS.Nil then TS.Sing e else TS.Cons(e,s1)
+      else if s2 = TS.Nil then TS.Sing e else TS.Cons(e,s2)
+
+    let cat_res _ s1 s2 b1 b2 =
+      if b1&&b2 then if s1 == TS.Nil && s2 == TS.Nil then TS.Nil
+	else 
+	  if s1 == TS.Nil 
+	  then s2 
+	  else 
+	    if s2 == TS.Nil then s1 else TS.Concat(s1,s2)
+      else if not(b1 || b2)
+      then TS.Nil
+      else if b1 then s1
+      else s2
+
+	
+	
     let merge_trans t a tag q acc = 
-      List.fold_left (fun (accf,accm,acchtrue) (ts,(m,f,pred)) ->
+      List.fold_left (fun (accf,accm,acchtrue,acchash) (ts,(m,f,pred)) ->
 			if TagSet.mem tag ts 
 			then
-			  let tmpf,hastrue = 
-			    if is_true f then
-			      let newfinal =
-				try Hashtbl.find fstate_pool f.fid with
-				  | Not_found -> let s = mk_state() in 
-				      a.states <- Ptset.add s a.states;
-				      a.final <- Ptset.add s a.final;
-				      Hashtbl.add fstate_pool f.fid s;s
-			      in
-				(atom_ `Left true newfinal),true
-			    else f,false in
-			    (or_ tmpf accf,accm||m,acchtrue||hastrue)
-			else (accf,accm,acchtrue)
+			  let acchash = acchash+31*f.fid+42*q in
+			  (Cons(q,f,acchash,accf),accm||m,acchtrue||(is_true f),acchash)
+			else (accf,accm,acchtrue,acchash)
 		     ) acc (try Hashtbl.find a.phi q with Not_found -> [])
+	
+    let inter_text a b =
+      match b with
+	| `Positive s -> let r = Ptset.inter a s in (r,Ptset.mem Tag.pcdata r, true)
+	| `Negative s -> (Ptset.empty, not (Ptset.mem Tag.pcdata s), false)
+
+    let mk_nil_ctx x _ = Tree.mk_nil x
+    let next_sibling_ctx x _ = Tree.next_sibling x 
+    let r_ignore _ x = x
 
     let get_trans t a tag r = 
-      try
-	let mark,f,predl,has_true = 
+      try	
 	  HTagSet.find a.sigma (r,tag)
-	in f.st,f,mark,has_true,r
       with
-	  Not_found -> 
-	    let f,mark,has_true,accq = 
-	      Ptset.fold (fun q (accf,accm,acchtrue,accq) ->
-			    let naccf,naccm,nacctrue =
-			      merge_trans t a tag q (accf,accm,acchtrue )
+	  Not_found ->  
+	    let fl,mark,_,_,accq = 
+	      Ptset.fold (fun q (accf,accm,acchtrue,acchash,accq) ->
+			    let naccf,naccm,nacctrue,acchash =
+			      merge_trans t a tag q (accf,accm,acchtrue,acchash )
 			    in
-			      if is_false naccf then (naccf,naccm,nacctrue,accq)
-			      else (naccf,naccm,nacctrue,Ptset.add q accq)
+			      (* if is_false naccf then (naccf,naccm,nacctrue,accq)
+			      else *) (naccf,naccm,nacctrue,acchash,Ptset.add q accq)
 			 )
-		r (false_,false,false,Ptset.empty)
+		r (Nil,false,false,17,Ptset.empty)
+	    in 
+	    let (ls,lls,llls),(rs,rrs,rrrs) = 
+	     form_list_fold_left (fun ((a1,b1,c1),(a2,b2,c2)) _ f _ ->
+				    let (x1,y1,z1),(x2,y2,z2) = f.st in
+				      ((Ptset.union x1 a1),(Ptset.union y1 b1),(Ptset.union c1 z1)),
+				    ((Ptset.union x2 a2),(Ptset.union y2 b2),(Ptset.union c2 z2)))
+	       ((Ptset.empty,Ptset.empty,Ptset.empty),
+		(Ptset.empty,Ptset.empty,Ptset.empty))
+		fl 
+	    in
+	    let tb,ta = 
+	      Tree.tags t tag 
 	    in 
-	      HTagSet.add a.sigma (accq,tag) (mark,f,([],[]),has_true);
-	      f.st,f,mark,has_true,accq
+	    let tl,htlt,lfin = inter_text tb (tags a ls)
+	    and tll,htllt,llfin = inter_text tb (tags a lls)
+	    and tr,htrt,rfin = inter_text ta (tags a rs)
+	    and trr,htrrt,rrfin = inter_text ta  (tags a rrs)
+	    in(*
+	    let _ = 
+	      Format.fprintf Format.err_formatter "Tag %s, right_states " (Tag.to_string tag);
+	      pr_st Format.err_formatter (Ptset.elements rs);
+		Format.fprintf Format.err_formatter " tags = ";
+		Ptset.iter (fun t -> Format.fprintf Format.err_formatter "%s "
+		(Tag.to_string t)) tr;
+		Format.fprintf Format.err_formatter ", next_states ";
+		pr_st Format.err_formatter (Ptset.elements rrs);
+	      Format.fprintf Format.err_formatter " tags = ";
+	      Ptset.iter (fun t -> Format.fprintf Format.err_formatter "%s "
+			    (Tag.to_string t)) trr;
+		Format.fprintf Format.err_formatter "\n%!";
+	      
+	    in*)
+	    let first,flabel =
+	      if (llfin && lfin) then (* no stars *)
+		(if htlt || htllt then (Tree.text_below, "#text_below")
+		 else
+		   let etl = Ptset.is_empty tl
+		   and etll = Ptset.is_empty tll
+		   in
+		     if (etl && etll)
+			 then (Tree.mk_nil, "#mk_nil")
+			 else
+			   if etl then 
+			     if Ptset.is_singleton tll 
+			     then (Tree.tagged_desc (Ptset.choose tll), "#tagged_desc")
+			     else (Tree.select_desc_only tll, "#select_desc_only")
+			   else if etll then (Tree.node_child,"#node_child")
+			   else (Tree.select_below tl tll,"#select_below"))
+		  else (* stars or node() *)
+		    if htlt||htllt then (Tree.first_child,"#first_child")
+		    else (Tree.node_child,"#node_child")
+	    and next,nlabel =
+	      if (rrfin && rfin) then (* no stars *)
+		( if htrt || htrrt
+		  then (Tree.text_next, "#text_next")
+		    else
+		      let etr = Ptset.is_empty tr
+		      and etrr = Ptset.is_empty trr
+		      in
+			if etr && etrr 
+			then (mk_nil_ctx, "#mk_nil_ctx")
+			else
+			  if etr then
+			    if Ptset.is_singleton trr 
+			    then (Tree.tagged_foll_below (Ptset.choose trr),"#tagged_foll_below")
+			    else (Tree.select_foll_only trr,"#select_foll_only")
+			  else if etrr then (Tree.node_sibling_ctx,"#node_sibling_ctx")
+			  else 	
+			    (Tree.select_next tr trr,"#select_next") )
+
+		  else if htrt || htrrt then (Tree.next_sibling_ctx,"#next_sibling_ctx")
+		  else (Tree.node_sibling_ctx,"#node_sibling_ctx")
+	    in
+	    let dispatch = { first = first; flabel = flabel; next = next; nlabel = nlabel;
+			   consres = if mark then cons_res else cat_res }	      
+	    in 
+	      HTagSet.add a.sigma (accq,tag) (dispatch,mark,fl,llls,rrrs);
+	      dispatch,mark,fl,llls,rrrs
 		
-    let h_union = Hashtbl.create 4097
-      
-    let pt_cup s1 s2 = 
-      let h = (Ptset.hash s1,Ptset.hash s2) in
-      try
-	Hashtbl.find h_union h
-      with
-	| Not_found -> let s = Ptset.union s1 s2
-	  in
-	    Hashtbl.add h_union h s;s
+	
 
+    let rec accepting_among a t r ctx =           
+      if Tree.is_nil t || Ptset.is_empty r then Ptset.empty,0,TS.Nil else 
+	let dispatch,mark,flist,llls,rrrs =
+	  get_trans t a (Tree.tag t) r
+	in
+	let s1,n1,res1 = accepting_among a (dispatch.first t) llls t in
+	let s2,n2,res2 = accepting_among a (dispatch.next t ctx) rrrs ctx in
+	let r',rb,rb1,rb2 = eval_formlist s1 s2 flist in
+	  r',(vb rb)*((vb mark) + (vb rb1)* n1 + (vb rb2)*n2),if rb then 
+	    dispatch.consres t res1 res2 rb1 rb2
+	  else TS.Nil
 
-		
-    let tags_of_state a q = Hashtbl.fold 
-      (fun p l acc -> 
-	 if p == q then
-	   List.fold_left 
-	     (fun acc (ts,_) ->
-		pt_cup (TagSet.positive ts) acc) acc l
-	 else acc) a.phi Ptset.empty
-      
-    let h_tags_states = Hashtbl.create 4096
-      
+    let run a t = 
+      let st,n,res = accepting_among a t a.init t in
+        if Ptset.is_empty (st) then TS.empty,0 else res,n
 
 
+    let rec accepting_among_count_no_star a t r ctx =     
+	if Tree.is_nil t||Ptset.is_empty r then Ptset.empty,0 else 
+	  let dispatch,mark,flist,llls,rrrs =
+	    get_trans t a (Tree.tag t) r
+	  in
+	  let s1,res1 = accepting_among_count_no_star a (dispatch.first t) llls t
+	  and s2,res2 = accepting_among_count_no_star a (dispatch.next t ctx) rrrs ctx
+	  in
+	  let r',rb,rb1,rb2 = eval_formlist s1 s2 flist
+	  in	
+	      r',(vb rb)*((vb mark) + (vb rb1)*res1 + (vb rb2)*res2)      
 
-    let tags a qs = 
-      try
-	Hashtbl.find h_tags_states (Ptset.hash qs)
-      with
-	| Not_found -> 
-	    let l = Ptset.fold (fun q acc -> pt_cup acc (tags_of_state a q)) qs Ptset.empty
-	    in
-		Hashtbl.add h_tags_states (Ptset.hash qs) l;l
-		  
-    let time cpt acc f x =
-      let t1 = Unix.gettimeofday () in
-      let r = f x in
-      let t2 = Unix.gettimeofday () in 
-      let t = (1000. *.(t2 -. t1)) in
-	acc:=!acc+.t;
-	incr cpt;
-	r
-	  
+
+
+    let rec accepting_among_count_star a t n =     
+	if Tree.is_nil t then n else 
+	  if (Tree.tag t == Tag.attribute) 
+	  then accepting_among_count_star a (Tree.node_sibling t) n
+	  else accepting_among_count_star a (Tree.node_sibling t) 
+	    (accepting_among_count_star a (Tree.node_child t) (1+n))
+
+    let rec accepting_among_count_may_star starstate a t r ctx =
+      if r == starstate then starstate,(accepting_among_count_star a t 0)
+      else
+	if Tree.is_nil t||Ptset.is_empty r then Ptset.empty,0 else 
+	  let dispatch,mark,flist,llls,rrrs =
+	    get_trans t a (Tree.tag t) r
+	  in
+	  let s1,res1 = accepting_among_count_may_star starstate a (dispatch.first t) llls t
+	  and s2,res2 = accepting_among_count_may_star starstate a (dispatch.next t ctx) rrrs ctx
+	  in
+	  let r',rb,rb1,rb2 = eval_formlist s1 s2 flist
+	  in	
+	    r',(vb rb)*((vb mark) + (vb rb1)*res1 + (vb rb2)*res2)      
 	
-    let h_time = Hashtbl.create 4096
-    let calls = ref 0
 
-    let rtime s f x = 
+    let run_count a t = 
       
-      let cpt,atime =
-	try 
-	  Hashtbl.find h_time s 
-	with
-	  | _ -> (ref 0, ref 0.)
+      let st,res = match a.starstate with 
+	| None -> accepting_among_count_no_star a t a.init t 
+	| Some s -> accepting_among_count_may_star s a t a.init t 
       in
-      let r = time cpt atime f x
-      in
-	Hashtbl.replace h_time s (cpt,atime);
-	r
-      
-    let rec accepting_among_time a t r ctx =     
-      incr calls;
-      let orig = r in
-      let rest = Ptset.inter r a.final in
-      let r = Ptset.diff r rest in
-	if Ptset.is_empty r then rest,TS.empty else 
-	  if Tree.is_node t
-	  then 
-	    let among,result,form = 
-	      let ((ls,lls),(rs,rrs)),formula,mark,has_true,r' =
-		let tag = rtime "Tree.tag" Tree.tag t in
-		rtime "get_trans" (get_trans t a tag) r
- 	      in 
-	      let tl = rtime "tags" (tags a) ls
-	      and tr = rtime "tags" (tags a) rs
-	      and tll = rtime "tags" (tags a) lls
-	      and trr = rtime "tags" (tags a) rrs
-	      in		
-	      let first =
-		if Ptset.mem Tag.pcdata (pt_cup tl tll)
-		then
-		   rtime "Tree.text_below" (Tree.text_below) t
-		else
-		  let etl = Ptset.is_empty tl
-		  and etll = Ptset.is_empty tll
-		  in
-		    if etl && etll 
-		    then Tree.mk_nil t
-		    else
-		      if etl then  rtime "Tree.tagged_desc_only" (Tree.tagged_desc_only t) tll
-		      else if etll then  rtime "Tree.first_child" (Tree.first_child) t
-		      else (* add child only *)			
-			rtime  "Tree.tagged_below" (Tree.tagged_below t tl) tll 
-	      and next =  
-		if Ptset.mem Tag.pcdata (pt_cup tr trr)
-		then
-		  rtime "Tree.text_next" (Tree.text_next t) ctx
-		else
-		  let etr = Ptset.is_empty tr
-		  and etrr = Ptset.is_empty trr
-		  in
-		    if etr && etrr 
-		    then Tree.mk_nil t
-		    else
-		      if etr then rtime "Tree.tagged_foll_only" (Tree.tagged_foll_only t trr) ctx
-		      else if etrr then rtime "Tree.next_sibling" (Tree.next_sibling) t
-		      else (* add ns only *)			
-			rtime "Tree.tagged_next" (Tree.tagged_next t tr trr) ctx
-			  
-	      in
-	      let s1,res1 = accepting_among_time a first (pt_cup ls lls) t
-	      and s2,res2 =  accepting_among_time a next (pt_cup rs rrs) ctx
-	      in
-	      let rb,rb1,rb2 = rtime "eval_form_bool" (eval_form_bool formula s1) s2 in
-		if rb
-		then 
-		  let res1 = if rb1 then res1 else TS.empty
-		  and res2 = if rb2 then res2 else TS.empty
-		  in r', rtime "TS.concat" (TS.concat res2) (if mark then rtime "TS.append" (TS.append t) res1 else res1),formula
-		else Ptset.empty,TS.empty,formula
-		  	    
-	    in 
-	  
-		among,result
-		
-	  else orig,TS.empty
-
- 
-    let run_time a t = 
-      let st,res = accepting_among_time a t a.init t in
-      let _ = Printf.eprintf "\n Timings\n";
-	let total_time = Hashtbl.fold (fun fname ({ contents=cpt }, {contents=atime}) (total_time) ->
-					 Printf.eprintf "%s\t %i calls, %f ms accumulated time, %f ms mean time\n"
-					   fname cpt atime (atime /. (float_of_int cpt));
-					 total_time +. atime ) h_time 0.
-	in
-	  Printf.eprintf "total calls %i, total monitored time %f ms\n%!" !calls total_time
-      in
-      if Ptset.is_empty (st) then TS.empty else res
-
-
-
-    let rec accepting_among a t r ctx =     
-      let orig = r in
-      let rest = Ptset.inter r a.final in
-      let r = Ptset.diff r rest in
-	if Ptset.is_empty r then rest,TS.empty else 
-	  if Tree.is_node t
-	  then 
-	    let among,result,form = 
-	      let ((ls,lls),(rs,rrs)),formula,mark,has_true,r' =
-		let tag =  Tree.tag t in
-		  get_trans t a tag r
- 	      in 
-	      let tl = tags a ls
-	      and tr = tags a rs
-	      and tll = tags a lls
-	      and trr = tags a rrs
-	      in		
-	      let first =
-		if Ptset.mem Tag.pcdata (pt_cup tl tll)
-		then
-		   Tree.text_below t
-		else
-		  let etl = Ptset.is_empty tl
-		  and etll = Ptset.is_empty tll
-		  in
-		    if etl && etll 
-		    then Tree.mk_nil t
-		    else
-		      if etl then Tree.tagged_desc_only t tll
-		      else if etll then  Tree.first_child t
-		      else (* add child only *)			
-			Tree.tagged_below t tl tll 
-	      and next =  
-		if Ptset.mem Tag.pcdata (pt_cup tr trr)
-		then
-		  Tree.text_next t ctx
-		else
-		  let etr = Ptset.is_empty tr
-		  and etrr = Ptset.is_empty trr
-		  in
-		    if etr && etrr 
-		    then Tree.mk_nil t
-		    else
-		      if etr then Tree.tagged_foll_only t trr ctx
-		      else if etrr then Tree.next_sibling t
-		      else (* add ns only *)			
-			Tree.tagged_next t tr trr ctx
-			  
-	      in
-	      let s1,res1 = accepting_among a first (pt_cup ls lls) t
-	      and s2,res2 =  accepting_among a next (pt_cup rs rrs) ctx
-	      in
-	      let rb,rb1,rb2 = eval_form_bool formula s1 s2 in
-		if rb
-		then 
-		  let res1 = if rb1 then res1 else TS.empty
-		  and res2 = if rb2 then res2 else TS.empty
-		  in r', TS.concat res2 (if mark then TS.append t res1 else res1),formula
-		else Ptset.empty,TS.empty,formula
-		  	    
-	    in 	  
-		among,result
-		
-	  else orig,TS.empty
-
- 
-    let run a t = 
-      let st,res = accepting_among a t a.init t in
-        if Ptset.is_empty (st) then TS.empty else res
-
+        if Ptset.is_empty (st) then 0 else  res
 
+	  
+    let run_time _ _ = failwith "blah"