(***********************************************************************)
(*
- Time-stamp: <Last modified on 2013-04-23 14:53:43 CEST by Kim Nguyen>
+ Time-stamp: <Last modified on 2013-04-24 18:41:35 CEST by Kim Nguyen>
*)
INCLUDE "utils.ml"
let html tree node i config msg =
let config = config.Ata.Config.node in
- Html.trace (T.preorder tree node) i
- "%s<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
+ 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
+ (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
TRACE(html tree node _i config1 "Updating transitions");
- if config0 != config1 then set cache tree node config1;
- let () = loop fc in
+ 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 in
TRACE(html tree node _i config2 "Updating transitions (after first-child)");
- if config1 != config2 then set cache tree node config2;
- let () = loop ns in
+ 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;
- (* We do set the redo flat if : *)
- if not (
- config0 == config3 (* did not gain any new information *)
- || !redo (* already set *)
- || Ata.TransList.nil == config3.Ata.Config.node.Ata.todo ) (* no more transition to check *)
- then redo := true
+ 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 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 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.summary = Ata.dummy_summary;
+ 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