X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fata.ml;h=919dceda2ccdea4b4d90e46a9e0e8f4e6e7f292d;hp=08a430884b3ac88ce4a2e570b4689015c4957438;hb=67121f5969c723a6cdb7a638fae344dc14f20751;hpb=b00bff88c7902e828804c06b7f9dc55222fdc84e diff --git a/src/ata.ml b/src/ata.ml index 08a4308..919dced 100644 --- a/src/ata.ml +++ b/src/ata.ml @@ -14,7 +14,7 @@ (***********************************************************************) (* - Time-stamp: + Time-stamp: *) INCLUDE "utils.ml" @@ -177,13 +177,29 @@ let dummy2 = TransList.cons let dummy6 = (dummy2, StateSet.empty) -let create s ss = { id = next (); - states = s; - selection_states = ss; - transitions = Hashtbl.create 17; - cache2 = Cache.N2.create dummy2; - cache6 = Cache.N6.create dummy6; - } +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; + let c2l, c2u = Cache.N2.stats auto.cache2 in + let c6l, c6u = Cache.N6.stats auto.cache6 in + Format.eprintf "INFO: cache2: length: %i, used: %i, occupation: %f\n%!" c2l c2u (float c2u /. float c2l); + Format.eprintf "INFO: cache6: length: %i, used: %i, occupation: %f\n%!" c6l c6u (float c6u /. float c6l) + + ); + auto let reset a = a.cache2 <- Cache.N2.create dummy2; @@ -218,27 +234,26 @@ let get_trans a tag states = 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.True | Formula.False -> phi | Formula.Atom a -> - let p, b, q = Atom.node a in - let pos = + let p, b, q = Atom.node a in begin 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 + | First_child -> + if b == StateSet.mem q fcs then SFormula.true_ else phi + | Next_sibling -> + if b == StateSet.mem q nss then SFormula.true_ else phi + | Parent | Previous_sibling -> + if b == StateSet.mem q ps then SFormula.true_ else phi + | Stay -> + if b == StateSet.mem q ss then SFormula.true_ else phi + | Is_first_child -> SFormula.of_bool (b == is_left) + | Is_next_sibling -> SFormula.of_bool (b == is_right) + | Is k -> SFormula.of_bool (b == (k == kind)) + | Has_first_child -> SFormula.of_bool (b == has_left) + | Has_next_sibling -> SFormula.of_bool (b == has_right) + end + | Formula.And(phi1, phi2) -> SFormula.and_ (loop phi1) (loop phi2) + | Formula.Or (phi1, phi2) -> SFormula.or_ (loop phi1) (loop phi2) end in loop phi @@ -251,29 +266,32 @@ let int_of_conf is_left is_right has_left has_right kind = (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 + let n = 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 - + 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 i = (ltrs.TransList.id :> int) + and j = (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 + let q, lab, 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 + let new_phi = + eval_form + phi fcs nss ps accs + is_left is_right has_left has_right kind + in + if SFormula.is_true new_phi then (acct, StateSet.add q accs) + else if SFormula.is_false new_phi then + (acct, accs) else - (TransList.cons trs acct, accs) + let new_tr = Transition.make (q, lab, new_phi) in + (TransList.cons new_tr acct, accs) ) ltrs (TransList.nil, ss) in Cache.N6.add auto.cache6 i j k l m n res; res @@ -286,8 +304,89 @@ let eval_trans auto ltrs fcs nss ps ss is_left is_right has_left has_right kind loop ltrs ss +type config = { + sat : StateSet.t; + unsat : StateSet.t; + todo : TransList.t; +} + +module Config = Hcons.Make(struct + type t = config + let equal c d = + c.sat == d.sat && c.unsat == d.unsat && c.todo == d.todo + let hash c = + HASHINT3((c.sat.StateSet.id :> int), + (c.unsat.StateSet.id :> int), + (c.todo.TransList.id :> int)) +end +) + +let simplify_atom atom pos q { Config.node=config; _ } = + if (pos && StateSet.mem q config.sat) + || ((not pos) && StateSet.mem q config.unsat) then SFormula.true_ + else if (pos && StateSet.mem q config.unsat) + || ((not pos) && StateSet.mem q config.sat) then SFormula.false_ + else atom + + +let eval_form2 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 | Formula.False -> phi + | Formula.Atom a -> + let p, b, q = Atom.node a in begin + match p with + | First_child -> simplify_atom phi b q fcs + | Next_sibling -> simplify_atom phi b q nss + | Parent | Previous_sibling -> simplify_atom phi b q ps + | Stay -> simplify_atom phi b q ss + | Is_first_child -> SFormula.of_bool (b == is_left) + | Is_next_sibling -> SFormula.of_bool (b == is_right) + | Is k -> SFormula.of_bool (b == (k == kind)) + | Has_first_child -> SFormula.of_bool (b == has_left) + | Has_next_sibling -> SFormula.of_bool (b == has_right) + end + | Formula.And(phi1, phi2) -> SFormula.and_ (loop phi1) (loop phi2) + | Formula.Or (phi1, phi2) -> SFormula.or_ (loop phi1) (loop phi2) + end + in + loop phi + +let eval_trans auto fcs nss ps ss is_left is_right has_left has_right kind = + let rec loop old_config = + let { sat = old_sat; unsat = old_unsat; todo = old_todo } = old_config.Config.node in + let sat, unsat, removed, kept, todo = + TransList.fold + (fun trs acc -> + let q, lab, phi = Transition.node trs in + let a_sat, a_unsat, a_rem, a_kept, a_todo = acc in + if StateSet.mem q a_sat || StateSet.mem q a_unsat then acc else + let new_phi = + eval_form2 + phi fcs nss ps old_config + is_left is_right has_left has_right kind + in + if SFormula.is_true new_phi then + StateSet.add q a_sat, a_unsat, StateSet.add q a_rem, a_kept, a_todo + else if SFormula.is_false new_phi then + a_sat, StateSet.add q a_unsat, StateSet.add q a_rem, a_kept, a_todo + else + let new_tr = Transition.make (q, lab, new_phi) in + (a_sat, a_unsat, a_rem, StateSet.add q a_kept, (TransList.cons new_tr a_todo)) + ) old_todo (old_sat, old_unsat, StateSet.empty, StateSet.empty, TransList.nil) + in + (* States that have been removed from the todo list and not kept are now + unsatisfiable *) + let unsat = StateSet.union unsat (StateSet.diff removed kept) in + (* States that were found once to be satisfiable remain so *) + let unsat = StateSet.diff unsat sat in + let new_config = Config.make { sat; unsat; todo } in + if sat == old_sat && unsat == old_unsat && todo == old_todo then new_config + else loop new_config + in + loop ss (* [add_trans a q labels f] adds a transition [(q,labels) -> f] to the