X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Feval.ml;h=59ebc03e8783f7f25ad6aa0f1cd816e103a1069a;hp=8f8652e9759ec41f358b5c64a13e466ec9fb8b29;hb=67121f5969c723a6cdb7a638fae344dc14f20751;hpb=3c87bbf00b98bcf40dab913cd334846b26cdb71d

diff --git a/src/eval.ml b/src/eval.ml
index 8f8652e..59ebc03 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-18 17:36:06 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-19 01:13:47 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -53,12 +53,15 @@ END
         let config0 =
           let c = get cache tree node in
           if c == Cache.N1.dummy cache then
-            { c with Ata.todo = Ata.get_trans auto tag auto.Ata.states }
+           Ata.Config.make
+             { c.Ata.Config.node with Ata.todo = Ata.get_trans auto tag auto.Ata.states }
           else c
         in
 
         let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Config0<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
+          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)
@@ -74,49 +77,55 @@ END
         and kind = T.kind tree node
         in
         let config1 =
-          Ata.eval_trans2 auto fcs nss ps config0
+          Ata.eval_trans auto fcs nss ps config0
             is_left is_right has_left has_right kind
         in
         let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Config1<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
+          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 not (Ata.eq_config config0 config1) then set cache tree node config1;
+        if config0 != config1 then set cache tree node config1;
         let () = loop fc in
         let fcs1 = get cache tree fc in
         let config2 =
-          Ata.eval_trans2 auto
+          Ata.eval_trans auto
             fcs1 nss ps config1
             is_left is_right has_left has_right kind
         in
         let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Config2<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
+          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
 
-        if not (Ata.eq_config config1 config2) then set cache tree node config2;
+        if config1 != config2 then set cache tree node config2;
         let () = loop ns in
         let config3 =
-          Ata.eval_trans2 auto
+          Ata.eval_trans auto
             fcs1 (get cache tree ns) ps config2
             is_left is_right has_left has_right kind
         in
         let () =
-          TRACE(Html.trace (T.preorder tree node) _i "Config3<br/>sat: %a<br/>unsat: %a<br/>todo: %a<br/>"
+          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)
         in
-        if not (Ata.eq_config config2 config3) then set cache tree node config3;
+        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.todo) (* no more transition to check *)
-          || (Ata.eq_config config0 config3) (* did not gain any new information *)
+          || (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
       end
@@ -131,7 +140,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).Ata.sat 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
@@ -139,9 +148,10 @@ END
     loop node []
 
   let eval auto tree node =
-    let cache = Cache.N1.create { Ata.sat = StateSet.empty;
-                                  Ata.unsat = StateSet.empty;
-                                  Ata.todo = Ata.TransList.nil }
+    let cache = Cache.N1.create
+      (Ata.Config.make { Ata.sat = StateSet.empty;
+                         Ata.unsat = StateSet.empty;
+                         Ata.todo = Ata.TransList.nil })
     in
     let redo = ref true in
     let iter = ref 0 in