X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.ml;h=bb38863bad0285e25b696f1dfe85528557bf2854;hb=497ac3f74338faede9a844f5940857f55c0e9b64;hp=425fad65b6318349171b2948f549b065cc9fcf42;hpb=6131f2f9e380543197c9fa253325bbc84749e6e8;p=SXSI%2Fxpathcomp.git diff --git a/ata.ml b/ata.ml index 425fad6..bb38863 100644 --- a/ata.ml +++ b/ata.ml @@ -1,63 +1,29 @@ -(* Todo refactor and remove this alias *) INCLUDE "debug.ml" +INCLUDE "utils.ml" + +type jump_kind = [ `TAG of Tag.t | `CONTAINS of string | `NOTHING ] +let cpt_trans = ref 0 +let miss_trans = ref 0 +let cpt_eval = ref 0 +let miss_eval = ref 0 + 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 +let pt_cup s1 s2 = + (* special case, since this is a union we want hash(s1,s2) = hash(s2,s1) *) + let x = Ptset.hash s1 + and y = Ptset.hash s2 in + let h = if x < y then HASHINT2(x,y) else HASHINT2(y,x) in try Hashtbl.find h_union h with - | Not_found -> let s = Ptset.union s1 s2 - in - Hashtbl.add h_union h s;s - + | Not_found -> let s = Ptset.union s1 s2 + in + Hashtbl.add h_union h s;s module State = struct @@ -92,7 +58,8 @@ let hash_node_form t = match t with | 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 *) + | Atom(v,b,s) -> HASHINT3(hash_const_variant v,(3846*(vb b) +257),s) + module FormNode = @@ -206,9 +173,9 @@ let and_ f1 f2 = let not_ f = f.neg -let k_hash (s,t) = ((Ptset.hash s)) lsl 31 lxor (Tag.hash t) +let k_hash (s,t) = HASHINT2(Ptset.hash s,Tag.hash t) -module HTagSetKey = +module HTagSetKey = struct type t = Ptset.t*Tag.t let equal (s1,s2) (t1,t2) = (s2 == t2) && Ptset.equal s1 t1 @@ -217,25 +184,16 @@ 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 +type skiplist = Nothing | All + | Zero of skiplist + | One of skiplist | Two of skiplist | Three of skiplist + | Four of skiplist | Five of skiplist | Six of skiplist + | Seven of skiplist | Eight of skiplist | Nine of skiplist -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 formlist = Nil | Cons of state*formula*int*bool*formlist -type t = { +type 'a t = { id : int; mutable states : Ptset.t; init : Ptset.t; @@ -244,9 +202,9 @@ type t = { starstate : Ptset.t option; (* Transitions of the Alternating automaton *) phi : (state,(TagSet.t*(bool*formula*bool)) list) Hashtbl.t; - sigma : (dispatch*bool*formlist*Ptset.t*Ptset.t) HTagSet.t; + sigma : (int,('a t -> Tree.t -> Tree.t -> Ptset.t*'a)) Hashtbl.t; } - + module Pair (X : Set.OrderedType) (Y : Set.OrderedType) = struct type t = X.t*Y.t @@ -289,50 +247,6 @@ type t = { | `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|`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 - Hashtbl.find dnf_hash f.fid - with - Not_found -> - let d = dnf_aux f in - Hashtbl.add dnf_hash f.fid d;d - - - 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 - - - let equal_form f1 f2 = - (f1.fid == f2.fid) || (FormNode.equal f1 f2) || (PL.equal (dnf f1) (dnf f2)) - let dump ppf a = Format.fprintf ppf "Automaton (%i) :\n" a.id; Format.fprintf ppf "States : "; pr_st ppf (Ptset.elements a.states); @@ -400,7 +314,7 @@ type t = { type transition = Transitions.t let equal_trans (q1,t1,m1,f1,_) (q2,t2,m2,f2,_) = - (q1 == q2) && (TagSet.equal t1 t2) && (m1 == m2) && (equal_form f1 f2) + (q1 == q2) && (TagSet.equal t1 t2) && (m1 == m2) (*&& (equal_form f1 f2) *) module HFEval = Hashtbl.Make( @@ -409,12 +323,13 @@ type 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) + HASHINT3(a,Ptset.hash b,Ptset.hash c) end) - let hfeval = HFEval.create 4097 - + + + let hfeval = HFEval.create 4097 let eval_form_bool f s1 s2 = let rec eval f = match f.pos with (* test some inlining *) @@ -459,35 +374,42 @@ type t = { in eval f - 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 + | Cons(s,frm,h,m,fll) -> loop (f acc s frm h m) fll in loop acc fl - - let rec eval_formlist s1 s2 = function - | Nil -> Ptset.empty,false,false,false - | Cons(q,f,h,fl) -> - let k = (h,s1,s2) + let h_formlist = Hashtbl.create 4096 + let rec eval_formlist ?(memo=true) s1 s2 fl = + match fl with + | Nil -> Ptset.empty,false,false,false,false + | Cons(q,f,h,mark,fll) -> + let k = (h,Ptset.hash s1,Ptset.hash s2,mark) in - try HFormlist.find h_formlist k + + try + if memo then Hashtbl.find h_formlist k + else (raise Not_found) 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 - - - - + Not_found -> + let s,b',b1',b2',amark = eval_formlist (~memo:memo) s1 s2 fll in + let b,b1,b2 = eval_form_bool f s1 s2 in + let r = if b then (Ptset.add q s, b, b1'||b1,b2'||b2,mark||amark) + else s,b',b1',b2',amark + in(* + Format.fprintf Format.err_formatter "\nEvaluating formula (%i) %i %s" h q (if mark then "=>" else "->"); + pr_frm (Format.err_formatter) f; + Format.fprintf Format.err_formatter " in context "; + pr_st Format.err_formatter (Ptset.elements s1); + Format.fprintf Format.err_formatter ", "; + pr_st Format.err_formatter (Ptset.elements s2); + Format.fprintf Format.err_formatter " result is %b\n%!" b; *) + (Hashtbl.add h_formlist k r;r) + + let tags_of_state a q = Hashtbl.fold (fun p l acc -> @@ -506,217 +428,595 @@ type t = { 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,acchash) (ts,(m,f,pred)) -> - if TagSet.mem tag ts - then - 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) + | `Negative s -> let r = Ptset.diff a s in (r, Ptset.mem Tag.pcdata r, 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 - HTagSet.find a.sigma (r,tag) - with - 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,acchash,Ptset.add q accq) - ) - 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 - 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 set_get_tag r t = r := (fun _ -> t) + + module type ResultSet = + sig + type t + val empty : t + val cons : Tree.t -> t -> t + val concat : t -> t -> t + val iter : (Tree.t -> unit) -> t -> unit + val fold : (Tree.t -> 'a -> 'a) -> t -> 'a -> 'a + val map : (Tree.t -> Tree.t) -> t -> t + val length : t -> int + end + + module Integer : ResultSet = + struct + type t = int + let empty = 0 + let cons _ x = x+1 + let concat x y = x + y + let iter _ _ = failwith "iter not implemented" + let fold _ _ _ = failwith "fold not implemented" + let map _ _ = failwith "map not implemented" + let length x = x + end + + module IdSet : ResultSet = + struct + type node = Nil + | Cons of Tree.t * node + | Concat of node*node + + and t = { node : node; + length : int } + + let empty = { node = Nil; length = 0 } - - 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 + let cons e t = { node = Cons(e,t.node); length = t.length+1 } + let concat t1 t2 = { node = Concat(t1.node,t2.node); length = t1.length+t2.length } + let append e t = { node = Concat(t.node,Cons(e,Nil)); length = t.length+1 } + + let fold f l acc = + let rec loop acc t = match t with + | Nil -> acc + | Cons (e,t) -> loop (f e acc) t + | Concat (t1,t2) -> loop (loop acc t1) t2 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_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 + loop acc l.node + + let length l = l.length + + + let iter f l = + let rec loop = function + | Nil -> () + | Cons (e,t) -> f e; loop t + | Concat(t1,t2) -> loop t1;loop t2 + in loop l.node + + let map f l = + let rec loop = function + | Nil -> Nil + | Cons(e,t) -> Cons(f e, loop t) + | Concat(t1,t2) -> Concat(loop t1,loop t2) + in + { l with node = loop l.node } + + + end + + module Run (RS : ResultSet) = + struct + let fmt = Format.err_formatter + let pr x = Format.fprintf fmt x + module Formlist = + struct + type t = formlist + let nil : t = Nil + let cons q f i m l = Cons(q,f,i,m,l) + let hash = function Nil -> 0 | Cons(_,_,i,_,_) -> max_int land i + let pr fmt l = + let rec loop = function + | Nil -> () + | Cons(q,f,_,m,l) -> + Format.fprintf fmt "%i %s" q (if m then "=>" else "->"); + pr_frm fmt f; + Format.fprintf fmt "\n%!"; + loop l in - let r',rb,rb1,rb2 = eval_formlist s1 s2 flist - in - r',(vb rb)*((vb mark) + (vb rb1)*res1 + (vb rb2)*res2) + loop l + end + + type ptset_list = Nil | Cons of Ptset.t*int*ptset_list + let hpl l = match l with + | Nil -> 0 + | Cons (_,i,_) -> i + let cons s l = Cons (s,(Ptset.hash s) + 65599 * (hpl l), l) + + let rec empty_size n = + if n == 0 then Nil + else cons Ptset.empty (empty_size (n-1)) + + let fold_pl f l acc = + let rec loop l acc = match l with + Nil -> acc + | Cons(s,h,pl) -> loop pl (f s h acc) + in + loop l acc + let map_pl f l = + let rec loop = + function Nil -> Nil + | Cons(s,h,ll) -> cons (f s) (loop ll) + in loop l + let iter_pl f l = + let rec loop = + function Nil -> () + | Cons(s,h,ll) -> (f s);(loop ll) + in loop l + + let rev_pl l = + let rec loop acc l = match l with + | Nil -> acc + | Cons(s,_,ll) -> loop (cons s acc) ll + in + loop Nil l + let rev_map_pl f l = + let rec loop acc l = + match l with + | Nil -> acc + | Cons(s,_,ll) -> loop (cons (f s) acc) ll + in + loop Nil l - 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 td_trans = Hashtbl.create 4096 - 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 + + let choose_jump tagset qtags1 qtagsn a f_nil f_text f_t1 f_s1 f_tn f_sn f_notext = + let tags1,hastext1,fin1 = inter_text tagset (tags a qtags1) in + let tagsn,hastextn,finn = inter_text tagset (tags a qtagsn) in +(* Format.fprintf Format.err_formatter "Tags below states "; + pr_st Format.err_formatter (Ptset.elements qtags1); + Format.fprintf Format.err_formatter " are { "; + Ptset.iter (fun t -> Format.fprintf Format.err_formatter "%s " (Tag.to_string t)) tags1; + Format.fprintf Format.err_formatter "}, %b,%b\n%!" hastext1 fin1; + + Format.fprintf Format.err_formatter "Tags below states "; + pr_st Format.err_formatter (Ptset.elements qtagsn); + Format.fprintf Format.err_formatter " are { "; + Ptset.iter (fun t -> Format.fprintf Format.err_formatter "%s " (Tag.to_string t)) tagsn; + Format.fprintf Format.err_formatter "}, %b,%b\n%!" hastextn finn; +*) + if (hastext1||hastextn) then f_text (* jumping to text nodes doesn't work really well *) + else if (Ptset.is_empty tags1) && (Ptset.is_empty tagsn) then f_nil + else if (Ptset.is_empty tagsn) then + if (Ptset.is_singleton tags1) then f_t1 (Ptset.choose tags1) (* TaggedChild/Sibling *) + else f_s1 tags1 (* SelectChild/Sibling *) + else if (Ptset.is_empty tags1) then + if (Ptset.is_singleton tagsn) then f_tn (Ptset.choose tagsn) (* TaggedDesc/Following *) + else f_sn tagsn (* SelectDesc/Following *) + else f_notext + + let choose_jump_down a b c d = + choose_jump a b c d + (Tree.mk_nil) + (Tree.text_below) + (*fun x -> let i,j = Tree.doc_ids x in + let res = Tree.text_below x in + Printf.printf "Calling text_below %s (tag=%s), docids= (%i,%i), res=%s\n" + (Tree.dump_node x) (Tag.to_string (Tree.tag x)) i j (Tree.dump_node res); + res*) + (fun _ -> Tree.node_child ) (* !! no tagged_child in Tree.ml *) + (fun _ -> Tree.node_child ) (* !! no select_child in Tree.ml *) + (Tree.tagged_desc) + (fun _ -> Tree.node_child ) (* !! no select_desc *) + (Tree.node_child) + + let choose_jump_next a b c d = + choose_jump a b c d + (fun t _ -> Tree.mk_nil t) + (Tree.text_next) + (*fun x y -> let i,j = Tree.doc_ids x in + let res = Tree.text_next x y in + Printf.printf "Calling text_next %s (tag=%s) ctx=%s, docids= (%i,%i), res=%s\n" + (Tree.dump_node x) (Tag.to_string (Tree.tag x)) (Tree.dump_node y) i j (Tree.dump_node res); + res*) + + (fun _ -> Tree.node_sibling_ctx) (* !! no tagged_sibling in Tree.ml *) + (fun _ -> Tree.node_sibling_ctx) (* !! no select_child in Tree.ml *) + (Tree.tagged_foll_below) + (fun _ -> Tree.node_sibling_ctx) (* !! no select_foll *) + (Tree.node_sibling_ctx) + + + let get_trans slist tag a t = + try + Hashtbl.find td_trans (tag,hpl slist) + with + | Not_found -> + let fl_list,llist,rlist,ca,da,sa,fa = + fold_pl + (fun set _ (fll_acc,lllacc,rllacc,ca,da,sa,fa) -> (* For each set *) + let fl,ll,rr,ca,da,sa,fa = + Ptset.fold + (fun q acc -> + fst ( + List.fold_left + (fun (((fl_acc,ll_acc,rl_acc,c_acc,d_acc,s_acc,f_acc),h_acc) as acc) + (ts,(m,f,_)) -> + if (TagSet.mem tag ts) + then + let (child,desc,below),(sibl,foll,after) = f.st in + let h_acc = HASHINT3(h_acc,f.fid,HASHINT2(q,vb m)) in + ((Formlist.cons q f h_acc m fl_acc, + Ptset.union ll_acc below, + Ptset.union rl_acc after, + Ptset.union child c_acc, + Ptset.union desc d_acc, + Ptset.union sibl s_acc, + Ptset.union foll f_acc), + h_acc) + else acc ) (acc,0) ( + try Hashtbl.find a.phi q + with + Not_found -> Printf.eprintf "Looking for state %i, doesn't exist!!!\n%!" + q;[] + )) + + ) set (Formlist.nil,Ptset.empty,Ptset.empty,ca,da,sa,fa) + in fl::fll_acc, cons ll lllacc, cons rr rllacc,ca,da,sa,fa) + slist ([],Nil,Nil,Ptset.empty,Ptset.empty,Ptset.empty,Ptset.empty) + in + (* Logic to chose the first and next function *) + let tags_below,tags_after = Tree.tags t tag in + let first = choose_jump_down tags_below ca da a + and next = choose_jump_next tags_after sa fa a in + let v = (fl_list,llist,rlist,first,next) in + Hashtbl.add td_trans (tag, hpl slist) v; v + + let merge rb rb1 rb2 mark t res1 res2 = + if rb + then + let res1 = if rb1 then res1 else RS.empty + and res2 = if rb2 then res2 else RS.empty 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 + if mark then RS.cons t (RS.concat res1 res2) + else RS.concat res1 res2 + else RS.empty + + let top_down ?(noright=false) a t slist ctx slot_size = + let pempty = empty_size slot_size in + let eval_fold2_slist fll sl1 sl2 res1 res2 t = + let res = Array.copy res1 in + let rec fold l1 l2 fll i aq = match l1,l2,fll with + | Cons(s1,_,ll1), Cons(s2, _ ,ll2),fl::fll -> + let r',rb,rb1,rb2,mark = eval_formlist s1 s2 fl in +(* let _ = pr "Evaluation context : "; pr_st fmt (Ptset.elements s1); + pr_st fmt (Ptset.elements s2); + pr "Formlist (%i) : " (Formlist.hash fl); + Formlist.pr fmt fl; + pr "Results : "; pr_st fmt (Ptset.elements r'); + pr ", %b %b %b %b\n%!" rb rb1 rb2 mark + in *) + let _ = res.(i) <- merge rb rb1 rb2 mark t res1.(i) res2.(i) + in + fold ll1 ll2 fll (i+1) (cons r' aq) + | Nil, Nil,[] -> aq,res + | _ -> assert false 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_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 - if Ptset.is_empty (st) then 0 else res + fold sl1 sl2 fll 0 Nil + in + let null_result() = (pempty,Array.make slot_size RS.empty) in + let rec loop t slist ctx = + let (a,b) = + if Tree.is_nil t then null_result() + else + let tag = Tree.tag t in + let fl_list,llist,rlist,first,next = get_trans slist tag a t in +(* let _ = pr "For tag %s,node %s, returning formulae list: \n%!" + (Tag.to_string tag) (Tree.dump_node t); + List.iter (fun f -> Formlist.pr fmt f;pr "\n%!") fl_list + in*) + let sl1,res1 = loop (first t) llist t in + let sl2,res2 = loop (next t ctx) rlist ctx in + eval_fold2_slist fl_list sl1 sl2 res1 res2 t + in +(* let _ = pr "Inside topdown call: tree was %s, tag = %s" (Tree.dump_node t) (if Tree.is_nil t then "###" + else Tag.to_string (Tree.tag t)); + iter_pl (fun s -> (pr_st fmt (Ptset.elements s))) a; + Array.iter (fun i -> pr "%i" (RS.length i)) b; + pr "\n%!"; in*) (a,b) + + in + let loop_no_right t slist ctx = + if Tree.is_nil t then null_result() + else + let tag = Tree.tag t in + let fl_list,llist,rlist,first,next = get_trans slist tag a t in + let sl1,res1 = loop (first t) llist t in + let sl2,res2 = null_result() in + eval_fold2_slist fl_list sl1 sl2 res1 res2 t + in + (if noright then loop_no_right else loop) t slist ctx + + let run_top_down a t = + let init = cons a.init Nil in + let _,res = top_down a t init t 1 + in res.(0) + ;; + + module Configuration = + struct + module Ptss = Set.Make(Ptset) + module IMap = Map.Make(Ptset) + type t = { hash : int; + sets : Ptss.t; + results : RS.t IMap.t } + let empty = { hash = 0; + sets = Ptss.empty; + results = IMap.empty; + } + let is_empty c = Ptss.is_empty c.sets + let add c s r = + if Ptss.mem s c.sets then + { c with results = IMap.add s (RS.concat r (IMap.find s c.results)) c.results} + else + { hash = HASHINT2(c.hash,Ptset.hash s); + sets = Ptss.add s c.sets; + results = IMap.add s r c.results + } - - let run_time _ _ = failwith "blah" + let pr fmt c = Format.fprintf fmt "{"; + Ptss.iter (fun s -> pr_st fmt (Ptset.elements s); + Format.fprintf fmt " ") c.sets; + Format.fprintf fmt "}\n%!"; + IMap.iter (fun k d -> + pr_st fmt (Ptset.elements k); + Format.fprintf fmt "-> %i\n" (RS.length d)) c.results; + Format.fprintf fmt "\n%!" + + let merge c1 c2 = + let acc1 = IMap.fold (fun s r acc -> + IMap.add s + (try + RS.concat r (IMap.find s acc) + with + | Not_found -> r) acc) c1.results IMap.empty + in + let imap = + IMap.fold (fun s r acc -> + IMap.add s + (try + RS.concat r (IMap.find s acc) + with + | Not_found -> r) acc) c2.results acc1 + in + let h,s = + Ptss.fold + (fun s (ah,ass) -> (HASHINT2(ah,Ptset.hash s), + Ptss.add s ass)) + (Ptss.union c1.sets c2.sets) (0,Ptss.empty) + in + { hash = h; + sets =s; + results = imap } + + end + + let h_fold = Hashtbl.create 511 + + let fold_f_conf t slist fl_list conf dir= + let rec loop sl fl acc = + match sl,fl with + |Nil,[] -> acc + | Cons(s,hs,sll), formlist::fll -> + let r',rb,rb1,rb2,mark = + try + Hashtbl.find h_fold (hs,Formlist.hash formlist,dir) + with + Not_found -> let res = + if dir then eval_formlist ~memo:false s Ptset.empty formlist + else eval_formlist ~memo:false Ptset.empty s formlist + in (Hashtbl.add h_fold (hs,Formlist.hash formlist,dir) res;res) + in(* + let _ = pr "Evaluating on set (%s) with tree %s=%s" + (if dir then "left" else "right") + (Tag.to_string (Tree.tag t)) + (Tree.dump_node t) ; + pr_st fmt (Ptset.elements s); + pr ", formualae (with hash %i): \n" (Formlist.hash formlist); + Formlist.pr fmt formlist; + pr "result is "; + pr_st fmt (Ptset.elements r'); + pr " %b %b %b %b \n%!" rb rb1 rb2 mark ; + in *) + if rb && ((dir&&rb1)|| ((not dir) && rb2)) + then + let acc = + let old_r = + try Configuration.IMap.find s conf.Configuration.results + with Not_found -> RS.empty + in + Configuration.add acc r' (if mark then RS.cons t old_r else old_r) + in + loop sll fll acc + else loop sll fll acc + | _ -> assert false + in + loop slist fl_list Configuration.empty + + let h_trans = Hashtbl.create 4096 + + let get_up_trans slist ptag a tree = + let key = (HASHINT2(hpl slist,Tag.hash ptag)) in + try + Hashtbl.find h_trans key + with + | Not_found -> + let f_list,_ = + Hashtbl.fold (fun q l acc -> + List.fold_left (fun (fl_acc,h_acc) (ts,(m,f,_)) -> + if TagSet.mem ptag ts + then + let h_acc = HASHINT3(h_acc,f.fid,HASHINT2(q,vb m)) in + (Formlist.cons q f h_acc m fl_acc, + h_acc) + else (fl_acc,h_acc)) + acc l) + a.phi (Formlist.nil,0) + in + let res = fold_pl (fun _ _ acc -> f_list::acc) slist [] + in + (Hashtbl.add h_trans key res;res) + + + let h_tdconf = Hashtbl.create 511 + let rec bottom_up a tree conf next jump_fun root dotd init accu = + if (not dotd) && (Configuration.is_empty conf ) then +(* let _ = pr "Returning early from %s, with accu %i, next is %s\n%!" + (Tree.dump_node tree) (Obj.magic accu) (Tree.dump_node next) + in *) + accu,conf,next + else +(* let _ = + pr "Going bottom up for tree with tag %s configuration is" + (if Tree.is_nil tree then "###" else Tag.to_string (Tree.tag tree)); + Configuration.pr fmt conf + in *) + let below_right = Tree.is_below_right tree next in + (* let _ = Format.fprintf Format.err_formatter "below_right %s %s = %b\n%!" + (Tree.dump_node tree) (Tree.dump_node next) below_right + in *) + let accu,rightconf,next_of_next = + if below_right then (* jump to the next *) +(* let _ = pr "Jumping to %s tag %s\n%!" (Tree.dump_node next) (Tag.to_string (Tree.tag next)) in *) + bottom_up a next conf (jump_fun next) jump_fun (Tree.next_sibling tree) true init accu + else accu,Configuration.empty,next + in +(* let _ = if below_right then pr "Returning from jump to next = %s\n" (Tree.dump_node next)in *) + let sub = + if dotd then + if below_right then (* only recurse on the left subtree *) +(* let _ = pr "Topdown on left subtree\n%!" in *) + prepare_topdown a tree true + else +(* let _ = pr "Topdown on whole tree\n%!" in *) + prepare_topdown a tree false + else conf + in + let conf,next = + (Configuration.merge rightconf sub, next_of_next) + in + if Tree.equal tree root then +(* let _ = pr "Stopping at root, configuration after topdown is:" ; + Configuration.pr fmt conf; + pr "\n%!" + in *) accu,conf,next + else + let parent = Tree.binary_parent tree in + let ptag = Tree.tag parent in + let dir = Tree.is_left tree in + let slist = Configuration.Ptss.fold (fun e a -> cons e a) conf.Configuration.sets Nil in + let fl_list = get_up_trans slist ptag a parent in + let slist = rev_pl (slist) in +(* let _ = pr "Current conf is : %s " (Tree.dump_node tree); + Configuration.pr fmt conf; + pr "\n" + in *) + let newconf = fold_f_conf parent slist fl_list conf dir in +(* let _ = pr "New conf before pruning is (dir=%b):" dir; + Configuration.pr fmt newconf ; + pr "accu is %i\n" (RS.length accu); + in *) + let accu,newconf = Configuration.IMap.fold (fun s res (ar,nc) -> + if Ptset.intersect s init then + ( RS.concat res ar ,nc) + else (ar,Configuration.add nc s res)) + (newconf.Configuration.results) (accu,Configuration.empty) + in +(* let _ = pr "New conf after pruning is (dir=%b):" dir; + Configuration.pr fmt newconf ; + pr "accu is %i\n" (RS.length accu); + in *) + bottom_up a parent newconf next jump_fun root false init accu + + and prepare_topdown a t noright = + let tag = Tree.tag t in +(* pr "Going top down on tree with tag %s = %s " + (if Tree.is_nil t then "###" else (Tag.to_string(Tree.tag t))) (Tree.dump_node t); *) + let r = + try + Hashtbl.find h_tdconf tag + with + | Not_found -> + let res = Hashtbl.fold (fun q l acc -> + if List.exists (fun (ts,_) -> TagSet.mem tag ts) l + then Ptset.add q acc + else acc) a.phi Ptset.empty + in Hashtbl.add h_tdconf tag res;res + in +(* let _ = pr ", among "; + pr_st fmt (Ptset.elements r); + pr "\n%!"; + in *) + let r = cons r Nil in + let set,res = top_down (~noright:noright) a t r t 1 in + let set = match set with + | Cons(x,_,Nil) ->x + | _ -> assert false + in +(* pr "Result of topdown run is %!"; + pr_st fmt (Ptset.elements set); + pr ", number is %i\n%!" (RS.length res.(0)); *) + Configuration.add Configuration.empty set res.(0) + + + + let run_bottom_up a t k = + let trlist = Hashtbl.find a.phi (Ptset.choose a.init) + in + let init = List.fold_left + (fun acc (_,(_,f,_)) -> + Ptset.union acc (let (_,_,l) = fst (f.st) in l)) + Ptset.empty trlist + in + let tree1,jump_fun = + match k with + | `TAG (tag) -> + (*Tree.tagged_lowest t tag, fun tree -> Tree.tagged_next tree tag*) + (Tree.tagged_desc tag t, fun tree -> Tree.tagged_foll_below tag tree t) + | `CONTAINS(_) -> (Tree.text_below t,fun tree -> Tree.text_next tree t) + | _ -> assert false + in + let tree2 = jump_fun tree1 in + let rec loop tree next acc = +(* let _ = pr "\n_________________________\nNew iteration\n" in + let _ = pr "Jumping to %s\n%!" (Tree.dump_node tree) in *) + let acc,conf,next_of_next = bottom_up a tree + Configuration.empty next jump_fun (Tree.root tree) true init acc + in + (* let _ = pr "End of first iteration, conf is:\n%!"; + Configuration.pr fmt conf + in *) + let acc = Configuration.IMap.fold + ( fun s res acc -> if Ptset.intersect init s + then RS.concat res acc else acc) conf.Configuration.results acc + in + if Tree.is_nil next_of_next (*|| Tree.equal next next_of_next *)then + acc + else loop next_of_next (jump_fun next_of_next) acc + in + loop tree1 tree2 RS.empty + end + + let top_down_count a t = let module RI = Run(Integer) in Integer.length (RI.run_top_down a t) + let top_down a t = let module RI = Run(IdSet) in (RI.run_top_down a t) + let bottom_up_count a t k = let module RI = Run(Integer) in Integer.length (RI.run_bottom_up a t k) -(* - end -*)