X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Feval.ml;h=b48d129e7fb68e83d2ab94073a33aa57f37756f2;hp=206debe84ce4489e69131a939bdad2f6dc1634de;hb=e8132686a926c6be4599c7c2496d8e6a5b42a243;hpb=b00bff88c7902e828804c06b7f9dc55222fdc84e

diff --git a/src/eval.ml b/src/eval.ml
index 206debe..b48d129 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-04 18:45:19 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-22 14:47:46 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -34,6 +34,14 @@ DEFINE TRACE(e) = (e)
 DEFINE TRACE(e) = ()
 END
 
+   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/>"
+       msg
+       StateSet.print config.Ata.sat
+       StateSet.print config.Ata.unsat
+       (Ata.TransList.print ~sep:"<br/>") config.Ata.todo
 
 
   type cache = StateSet.t Cache.N1.t
@@ -50,52 +58,50 @@ END
         let fc = T.first_child tree node in
         let ns = T.next_sibling tree node in
         let tag = T.tag tree node in
-        let states0 = get cache tree node in
-        let trans0 = Ata.get_trans auto tag auto.Ata.states in
-        let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Pre States: %a<br/>Pre Trans: %a<br/>"
-                  StateSet.print states0 (Ata.TransList.print ~sep:"<br/>") trans0)
+        let config0 =
+          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;
+               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
+
+        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 trans1, states1 =
-          Ata.eval_trans auto trans0
-            fcs nss ps states0
-            is_left is_right has_left has_right kind
-        in
-        let () =
-          TRACE(Html.trace (T.preorder tree node) _i "TD States: %a<br/>TD Trans: %a<br/>" StateSet.print states1 (Ata.TransList.print ~sep:"<br/>") trans1)
-        in
-        if states1 != states0 then set cache tree node states1;
+        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;
         let () = loop fc in
         let fcs1 = get cache tree fc in
-        let trans2, states2 =
-          Ata.eval_trans auto trans1
-            fcs1 nss ps states1
-            is_left is_right has_left has_right kind
-        in
-        let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Left BU States: %a<br/>Left BU Trans: %a<br/>" StateSet.print states2 (Ata.TransList.print ~sep:"<br/>") trans2)
-        in
-        if states2 != states1 then set cache tree node states2;
+        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
-        let _trans3, states3 =
-          Ata.eval_trans auto trans2
-            fcs1 (get cache tree ns) ps states2
-            is_left is_right has_left has_right kind
-        in
-        let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Right BU States: %a<br/>Right BU Trans: %a<br/>" StateSet.print states3 (Ata.TransList.print ~sep:"<br/>") _trans3)
-        in
-        if states3 != states2 then set cache tree node states3;
-        if states0 != states3 && (not !redo) then redo := true
+        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
       end
     in
     loop node;
@@ -108,7 +114,7 @@ END
         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) auto.Ata.selection_states then
+        if StateSet.intersect (get cache tree node).Ata.Config.node.Ata.sat auto.Ata.selection_states then
           node::acc1
         else
           acc1
@@ -116,16 +122,24 @@ END
     loop node []
 
   let eval auto tree node =
-    let cache = Cache.N1.create StateSet.empty in
+    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;
+                       })
+    in
     let redo = ref true in
     let iter = ref 0 in
     Ata.reset auto;
     while !redo do
+      redo := false;
       redo := top_down_run auto tree node cache !iter;
       incr iter;
     done;
+    at_exit (fun () -> eprintf "INFO: %i iterations\n" !iter);
     let r = get_results auto tree node cache in
-    TRACE(Html.gen_trace (module T : Tree.Sig.S with type t = T.t) (tree));
+    TRACE(Html.gen_trace (module T : Tree.S with type t = T.t) (tree));
     r
 
 end