(* 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
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
| Or of formula * formula
| And of formula * formula
- | Atom of ([ `Left | `Right ]*bool*state)
+ | Atom of ([ `Left | `Right | `LLeft | `RRight ]*bool*state)
and formula = { fid: int;
+ fkey : int;
pos : formula_expr;
neg : formula;
- st : 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 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*(vb b) +257) + (s lsl 13 - s)) (*land max_int *)
+
module FormNode =
struct
type t = formula
- let hash t = match t.pos with
- | False -> 0
- | True -> 1
- | And(f1,f2) -> (2+17*f1.fid + 37*f2.fid) land max_int
- | Or(f1,f2) -> (3+101*f1.fid + 253*f2.fid) land max_int
- | Atom(`Left,true,s) -> (5 + 11 * 23 * s) land max_int
- | Atom(`Right,true,s) -> (5 + 19 * 23 * s) land max_int
- | Atom(`Left,false,s) -> (5 + 11 * 39 * s) land max_int
- | Atom(`Right,false,s) -> (5 + 19 * 39 * s) land max_int
-
-
+
+ let hash t = t.fkey
let equal f1 f2 =
- if f1.fid == f2.fid || f1.pos == f2.pos then true
+ if f1.fid == f2.fid || f1.fkey == f2.fkey || f1.pos == f2.pos then true
else
match f1.pos,f2.pos with
| False,False | True,True -> true
- | Atom(d1,b1,s1), Atom(d2,b2,s2) when (b1==b2) && (s1=s2) && (d1 = d2) -> true
+ | Atom(d1,b1,s1), Atom(d2,b2,s2) when (b1==b2) && (s1==s2) && (d1 = d2) -> true
| Or(g1,g2),Or(h1,h2)
| And(g1,g2),And(h1,h2) -> g1.fid == h1.fid && g2.fid == h2.fid
| _ -> false
+
end
module WH = Weak.Make(FormNode)
let f_pool = WH.create 107
+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; neg = f ; st = Ptset.empty,Ptset.empty; size =1; }
- and f = { fid = 0; pos = False; neg = t; st = Ptset.empty,Ptset.empty; 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 cons pos neg s1 s2 size1 size2 =
let rec pnode =
{ fid = gen_id ();
+ fkey = hash_node_form pos;
pos = pos;
neg = nnode;
st = s1;
and nnode = {
fid = gen_id ();
pos = neg;
+ fkey = hash_node_form neg;
neg = pnode;
st = s2;
size = size2;
let atom_ d p s =
let si = Ptset.singleton s in
let ss = match d with
- | `Left -> si,Ptset.empty
- | `Right -> 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_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 =
- Ptset.union (fst f1.st) (fst f2.st),
- Ptset.union (snd f1.st) (snd f2.st)
+ union_hex f1.st f2.st
and sn =
- Ptset.union (fst f1.neg.st) (fst f2.neg.st),
- Ptset.union (snd f1.neg.st) (snd f2.neg.st)
+ union_hex f1.neg.st f2.neg.st
in
sp,sn
-
+
let full_or_ f1 f2 =
let f1,f2 = if f1.fid < f2.fid then f2,f1 else f1,f2 in
let sp,sn = merge_states f1 f2 in
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
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
| [] -> ()
(pr_frm ppf f2);
| Atom(dir,b,s) -> Format.fprintf ppf "%s%s[%i]"
(if b then "" else "¬")
- (if dir = `Left then "↓₁" else "↓₂") s
+ (match dir with
+ | `Left -> "↓₁"
+ | `Right -> "↓₂"
+ | `LLeft -> "⇓₁"
+ | `RRight -> "⇓₂") s
let dnf_hash = Hashtbl.create 17
let rec dnf_aux f = match f.pos with
| False -> PL.empty
| True -> PL.singleton (Ptset.empty,Ptset.empty)
- | Atom(`Left,_,s) -> PL.singleton (Ptset.singleton s,Ptset.empty)
- | Atom(`Right,_,s) -> PL.singleton (Ptset.empty,Ptset.singleton s)
+ | Atom((`Left|`LLeft),_,s) -> PL.singleton (Ptset.singleton s,Ptset.empty)
+ | Atom((`Right|`RRight),_,s) -> PL.singleton (Ptset.empty,Ptset.singleton s)
| Or(f1,f2) -> PL.union (dnf f1) (dnf f2)
| And(f1,f2) ->
- let pl1 = dnf f1
- and pl2 = dnf f2
- in
- PL.fold (fun (s1,s2) acc ->
- PL.fold ( fun (s1', s2') acc' ->
- (PL.add
- ((Ptset.union s1 s1'),
- (Ptset.union s2 s2')) acc') )
- pl2 acc )
- pl1 PL.empty
-
-
- and dnf f =
- try
+ let pl1 = dnf f1
+ and pl2 = dnf f2
+ in
+ PL.fold (fun (s1,s2) acc ->
+ PL.fold ( fun (s1', s2') acc' ->
+ (PL.add
+ ((Ptset.union s1 s1'),
+ (Ptset.union s2 s2')) acc') )
+ pl2 acc )
+ pl1 PL.empty
+
+ and dnf f =
+ try
Hashtbl.find dnf_hash f.fid
with
- Not_found ->
- let d = dnf_aux f in
- Hashtbl.add dnf_hash f.fid d;d
+ Not_found ->
+ let d = dnf_aux f in
+ Hashtbl.add dnf_hash f.fid d;d
- let can_top_down f =
+ let can_top_down f =
let nf = dnf f in
if (PL.cardinal nf > 3)then None
else match PL.elements nf with
- | [(s1,s2); (t1,t2); (u1,u2)] when
- Ptset.is_empty s1 && Ptset.is_empty s2 && Ptset.is_empty t1 && Ptset.is_empty u2
- -> Some(true,t2,u1)
- | [(t1,t2); (u1,u2)] when Ptset.is_empty t1 && Ptset.is_empty u2
- -> Some(false,t2,u1)
- | _ -> None
+ | [(s1,s2); (t1,t2); (u1,u2)] when
+ Ptset.is_empty s1 && Ptset.is_empty s2 && Ptset.is_empty t1 && Ptset.is_empty u2
+ -> Some(true,t2,u1)
+ | [(t1,t2); (u1,u2)] when Ptset.is_empty t1 && Ptset.is_empty u2
+ -> Some(false,t2,u1)
+ | _ -> None
let equal_form f1 f2 =
let s =
if TagSet.is_finite ts
- then "{" ^ (TagSet.fold (fun t a -> a ^ " " ^ (Tag.to_string t)) ts "") ^"}"
+ then "{" ^ (TagSet.fold (fun t a -> a ^ " '" ^ (Tag.to_string t)^"'") ts "") ^" }"
else let cts = TagSet.neg ts in
if TagSet.is_empty cts then "*" else
(TagSet.fold (fun t a -> a ^ " " ^ (Tag.to_string t)) cts "*\\{"
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,r = f.st in pr_st ppf (Ptset.elements l);
+(* 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);
- Format.fprintf ppf "\n";
- ) a.sigma;
- Format.fprintf ppf "=======================================\n"
+ pr_st ppf (Ptset.elements rs);
+ Format.fprintf ppf ", ";
+ 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
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 e t = concat t (cons e empty)
- 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
- end
- module TS2 =
- struct
- type t = string
- let empty = String.make 10_000_000 '0'
- let cons e t = t.[Tree.id e] <- '1';t
- let append = cons
- let concat s1 s2 = failwith "not implemented"
-
- let length t =
- let res = ref 0 in
- for i = 0 to 9_999_999 do
- if t.[i] == '1' then
- incr res
- done; !res
-
- let iter f t = failwith "not implemented"
- let to_list_rev t = failwith "not implemented"
- end
-
- module BottomUpNew = 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
-IFDEF DEBUG
-THEN
- type trace =
- | TNil of Ptset.t*Ptset.t
- | TNode of Ptset.t*Ptset.t*bool* (int*bool*formula) list
-
- let traces = Hashtbl.create 17
- let dump_trace t =
- let out = open_out "debug_trace.dot"
- in
- let outf = Format.formatter_of_out_channel out in
-
- let rec aux t num =
- if Tree.is_node t
- then
- match (try Hashtbl.find traces (Tree.id t) with Not_found -> TNil(Ptset.empty,Ptset.empty)) with
- | TNode(r,s,mark,trs) ->
- let numl = aux (Tree.left t) num in
- let numr = aux (Tree.right t) (numl+1) in
- let mynum = numr + 1 in
- Format.fprintf outf "n%i [ label=\"<%s>\\nr=" mynum (Tag.to_string (Tree.tag t));
- pr_st outf (Ptset.elements r);
- Format.fprintf outf "\\ns=";
- pr_st outf (Ptset.elements s);
- List.iter (fun (q,m,f) ->
- Format.fprintf outf "\\n%i %s" q (if m then "⇨" else "→");
- pr_frm outf f ) trs;
- Format.fprintf outf "\", %s shape=box ];\n"
- (if mark then "color=cyan1, style=filled," else "");
- let _ = Format.fprintf outf "n%i -> n%i;\n" mynum numl in
- let _ = Format.fprintf outf "n%i -> n%i;\n" mynum numr in
- mynum
- | TNil(r,s) -> Format.fprintf outf "n%i [ shape=box, label=\"Nil\\nr=" num;
- pr_st outf (Ptset.elements r);
- Format.fprintf outf "\\ns=";
- pr_st outf (Ptset.elements s);
- Format.fprintf outf "\"];\n";num
- else
- match Hashtbl.find traces (-10) with
- | TNil(r,s) ->
- Format.fprintf outf "n%i [ shape=box, label=\"Nil\\nr=" num;
- pr_st outf (Ptset.elements r);
- Format.fprintf outf "\\ns=";
- pr_st outf (Ptset.elements s);
- Format.fprintf outf "\"];\n";
- num
- | _ -> assert false
-
- in
- Format.fprintf outf "digraph G {\n";
- ignore(aux t 0);
- Format.fprintf outf "}\n%!";
- close_out out;
- ignore(Sys.command "dot -Tsvg debug_trace.dot > debug_trace.svg")
-END
-
-
-
- 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 miss = ref 0
- let call = ref 0
- let timeref = ref 0.0
- let timerefall = ref 0.0
- let time f x =
- incr call;
- let t1 = Unix.gettimeofday ()
- in let r = f x
- in
- timeref := !timeref +. ((Unix.gettimeofday()) -. t1);
- r
-
- let timeall f x =
- let t1 = Unix.gettimeofday ()
- in let r = f x
- in
- timerefall := !timerefall +. ((Unix.gettimeofday()) -. t1);
- r
-
-*)
-
let eval_form_bool f s1 s2 =
let rec eval f = match f.pos with
- | Atom(`Left,b,q) -> if b == (Ptset.mem q s1) then (true,true,false) else false,false,false
- | Atom(`Right,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
in eval f
- module HFEvalDir = Hashtbl.Make(
- struct
- type t = int*Ptset.t*[`Left | `Right ]
- let equal (a,b,c) (d,e,f) =
- a==d && (Ptset.equal b e) && (c = f)
- let hash_dir = function `Left -> 7919
- | `Right -> 3517
+ let h_formlist = HFormlist.create 511
- let hash (a,b,c) =
- a+17*(Ptset.hash b) + 31*(hash_dir c)
- end)
-
- let hfeval_dir = HFEvalDir.create 4097
+ 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 eval_dir dir f s =
- let rec eval f = match f.pos with
- | Atom(d,b,q) when d = dir -> if b == (Ptset.mem q s) then true_ else false_
- | Atom(_,b,q) -> f
- (* test some inlining *)
- | True -> true_
- | False -> false_
- | _ ->
- try
- HFEvalDir.find hfeval_dir (f.fid,s,dir)
+ 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 r =
- match f.pos with
- | Or(f1,f2) ->
- let f1 = eval f1
- in
- if is_true f1 then true_
- else if is_false f1 then eval f2
- else or_ f1 f2
- | And(f1,f2) ->
- let f1 = eval f1 in
- if is_false f1 then false_
- else if is_true f1 then eval f2
- else and_ f1 f2
- | _ -> assert false
+ 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
- HFEvalDir.add hfeval_dir (f.fid,s,dir) r;
- r
-
- in eval f
-
-
-
- let fstate_pool = Hashtbl.create 11
+ 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 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 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 acc_pred p l1 l2 = match p with
- | `Left _ -> p::l1,l2
- | `Right _ -> l1,p::l2
- | _ -> l1,l2
+ 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)
- ) acc (Hashtbl.find a.phi q)
+ 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
- HTagSet.add a.sigma (accq,tag) (mark,f,([],[]),has_true);
- f.st,f,mark,has_true,accq
-
-
- let check_pred l t = true (*l = [] ||
- List.exists (function p ->
- match p with
- `Left f | `Right f -> f t
- | _ -> assert false) l
- *)
-
-
- let rec accepting_among2 a t r acc =
- 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,acc else
- if (not (Tree.is_node t))
- then
- orig,acc
- else
- let t1 = Tree.first_child t
- and t2 = Tree.next_sibling t in
- let (r1,r2),formula,mark,has_true,r = get_trans t a (Tree.tag t) r
- in
- let s1,res1 = accepting_among2 a t1 r1 acc
+ 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 formula = eval_dir `Left formula s1 in
- if is_false formula then rest,acc
- else
- if is_true formula then (* tail call equivalent to a top down *)
- accepting_among2 a t2 orig (if mark then TS.append t res1 else res1)
- else
- let s2,res2 = accepting_among2 a t2 r2 res1
- in
- let formula = eval_dir `Right formula s2
- in
- if is_false formula then rest,res1
+ 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(*
+ 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
- orig,(if mark then TS.append t (res2)
- else res2)
-
-
- let rec accepting_among a t r =
- 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 (r1,r2),formula,mark,has_true,r = get_trans t a (Tree.tag t) r
- in
- let s1,res1 = accepting_among a (Tree.first_child t) r1
- and s2,res2 = accepting_among a (Tree.next_sibling t) r2
+ 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 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.cons t res1 else res1)
- else orig,TS.empty
- else orig,TS.empty
+ 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 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 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_count a t r =
- 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,0 else
- if Tree.is_node t
- then
- let (r1,r2),formula,mark,has_true,r = get_trans t a (Tree.tag t) r
- in
- let s1,res1 = accepting_count a (Tree.first_child t) r1
- and s2,res2 = accepting_count a (Tree.next_sibling t) r2
- 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, res1+res2+(if mark then 1 else 0)
- else orig,0
- else orig,0
+ 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 run a t =
-(* let _ =
- call := 0; miss:=0;
- timeref := 0.0;
- HFEval.clear hfeval;
- Hashtbl.clear dnf_hash;
- Hashtbl.clear fstate_pool;
- in *)
- let st,res = accepting_among a t a.init in
- let b = Ptset.is_empty (st) in
- if b then TS.empty
- else
- res
- let run_count a t =
-(* let _ =
- call := 0; miss:=0;
- timeref := 0.0;
- timerefall := 0.0;
- HFEval.clear hfeval;
- Hashtbl.clear dnf_hash;
- Hashtbl.clear fstate_pool;
- in *)
- let st,res = accepting_count a t a.init in
- let b = Ptset.is_empty (st) in
- if b then 0
- else
- res
- end
-
- module Jump = struct
- let eval_dir = BottomUpNew.eval_dir
- let xi1 = HTagSet.create 10
- let xi2 = HTagSet.create 10
-
- let rec accept_from orig a t r acc =
- if (Tree.is_root t) ||
- (Ptset.subset orig r)
- then
- acc
+ 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
- let is_left = Tree.is_left t in
- let tag = Tree.tag t in
- let nr,f, mark =
- try
- HTagSet.find (if is_left then xi1 else xi2)
- (r,tag)
- with
- | Not_found ->
- let trans =
- Hashtbl.fold
- (fun q l acc ->
- List.fold_left (fun ((racc,facc,macc) as acc) (ts,(m,f,_)) ->
- let rl,rr = f.st in
- if (TagSet.mem tag ts) &&
- (Ptset.intersect (if is_left then rl else rr) r)
- then (Ptset.add q racc,or_ f facc, macc||m)
- else acc) acc l)
- a.phi (Ptset.empty,false_,false)
+ 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)
+
- in
- HTagSet.add (if is_left then xi1 else xi2) (r,tag) trans;
- trans
- in
- let form = eval_dir (if is_left then `Left else `Right) f r
- in
- if is_true form then accept_from orig a (Tree.parent t) nr
- (if mark then TS.cons t acc else acc)
- else if is_false form then TS.empty
- else assert false
-
- let run a t r =
- HTagSet.clear xi1;
- HTagSet.clear xi2;
- let orig =
- List.fold_left (fun s (_,(_,f,_)) ->
- Ptset.union s (fst f.st))
- Ptset.empty (Hashtbl.find a.phi (Ptset.choose a.init))
+ let run_count a t =
+
+ 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
- accept_from orig a t r TS.empty
-
+ if Ptset.is_empty (st) then 0 else res
+
+
+ let run_time _ _ = failwith "blah"
+
+
+
+(*
end
+*)
projects / SXSI / xpathcomp.git / blobdiff