X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Feval.ml;h=fd52ca17a6721e2bb561d26955bd609af551aaff;hb=refs%2Fheads%2Ffeature%2Fsubtree-skiping;hp=1b58617c209633c500f739db1eada93ce8f00bdb;hpb=5b5dcd45cf86701ccfe917c1d6ad73b83bb523c3;p=tatoo.git

diff --git a/src/eval.ml b/src/eval.ml
index 1b58617..fd52ca1 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-22 17:12:11 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-24 23:24:11 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -36,33 +36,36 @@ 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/>"
+     let oldi = config.Ata.round in
+     Html.trace (T.preorder tree node) i oldi
+       "node: %i<br/>%s<br/>sat: %a<br/>unsat: %a<br/>todo: %around: %i<br/>"
+       ((T.preorder tree node):>int)
        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
         let tag = T.tag tree node in
-        let config0 =
+        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;
+           true,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 *)
@@ -75,37 +78,39 @@ END
 
         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 _, ps = get cache tree parent in
+        let old_unstable_left, fcs = get cache tree fc in
+        let old_unstable_right, nss = get cache tree ns 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;
-        let () = loop fc in
-        let fcs1 = get cache tree fc in
+        if config0 != config1 then set cache tree node (true,config1) _i;
+        let unstable_left = old_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
-        let config3 = Ata.eval_trans auto fcs1 (get cache tree ns) ps config2 in
+        if config1 != config2 then set cache tree node (true, config2) _i;
+        let unstable_right = old_unstable_right && loop ns in
+        let _, nss1 = get cache tree ns in
+        let config3 = Ata.eval_trans auto fcs1 nss1 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 (true, config3) _i;
+        let unstable =
+          unstable_left
+          || unstable_right
+          || Ata.(TransList.nil != config3.Config.node.todo)
+        in
+        if Ata.(config3.Config.node.unstable_subtree) && not unstable then
+          Ata.(config3.Config.node.unstable_subtree <- false);
+        unstable
       end
     in
-    loop node;
-    !redo
+    loop node
 
   let get_results auto tree node cache =
     let rec loop node acc =
@@ -114,27 +119,28 @@ 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).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.summary = Ata.dummy_summary;
-                       })
+      true , Ata.(Config.make { sat = StateSet.empty;
+                              unsat = StateSet.empty;
+                              todo = TransList.nil;
+                              summary = dummy_summary;
+                              round = ~-1
+                            })
     in
     let redo = ref true in
     let iter = ref 0 in
     Ata.reset auto;
     while !redo do
       redo := false;
-      Ata.reset auto;
+      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;