X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fauto%2Fata.ml;h=ba2f55f9056136a8c1839dfc50fa177d633c8b4b;hp=90168b20fca8a01b1345fcc2b29c944c5c38356e;hb=aace0fdd9c24437ad8ecb03a0cc4e70db45b6fc9;hpb=35c32fbd2543a399cc6939f21317bebf37172646 diff --git a/src/auto/ata.ml b/src/auto/ata.ml index 90168b2..ba2f55f 100644 --- a/src/auto/ata.ml +++ b/src/auto/ata.ml @@ -14,7 +14,7 @@ (***********************************************************************) (* - Time-stamp: + Time-stamp: *) INCLUDE "utils.ml" @@ -28,7 +28,7 @@ type predicate = | First_child | Stay | Is_first_child | Is_next_sibling - | Is_attribute + | Is of (Tree.Common.NodeKind.t) | Has_first_child | Has_next_sibling @@ -63,7 +63,7 @@ struct | Stay -> fprintf ppf "%s(%a)" Pretty.epsilon State.print q | Is_first_child -> fprintf ppf "FC%s?" Pretty.inverse | Is_next_sibling -> fprintf ppf "NS%s?" Pretty.inverse - | Is_attribute -> fprintf ppf "@?" + | Is k -> fprintf ppf "is-%a?" Tree.Common.NodeKind.print k | Has_first_child -> fprintf ppf "FC?" | Has_next_sibling -> fprintf ppf "NS?" @@ -77,7 +77,9 @@ end module SFormula = struct include Formula.Make(Atom) + open Tree.Common.NodeKind let mk_atom a b c = atom_ (Atom.make (a,b,c)) + let mk_kind k = mk_atom (Is k) true State.dummy let has_first_child = (mk_atom Has_first_child true State.dummy) @@ -91,7 +93,16 @@ struct (mk_atom Is_next_sibling true State.dummy) let is_attribute = - (mk_atom Is_attribute true State.dummy) + (mk_atom (Is Attribute) true State.dummy) + + let is_element = + (mk_atom (Is Element) true State.dummy) + + let is_processing_instruction = + (mk_atom (Is ProcessingInstruction) true State.dummy) + + let is_comment = + (mk_atom (Is Comment) true State.dummy) let first_child q = and_ @@ -112,34 +123,183 @@ struct and_ (mk_atom Previous_sibling true q) is_next_sibling + let stay q = (mk_atom Stay true q) + + let get_states phi = + fold (fun phi acc -> + match expr phi with + | Formula.Atom a -> let _, _, q = Atom.node a in + if q != State.dummy then StateSet.add q acc else acc + | _ -> acc + ) phi StateSet.empty + end + +module Transition = Hcons.Make (struct + type t = State.t * QNameSet.t * SFormula.t + let equal (a, b, c) (d, e, f) = + a == d && b == e && c == f + let hash (a, b, c) = + HASHINT4 (PRIME1, a, ((QNameSet.uid b) :> int), ((SFormula.uid c) :> int)) +end) + + +module TransList : sig + include Hlist.S with type elt = Transition.t + val print : Format.formatter -> ?sep:string -> t -> unit +end = + struct + include Hlist.Make(Transition) + let print ppf ?(sep="\n") l = + iter (fun t -> + let q, lab, f = Transition.node t in + fprintf ppf "%a, %a -> %a%s" State.print q QNameSet.print lab SFormula.print f sep) l + end + + type t = { id : Uid.t; mutable states : StateSet.t; mutable selection_states: StateSet.t; transitions: (State.t, (QNameSet.t*SFormula.t) list) Hashtbl.t; + mutable cache2 : TransList.t Cache.N2.t; + mutable cache6 : (TransList.t*StateSet.t) Cache.N6.t; } let next = Uid.make_maker () -let create () = { id = next (); - states = StateSet.empty; - selection_states = StateSet.empty; - transitions = Hashtbl.create 17; - } +let dummy2 = TransList.cons + (Transition.make (State.dummy,QNameSet.empty, SFormula.false_)) + TransList.nil +let dummy6 = (dummy2, StateSet.empty) -let get_trans a states tag = + +let create s ss = + let auto = { id = next (); + states = s; + selection_states = ss; + transitions = Hashtbl.create 17; + cache2 = Cache.N2.create dummy2; + cache6 = Cache.N6.create dummy6; + } + in + at_exit (fun () -> + let n6 = ref 0 in + let n2 = ref 0 in + Cache.N2.iteri (fun _ _ _ b -> if b then incr n2) auto.cache2; + Cache.N6.iteri (fun _ _ _ _ _ _ _ b -> if b then incr n6) auto.cache6; + Format.eprintf "INFO: automaton %i, cache2: %i entries, cache6: %i entries\n%!" + (auto.id :> int) !n2 !n6 + ); + auto + +let reset a = + a.cache2 <- Cache.N2.create dummy2; + a.cache6 <- Cache.N6.create dummy6 + + +let get_trans_aux a tag states = StateSet.fold (fun q acc0 -> try let trs = Hashtbl.find a.transitions q in List.fold_left (fun acc1 (labs, phi) -> - if QNameSet.mem tag labs then (q,phi)::acc1 else acc1) acc0 trs + if QNameSet.mem tag labs then TransList.cons (Transition.make (q, labs, phi)) acc1 else acc1) acc0 trs with Not_found -> acc0 - ) states [] + ) states TransList.nil + + +let get_trans a tag states = + let trs = + Cache.N2.find a.cache2 + (tag.QName.id :> int) (states.StateSet.id :> int) + in + if trs == dummy2 then + let trs = get_trans_aux a tag states in + (Cache.N2.add + a.cache2 + (tag.QName.id :> int) + (states.StateSet.id :> int) trs; trs) + else trs + + + +let eval_form phi fcs nss ps ss is_left is_right has_left has_right kind = + let rec loop phi = + begin match SFormula.expr phi with + Formula.True -> true + | Formula.False -> false + | Formula.Atom a -> + let p, b, q = Atom.node a in + let pos = + match p with + | First_child -> StateSet.mem q fcs + | Next_sibling -> StateSet.mem q nss + | Parent | Previous_sibling -> StateSet.mem q ps + | Stay -> StateSet.mem q ss + | Is_first_child -> is_left + | Is_next_sibling -> is_right + | Is k -> k == kind + | Has_first_child -> has_left + | Has_next_sibling -> has_right + in + if is_move p && (not b) then + eprintf "Warning: Invalid negative atom %a" Atom.print a; + b == pos + | Formula.And(phi1, phi2) -> loop phi1 && loop phi2 + | Formula.Or (phi1, phi2) -> loop phi1 || loop phi2 + end + in + loop phi + +let int_of_conf is_left is_right has_left has_right kind = + ((Obj.magic kind) lsl 4) lor + ((Obj.magic is_left) lsl 3) lor + ((Obj.magic is_right) lsl 2) lor + ((Obj.magic has_left) lsl 1) lor + (Obj.magic has_right) + +let eval_trans auto ltrs fcs nss ps ss is_left is_right has_left has_right kind = + let i = int_of_conf is_left is_right has_left has_right kind + and k = (fcs.StateSet.id :> int) + and l = (nss.StateSet.id :> int) + and m = (ps.StateSet.id :> int) + in + + let rec loop ltrs ss = + let j = (ltrs.TransList.id :> int) + and n = (ss.StateSet.id :> int) in + let (new_ltrs, new_ss) as res = + let res = Cache.N6.find auto.cache6 i j k l m n in + if res == dummy6 then + let res = + TransList.fold (fun trs (acct, accs) -> + let q, _, phi = Transition.node trs in + if StateSet.mem q accs then (acct, accs) else + if eval_form + phi fcs nss ps accs + is_left is_right has_left has_right kind + then + (acct, StateSet.add q accs) + else + (TransList.cons trs acct, accs) + ) ltrs (TransList.nil, ss) + in + Cache.N6.add auto.cache6 i j k l m n res; res + else + res + in + if new_ss == ss then res else + loop new_ltrs new_ss + in + loop ltrs ss + + + + (* [add_trans a q labels f] adds a transition [(q,labels) -> f] to the @@ -236,6 +396,21 @@ let complete_transitions a = Hashtbl.replace a.transitions q nqtrans ) a.states +let cleanup_states a = + let memo = ref StateSet.empty in + let rec loop q = + if not (StateSet.mem q !memo) then begin + memo := StateSet.add q !memo; + let trs = try Hashtbl.find a.transitions q with Not_found -> [] in + List.iter (fun (_, phi) -> + StateSet.iter loop (SFormula.get_states phi)) trs + end + in + StateSet.iter loop a.selection_states; + let unused = StateSet.diff a.states !memo in + eprintf "Unused states %a\n%!" StateSet.print unused; + StateSet.iter (fun q -> Hashtbl.remove a.transitions q) unused; + a.states <- !memo (* [normalize_negations a] removes negative atoms in the formula complementing the sub-automaton in the negative states. @@ -305,6 +480,7 @@ let normalize_negations auto = let trans = Hashtbl.find auto.transitions q in let trans' = List.map (fun (lab, f) -> lab, flip b f) trans in Hashtbl.replace auto.transitions q' trans'; - done + done; + cleanup_states auto