Make the html trace tools use colors to represent the round at

[tatoo.git] / src / eval.ml

diff --git a/src/eval.ml b/src/eval.ml
index d0961d7..22a3b5f 100644 (file)
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-23 14:53:43 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-23 15:45:14 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -36,18 +36,21 @@ 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
+       "%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 =
@@ -83,20 +86,20 @@ END
 
         TRACE(html tree node _i config1 "Updating transitions");
 
-        if config0 != config1 then set cache tree node config1;
+        if config0 != config1 then set cache tree node config1 _i;
         let () = 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;
+        if config1 != config2 then set cache tree node config2 _i;
         let () = 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;
+        if config2 != config3 then set cache tree node config3 _i;
         (* We do set the redo flat if : *)
         if not (
           config0 == config3 (* did not gain any new information *)
@@ -128,6 +131,7 @@ END
                          Ata.unsat = StateSet.empty;
                          Ata.todo = Ata.TransList.nil;
                          Ata.summary = Ata.dummy_summary;
+                         Ata.round = ~-1;
                        })
     in
     let redo = ref true in