(* 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 | Cons of Tree.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,Cons(e,Nil))
+
+ let fold f l acc =
+ let rec loop acc = function
+ | Nil -> acc
+ | Cons(e,t) -> loop (f e acc) t
+ | 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 -> ()
+ | Cons(e,t) -> let _ = f e in loop t
+ | Concat(t1,t2) -> let _ = loop t1 in 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
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
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;
}
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*(int_bool b) +257) + (s lsl 13 - s)) (*land max_int *)
module 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;
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
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 =
+struct
+ type key = Ptset.t*Tag.t
+ let equal (s1,s2) (t1,t2) = (s2 == t2) && Ptset.equal s1 t1
+ let hash (s,t) = ((Ptset.hash s)) lsl 31 lxor (Tag.hash t)
+
+type 'a t =
+ { mutable size: int; (* number of elements *)
+ mutable data: (key,'a) bucketlist array } (* the buckets *)
+
+and ('a, 'b) bucketlist =
+ Empty
+ | Cons of 'a * 'b * ('a, 'b) bucketlist
+
+let create initial_size =
+ let s = min (max 1 initial_size) Sys.max_array_length in
+ { size = 0; data = Array.make s Empty }
+
+let clear h =
+ for i = 0 to Array.length h.data - 1 do
+ h.data.(i) <- Empty
+ done;
+ h.size <- 0
+
+let copy h =
+ { size = h.size;
+ data = Array.copy h.data }
+
+let length h = h.size
+
+let resize tbl =
+ let odata = tbl.data in
+ let osize = Array.length odata in
+ let nsize = min (2 * osize + 1) Sys.max_array_length in
+ if nsize <> osize then begin
+ let ndata = Array.create nsize Empty in
+ let rec insert_bucket = function
+ Empty -> ()
+ | Cons(key, data, rest) ->
+ insert_bucket rest; (* preserve original order of elements *)
+ let nidx = (hash key) mod nsize in
+ ndata.(nidx) <- Cons(key, data, ndata.(nidx)) in
+ for i = 0 to osize - 1 do
+ insert_bucket odata.(i)
+ done;
+ tbl.data <- ndata;
+ end
+
+let add h key info =
+ let i = (hash key) mod (Array.length h.data) in
+ let bucket = Cons(key, info, h.data.(i)) in
+ h.data.(i) <- bucket;
+ h.size <- succ h.size;
+ if h.size > Array.length h.data lsl 1 then resize h
+
+let remove h key =
+ let rec remove_bucket = function
+ Empty ->
+ Empty
+ | Cons(k, i, next) ->
+ if equal k key
+ then begin h.size <- pred h.size; next end
+ else Cons(k, i, remove_bucket next) in
+ let i = (hash key) mod (Array.length h.data) in
+ h.data.(i) <- remove_bucket h.data.(i)
+
+let rec find_rec key = function
+ Empty ->
+ raise Not_found
+ | Cons(k, d, rest) ->
+ if equal key k then d else find_rec key rest
+
+let find h key =
+ match h.data.((hash key) mod (Array.length h.data)) with
+ Empty -> raise Not_found
+ | Cons(k1, d1, rest1) ->
+ if equal key k1 then d1 else
+ match rest1 with
+ Empty -> raise Not_found
+ | Cons(k2, d2, rest2) ->
+ if equal key k2 then d2 else
+ match rest2 with
+ Empty -> raise Not_found
+ | Cons(k3, d3, rest3) ->
+ if equal key k3 then d3 else find_rec key rest3
+
+let find_all h key =
+ let rec find_in_bucket = function
+ Empty ->
+ []
+ | Cons(k, d, rest) ->
+ if equal k key
+ then d :: find_in_bucket rest
+ else find_in_bucket rest in
+ find_in_bucket h.data.((hash key) mod (Array.length h.data))
+
+let replace h key info =
+ let rec replace_bucket = function
+ Empty ->
+ raise Not_found
+ | Cons(k, i, next) ->
+ if equal k key
+ then Cons(k, info, next)
+ else Cons(k, i, replace_bucket next) in
+ let i = (hash key) mod (Array.length h.data) in
+ let l = h.data.(i) in
+ try
+ h.data.(i) <- replace_bucket l
+ with Not_found ->
+ h.data.(i) <- Cons(key, info, l);
+ h.size <- succ h.size;
+ if h.size > Array.length h.data lsl 1 then resize h
+
+let mem h key =
+ let rec mem_in_bucket = function
+ | Empty ->
+ false
+ | Cons(k, d, rest) ->
+ equal k key || mem_in_bucket rest in
+ mem_in_bucket h.data.((hash key) mod (Array.length h.data))
+
+let iter f h =
+ let rec do_bucket = function
+ Empty ->
+ ()
+ | Cons(k, d, rest) ->
+ f k d; do_bucket rest in
+ let d = h.data in
+ for i = 0 to Array.length d - 1 do
+ do_bucket d.(i)
+ done
+
+let fold f h init =
+ let rec do_bucket b accu =
+ match b with
+ Empty ->
+ accu
+ | Cons(k, d, rest) ->
+ do_bucket rest (f k d accu) in
+ let d = h.data in
+ let accu = ref init in
+ for i = 0 to Array.length d - 1 do
+ accu := do_bucket d.(i) !accu
+ done;
+ !accu
+
+
end
-module HTagSet = Hashtbl.Make(HTagSetKey)
+
+
+
+
+
+
+
+
+
+
+
+
+type dispatch = { first : Tree.t -> Tree.t;
+ flabel : string;
+ next : Tree.t -> Tree.t -> Tree.t;
+ nlabel : string;
+ }
type t = {
id : int;
mutable states : Ptset.t;
mutable final : Ptset.t;
universal : Ptset.t;
(* 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*formula) HTagSet.t;
+}
module Pair (X : Set.OrderedType) (Y : Set.OrderedType) =
struct
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
| [] -> ()
Format.fprintf ppf "\n")l;
Format.fprintf ppf "NFA transitions :\n------------------------------\n";
- HTagSet.iter (fun (qs,t) (b,f,_,_) ->
+ HTagSet.iter (fun (qs,t) (disp,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
+ let (l,ll,_),(r,rr,_) = f.st in
pr_st ppf (Ptset.elements l);
Format.fprintf ppf ", ";
pr_st ppf (Ptset.elements ll);
pr_st ppf (Ptset.elements r);
Format.fprintf ppf ", ";
pr_st ppf (Ptset.elements rr);
- Format.fprintf ppf "\n";
+ Format.fprintf ppf ", first=%s, next=%s\n" disp.flabel disp.nlabel;
) a.sigma;
- Format.fprintf ppf "=======================================\n"
+ 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
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
+ | 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
| _ ->
try
HFEval.find hfeval (f.fid,s1,s2)
| `Right _ -> l1,p::l2
| _ -> l1,l2
+
+
+
+ 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 merge_trans t a tag q acc =
List.fold_left (fun (accf,accm,acchtrue) (ts,(m,f,pred)) ->
if TagSet.mem tag ts
(or_ tmpf accf,accm||m,acchtrue||hastrue)
else (accf,accm,acchtrue)
) 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
+ let dispatch,mark,f =
HTagSet.find a.sigma (r,tag)
- in f.st,f,mark,has_true,r
+ in f.st,dispatch,f,mark,r
with
- Not_found ->
- let f,mark,has_true,accq =
+ Not_found ->
+ let f,mark,_,accq =
Ptset.fold (fun q (accf,accm,acchtrue,accq) ->
let naccf,naccm,nacctrue =
merge_trans t a tag q (accf,accm,acchtrue )
)
r (false_,false,false,Ptset.empty)
in
- HTagSet.add a.sigma (accq,tag) (mark,f,([],[]),has_true);
- f.st,f,mark,has_true,accq
-
- 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 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 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
+ let (ls,lls,_),(rs,rrs,_) = f.st in
+ let tb,ta =
+ Tree.tags t tag
+ in
+ 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
- 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 h_time = Hashtbl.create 4096
- let calls = ref 0
-
- let rtime s f x =
-
- let cpt,atime =
- try
- Hashtbl.find h_time s
- with
- | _ -> (ref 0, ref 0.)
- 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
+ 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
- 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
-
+ 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}
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
+ HTagSet.add a.sigma (accq,tag) (dispatch,mark,f);
+ f.st,dispatch,f,mark,accq
- 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
+ let rec accepting_among a t orig ctx =
+ let rest = Ptset.inter orig a.universal in
+ let r = Ptset.diff orig rest in
+ if Ptset.is_empty r then rest,0,TS.empty else
+ if Tree.is_nil t
+ then orig,0,TS.empty
+ else
+ let ((_,_,llls),(_,_,rrrs)),dispatch,formula,mark,r' =
+ 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 rb,rb1,rb2 = eval_form_bool formula s1 s2 in
+ if rb
+ then
+ let n1,res1 = if rb1 then n1,res1 else 0,TS.empty
+ and n2,res2 = if rb2 then n2,res2 else 0,TS.empty
+ in
+ if mark
+ then r',1+n1+n2,TS.Cons(t,(TS.Concat(res1,res2)))
+ else r',n1+n2,TS.Concat(res1,res2)
+ else Ptset.empty,0,TS.empty
- let rec accepting_among_count a t r ctx =
- let orig = r in
- let rest = Ptset.inter r a.final in
- let r = Ptset.diff r rest in
+
+ let rec accepting_among_count a t orig ctx =
+ let rest = Ptset.inter orig a.universal in
+ let r = Ptset.diff orig rest in
if Ptset.is_empty r then rest,0 else
if Tree.is_node t
then
- 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
-
+ let ((_,_,llls),(_,_,rrrs)),dispatch,formula,mark,r' =
+ get_trans t a (Tree.tag t) r
in
- let s1,res1 = accepting_among_count a first (pt_cup ls lls) t
- and s2,res2 = accepting_among_count a next (pt_cup rs rrs) ctx
+ let s1,res1 = accepting_among_count a (dispatch.first t) llls t
+ and s2,res2 = accepting_among_count a (dispatch.next t ctx) rrrs ctx
in
let rb,rb1,rb2 = eval_form_bool formula s1 s2 in
- if rb
- then
- let res1 = if rb1 then res1 else 0
- and res2 = if rb2 then res2 else 0
- in r', res2 + (if mark then 1 + res1 else res1)
- else Ptset.empty,0
-
-
-
+ if rb
+ then
+ let res1 = if rb1 then res1 else 0
+ and res2 = if rb2 then res2 else 0
+ in r', if mark then 1+res1+res2 else res1+res2
+ else Ptset.empty,0
else orig,0
-
+
+ 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 run_count a t =
let st,res = accepting_among_count a t a.init t in
- if Ptset.is_empty (st) then 0 else res
+ if Ptset.is_empty (st) then 0 else res
+
+ let run_time _ _ = failwith "blah"
projects / SXSI / xpathcomp.git / blobdiff