Implement command line options, clean-up screen output.

[tatoo.git] / src / ata.ml

diff --git a/src/ata.ml b/src/ata.ml
index d6aeaec..6a3570c 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-22 17:22:38 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -256,12 +256,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
@@ -485,7 +485,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 +514,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 +557,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 +566,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 =