Add a bitmap to keep track of whether a subtree needs to be

[tatoo.git] / src / ata.ml

diff --git a/src/ata.ml b/src/ata.ml
index d6aeaec..01fa639 100644 (file)
--- a/src/ata.ml
+++ b/src/ata.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-22 15:27:36 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-24 23:14:46 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -199,6 +199,9 @@ type config = {
   unsat : StateSet.t;
   todo : TransList.t;
   summary : node_summary;
+  (** optimization infos,
+      not taken into account during hashconsing *)
+  mutable round : int;
 }
 
 module Config = Hcons.Make(struct
@@ -238,7 +241,8 @@ let dummy2 = TransList.cons
 let dummy_config = Config.make { sat = StateSet.empty;
                                  unsat = StateSet.empty;
                                  todo = TransList.nil;
-                                 summary = dummy_summary
+                                 summary = dummy_summary;
+                                 round = 0;
                                }
 
 
@@ -256,12 +260,12 @@ let create s ss =
     let n2 = ref 0 in
     Cache.N2.iteri (fun _ _ _ b -> if b then incr n2) auto.cache2;
     Cache.N4.iteri (fun _ _ _ _ _ b -> if b then incr n4) auto.cache4;
-    Format.eprintf "INFO: automaton %i, cache2: %i entries, cache6: %i entries\n%!"
+    Format.eprintf "STATS: automaton %i, cache2: %i entries, cache6: %i entries\n%!"
       (auto.id :> int) !n2 !n4;
     let c2l, c2u = Cache.N2.stats auto.cache2 in
     let c4l, c4u = Cache.N4.stats auto.cache4 in
-    Format.eprintf "INFO: cache2: length: %i, used: %i, occupation: %f\n%!" c2l c2u (float c2u /. float c2l);
-    Format.eprintf "INFO: cache4: length: %i, used: %i, occupation: %f\n%!" c4l c4u (float c4u /. float c4l)
+    Format.eprintf "STATS: cache2: length: %i, used: %i, occupation: %f\n%!" c2l c2u (float c2u /. float c2l);
+    Format.eprintf "STATS: cache4: length: %i, used: %i, occupation: %f\n%!" c4l c4u (float c4u /. float c4l)
 
   );
   auto
@@ -377,7 +381,6 @@ let simplify_atom atom pos q { Config.node=config; _ } =
       || ((not pos) && StateSet.mem q config.sat) then SFormula.false_
   else atom
 
-
 let eval_form phi fcs nss ps ss summary =
   let rec loop phi =
     begin match SFormula.expr phi with
@@ -441,7 +444,7 @@ let eval_trans auto fcs nss ps ss =
         let unsat = StateSet.union unsat (StateSet.diff removed kept) in
         (* States that were found once to be satisfiable remain so *)
         let unsat = StateSet.diff unsat sat in
-        let new_config = Config.make { sat; unsat; todo ; summary = old_summary } in
+        let new_config = Config.make { old_config.Config.node with sat; unsat; todo; } in
         Cache.N4.add auto.cache4 oid fcsid nssid psid new_config;
         new_config
     in
@@ -485,7 +488,7 @@ let _flush_str_fmt () = pp_print_flush _str_fmt ();
 
 let print fmt a =
   fprintf fmt
-    "\nInternal UID: %i@\n\
+    "Internal UID: %i@\n\
      States: %a@\n\
      Selection states: %a@\n\
      Alternating transitions:@\n"
@@ -514,14 +517,15 @@ let print fmt a =
   in
   let line = Pretty.line (max_all + max_pre + 6) in
   let prev_q = ref State.dummy in
+  fprintf fmt "%s@\n" line;
   List.iter (fun (q, s1, s2, s3) ->
-    if !prev_q != q && !prev_q != State.dummy then fprintf fmt " %s\n%!"  line;
+    if !prev_q != q && !prev_q != State.dummy then fprintf fmt "%s@\n"  line;
     prev_q := q;
-    fprintf fmt " %s, %s" s1 s2;
+    fprintf fmt "%s, %s" s1 s2;
     fprintf fmt "%s" (Pretty.padding (max_pre - Pretty.length s1 - Pretty.length s2));
-    fprintf fmt " %s  %s@\n%!" Pretty.right_arrow s3;
+    fprintf fmt " %s  %s@\n" Pretty.right_arrow s3;
   ) strs_strings;
-  fprintf fmt " %s\n%!" line
+  fprintf fmt "%s@\n" line
 
 (*
   [complete transitions a] ensures that for each state q
@@ -556,7 +560,6 @@ let cleanup_states a =
   in
   StateSet.iter loop a.selection_states;
   let unused = StateSet.diff a.states !memo in
-  eprintf "Unused states %a\n%!" StateSet.print unused;
   StateSet.iter (fun q -> Hashtbl.remove a.transitions q) unused;
   a.states <- !memo
 
@@ -566,10 +569,6 @@ let cleanup_states a =
 *)
 
 let normalize_negations auto =
-  eprintf "Automaton before normalize_trans:\n";
-  print err_formatter auto;
-  eprintf "--------------------\n%!";
-
   let memo_state = Hashtbl.create 17 in
   let todo = Queue.create () in
   let rec flip b f =