(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-04-18 17:05:32 CEST by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-04-24 23:14:46 CEST by Kim Nguyen>
*)
INCLUDE "utils.ml"
end
+
+type node_summary = int
+let dummy_summary = -1
+(*
+4444444444443210
+4 -> kind
+3 -> is_left
+2 -> is_right
+1 -> has_left
+0 -> has_right
+*)
+
+let has_right (s : node_summary) : bool =
+ Obj.magic (s land 1)
+let has_left (s : node_summary) : bool =
+ Obj.magic ((s lsr 1) land 1)
+
+let is_right (s : node_summary) : bool =
+ Obj.magic ((s lsr 2) land 1)
+
+let is_left (s : node_summary) : bool =
+ Obj.magic ((s lsr 3) land 1)
+
+let kind (s : node_summary ) : Tree.NodeKind.t =
+ Obj.magic (s lsr 4)
+
+let node_summary 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)
+
+
+
+type config = {
+ sat : StateSet.t;
+ unsat : StateSet.t;
+ todo : TransList.t;
+ summary : node_summary;
+ (** optimization infos,
+ not taken into account during hashconsing *)
+ mutable round : int;
+}
+
+module Config = Hcons.Make(struct
+ type t = config
+ let equal c d =
+ c == d ||
+ c.sat == d.sat &&
+ c.unsat == d.unsat &&
+ c.todo == d.todo &&
+ c.summary == d.summary
+
+ let hash c =
+ HASHINT4((c.sat.StateSet.id :> int),
+ (c.unsat.StateSet.id :> int),
+ (c.todo.TransList.id :> int),
+ c.summary)
+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;
+ mutable cache4 : Config.t Cache.N4.t;
}
let next = Uid.make_maker ()
(Transition.make (State.dummy,QNameSet.empty, SFormula.false_))
TransList.nil
-let dummy6 = (dummy2, StateSet.empty)
+
+
+let dummy_config = Config.make { sat = StateSet.empty;
+ unsat = StateSet.empty;
+ todo = TransList.nil;
+ summary = dummy_summary;
+ round = 0;
+ }
let create s ss =
selection_states = ss;
transitions = Hashtbl.create 17;
cache2 = Cache.N2.create dummy2;
- cache6 = Cache.N6.create dummy6;
+ cache4 = Cache.N4.create dummy_config;
}
in
at_exit (fun () ->
- let n6 = ref 0 in
+ let n4 = 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;
+ Cache.N4.iteri (fun _ _ _ _ _ b -> if b then incr n4) auto.cache4;
+ Format.eprintf "STATS: automaton %i, cache2: %i entries, cache6: %i entries\n%!"
+ (auto.id :> int) !n2 !n4;
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)
+ let c4l, c4u = Cache.N4.stats auto.cache4 in
+ Format.eprintf "STATS: cache2: length: %i, used: %i, occupation: %f\n%!" c2l c2u (float c2u /. float c2l);
+ Format.eprintf "STATS: cache4: length: %i, used: %i, occupation: %f\n%!" c4l c4u (float c4u /. float c4l)
);
auto
let reset a =
- a.cache2 <- Cache.N2.create dummy2;
- a.cache6 <- Cache.N6.create dummy6
+ a.cache2 <- Cache.N2.create (Cache.N2.dummy a.cache2);
+ a.cache4 <- Cache.N4.create (Cache.N4.dummy a.cache4)
let get_trans_aux a tag states =
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
else if SFormula.is_false new_phi then
(acct, accs)
else
- let new_tr = Transition.make (q, lab, new_phi) in
+ let new_tr = Transition.make (q, lab, new_phi) in
(TransList.cons new_tr acct, accs)
) ltrs (TransList.nil, ss)
in
in
loop ltrs ss
+*)
-
-
-type config = {
- sat : StateSet.t;
- unsat : StateSet.t;
- todo : TransList.t;
-}
-
-let eq_config c1 c2 =
- c1.sat == c2.sat && c1.unsat == c2.unsat && c1.todo == c2.todo
-
-let simplify_atom atom pos q config =
+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 eval_form phi fcs nss ps ss summary =
let rec loop phi =
begin match SFormula.expr phi with
Formula.True | Formula.False -> phi
| 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)
+ | Is_first_child -> SFormula.of_bool (b == (is_left summary))
+ | Is_next_sibling -> SFormula.of_bool (b == (is_right summary))
+ | Is k -> SFormula.of_bool (b == (k == (kind summary)))
+ | Has_first_child -> SFormula.of_bool (b == (has_left summary))
+ | Has_next_sibling -> SFormula.of_bool (b == (has_right summary))
end
| Formula.And(phi1, phi2) -> SFormula.and_ (loop phi1) (loop phi2)
| Formula.Or (phi1, phi2) -> SFormula.or_ (loop phi1) (loop phi2)
-let eval_trans2 auto fcs nss ps ss is_left is_right has_left has_right kind =
+let eval_trans auto fcs nss ps ss =
+ let fcsid = (fcs.Config.id :> int) in
+ let nssid = (nss.Config.id :> int) in
+ let psid = (ps.Config.id :> int) in
let rec loop old_config =
- let { sat = old_sat; unsat = old_unsat; todo = old_todo } = old_config 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)
+ let oid = (old_config.Config.id :> int) in
+ let res =
+ let res = Cache.N4.find auto.cache4 oid fcsid nssid psid in
+ if res != dummy_config then res
+ else
+ let { sat = old_sat;
+ unsat = old_unsat;
+ todo = old_todo;
+ summary = old_summary } = 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_form phi fcs nss ps old_config old_summary
+ 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 { old_config.Config.node with sat; unsat; todo; } in
+ Cache.N4.add auto.cache4 oid fcsid nssid psid new_config;
+ new_config
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 = { sat; unsat; todo } in
- if sat == old_sat && unsat == old_unsat && todo == old_todo then new_config
- else loop new_config
+ if res == old_config then res else loop res
in
loop ss
let print fmt a =
fprintf fmt
- "\nInternal UID: %i@\n\
+ "Internal UID: %i@\n\
States: %a@\n\
Selection states: %a@\n\
Alternating transitions:@\n"
in
let line = Pretty.line (max_all + max_pre + 6) in
let prev_q = ref State.dummy in
+ fprintf fmt "%s@\n" line;
List.iter (fun (q, s1, s2, s3) ->
- if !prev_q != q && !prev_q != State.dummy then fprintf fmt " %s\n%!" line;
+ if !prev_q != q && !prev_q != State.dummy then fprintf fmt "%s@\n" line;
prev_q := q;
- fprintf fmt " %s, %s" s1 s2;
+ fprintf fmt "%s, %s" s1 s2;
fprintf fmt "%s" (Pretty.padding (max_pre - Pretty.length s1 - Pretty.length s2));
- fprintf fmt " %s %s@\n%!" Pretty.right_arrow s3;
+ fprintf fmt " %s %s@\n" Pretty.right_arrow s3;
) strs_strings;
- fprintf fmt " %s\n%!" line
+ fprintf fmt "%s@\n" line
(*
[complete transitions a] ensures that for each state q
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
*)
let normalize_negations auto =
- eprintf "Automaton before normalize_trans:\n";
- print err_formatter auto;
- eprintf "--------------------\n%!";
-
let memo_state = Hashtbl.create 17 in
let todo = Queue.create () in
let rec flip b f =
projects / tatoo.git / blobdiff