(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-04-19 01:13:47 CEST by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-04-24 18:41:35 CEST by Kim Nguyen>
*)
INCLUDE "utils.ml"
DEFINE TRACE(e) = ()
END
+ let html tree node i config msg =
+ let config = config.Ata.Config.node in
+ let oldi = config.Ata.round in
+ Html.trace (T.preorder tree node) i oldi
+ "%s<br/>sat: %a<br/>unsat: %a<br/>todo: %around: %i<br/>"
+ msg
+ StateSet.print config.Ata.sat
+ StateSet.print config.Ata.unsat
+ (Ata.TransList.print ~sep:"<br/>") config.Ata.todo oldi
type cache = StateSet.t Cache.N1.t
let get c t n = Cache.N1.find c (T.preorder t n)
- let set c t n v = Cache.N1.add c (T.preorder t n) v
+ let set c t n v i =
+ v.Ata.Config.node.Ata.round <- i;
+ Cache.N1.add c (T.preorder t n) v
let top_down_run auto tree node cache _i =
- let redo = ref false in
let rec loop node =
- if node != T.nil then begin
+ if node == T.nil then false else begin
let parent = T.parent tree node in
let fc = T.first_child tree node in
let ns = T.next_sibling tree node in
let c = get cache tree node in
if c == Cache.N1.dummy cache then
Ata.Config.make
- { c.Ata.Config.node with Ata.todo = Ata.get_trans auto tag auto.Ata.states }
+ { c.Ata.Config.node with
+ Ata.todo = Ata.get_trans auto tag auto.Ata.states;
+ summary = Ata.node_summary
+ (node == T.first_child tree parent) (* is_left *)
+ (node == T.next_sibling tree parent) (* is_right *)
+ (fc != T.nil) (* has_left *)
+ (ns != T.nil) (* has_right *)
+ (T.kind tree node) (* kind *)
+ }
else c
in
- let () =
- TRACE(
- let config0 = config0.Ata.node in
- Html.trace (T.preorder tree node) _i "Config0<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
- StateSet.print config0.Ata.sat
- StateSet.print config0.Ata.unsat
- (Ata.TransList.print ~sep:"<br/>") config0.Ata.todo)
- in
+ TRACE(html tree node _i config0 "Entering node");
let ps = get cache tree parent in
let fcs = get cache tree fc in
let nss = get cache tree ns in
- let is_left = node == T.first_child tree parent
- and is_right = node == T.next_sibling tree parent
- and has_left = fc != T.nil
- and has_right = ns != T.nil
- and kind = T.kind tree node
- in
- let config1 =
- Ata.eval_trans auto fcs nss ps config0
- is_left is_right has_left has_right kind
- in
- let () =
- TRACE(
- let config1 = config1.Ata.node in
- Html.trace (T.preorder tree node) _i "Config1<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
- StateSet.print config1.Ata.sat
- StateSet.print config1.Ata.unsat
- (Ata.TransList.print ~sep:"<br/>") config1.Ata.todo)
- in
- if config0 != config1 then set cache tree node config1;
- let () = loop fc in
+ let config1 = Ata.eval_trans auto fcs nss ps config0 in
+
+ TRACE(html tree node _i config1 "Updating transitions");
+
+ if config0 != config1 then set cache tree node config1 _i;
+ let unstable_left = loop fc in
let fcs1 = get cache tree fc in
- let config2 =
- Ata.eval_trans auto
- fcs1 nss ps config1
- is_left is_right has_left has_right kind
- in
- let () =
- TRACE(
- let config2 = config2.Ata.node in
- Html.trace (T.preorder tree node) _i "Config2<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
- StateSet.print config2.Ata.sat
- StateSet.print config2.Ata.unsat
- (Ata.TransList.print ~sep:"<br/>") config2.Ata.todo)
- in
+ let config2 = Ata.eval_trans auto fcs1 nss ps config1 in
- if config1 != config2 then set cache tree node config2;
- let () = loop ns in
- let config3 =
- Ata.eval_trans auto
- fcs1 (get cache tree ns) ps config2
- is_left is_right has_left has_right kind
- in
- let () =
- TRACE(
- let config3 = config3.Ata.node in
- Html.trace (T.preorder tree node) _i "Config3<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
- StateSet.print config3.Ata.sat
- StateSet.print config3.Ata.unsat
- (Ata.TransList.print ~sep:"<br/>") config3.Ata.todo)
+ TRACE(html tree node _i config2 "Updating transitions (after first-child)");
+
+ if config1 != config2 then set cache tree node config2 _i;
+ let unstable_right = loop ns in
+ let config3 = Ata.eval_trans auto fcs1 (get cache tree ns) ps config2 in
+
+ TRACE(html tree node _i config3 "Updating transitions (after next-sibling)");
+
+ if config2 != config3 then set cache tree node config3 _i;
+ let unstable =
+ unstable_left
+ || unstable_right
+ || (config0 != config3 && Ata.(TransList.nil != config3.Config.node.todo))
in
- if config2 != config3 then set cache tree node config3;
- (* We do set the redo flat if : *)
- if not (
- !redo (* already set *)
- || (Ata.TransList.nil == config3.Ata.Config.node.Ata.todo) (* no more transition to check *)
- || (config0 == config3) (* did not gain any new information *)
- )
- then redo := true
+ if Ata.(unstable && not config3.Config.node.unstable_subtree) then
+ Ata.(config3.Config.node.unstable_subtree <- unstable);
+ unstable
end
in
- loop node;
- !redo
+ loop node
let get_results auto tree node cache =
let rec loop node acc =
let acc0 = loop (T.next_sibling tree node) acc in
let acc1 = loop (T.first_child tree node) acc0 in
- if StateSet.intersect (get cache tree node).Ata.Config.node.Ata.sat auto.Ata.selection_states then
- node::acc1
- else
- acc1
+ if StateSet.intersect
+ (get cache tree node).Ata.Config.node.Ata.sat
+ auto.Ata.selection_states then node::acc1
+ else acc1
in
loop node []
let eval auto tree node =
let cache = Cache.N1.create
- (Ata.Config.make { Ata.sat = StateSet.empty;
- Ata.unsat = StateSet.empty;
- Ata.todo = Ata.TransList.nil })
+ Ata.(Config.make { sat = StateSet.empty;
+ unsat = StateSet.empty;
+ todo = TransList.nil;
+ summary = dummy_summary;
+ round = ~-1;
+ unstable_subtree = true;
+ })
in
let redo = ref true in
let iter = ref 0 in
Ata.reset auto;
while !redo do
redo := false;
+ Ata.reset auto; (* prevents the .cache2 and .cache4 memoization tables from growing too much *)
redo := top_down_run auto tree node cache !iter;
incr iter;
done;
- at_exit (fun () -> eprintf "INFO: %i iterations\n" !iter);
+ at_exit (fun () -> eprintf "@[STATS: %i iterations@]@." !iter);
let r = get_results auto tree node cache in
TRACE(Html.gen_trace (module T : Tree.S with type t = T.t) (tree));
r