X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fata.ml;h=19eb75d8c99d969d0afa710ca0f42c47a7954f5d;hp=01fa63961763022f2bba37c4807abc3813dbb40b;hb=969febf12344a3fe3bf793a323b2e88f7b20ebae;hpb=acd23a33d837d03c813212ec3896a86edef16e87

diff --git a/src/ata.ml b/src/ata.ml
index 01fa639..19eb75d 100644
--- a/src/ata.ml
+++ b/src/ata.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-04-24 23:14:46 CEST by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-04-25 15:30:52 CEST by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -260,20 +260,27 @@ 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 "STATS: automaton %i, cache2: %i entries, cache6: %i entries\n%!"
+    Logger.msg `STATS "automaton %i, cache2: %i entries, cache6: %i entries"
       (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 "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)
+    Logger.msg `STATS
+      "cache2: length: %i, used: %i, occupation: %f"
+      c2l c2u (float c2u /. float c2l);
+    Logger.msg `STATS
+      "cache4: length: %i, used: %i, occupation: %f"
+      c4l c4u (float c4u /. float c4l)
 
   );
   auto
 
 let reset a =
-  a.cache2 <- Cache.N2.create (Cache.N2.dummy a.cache2);
   a.cache4 <- Cache.N4.create (Cache.N4.dummy a.cache4)
 
+let full_reset a =
+  reset a;
+  a.cache2 <- Cache.N2.create (Cache.N2.dummy a.cache2)
+
 
 let get_trans_aux a tag states =
   StateSet.fold (fun q acc0 ->
@@ -298,82 +305,6 @@ let get_trans a tag states =
        (states.StateSet.id :> int) trs; trs)
   else trs
 
-
-(*
-let eval_form phi fcs nss ps ss is_left is_right has_left has_right kind =
-  let rec loop phi =
-    begin match SFormula.expr phi with
-      Formula.True | Formula.False -> phi
-    | Formula.Atom a ->
-        let p, b, q = Atom.node a in begin
-          match p with
-          | First_child ->
-              if b == StateSet.mem q fcs then SFormula.true_ else phi
-          | Next_sibling ->
-              if b == StateSet.mem q nss then SFormula.true_ else phi
-          | Parent | Previous_sibling ->
-              if b == StateSet.mem q ps then SFormula.true_ else phi
-          | Stay ->
-              if b == StateSet.mem q ss then SFormula.true_ else phi
-          | Is_first_child -> SFormula.of_bool (b == is_left)
-          | Is_next_sibling -> SFormula.of_bool (b == is_right)
-          | Is k -> SFormula.of_bool (b == (k == kind))
-          | Has_first_child -> SFormula.of_bool (b == has_left)
-          | Has_next_sibling -> SFormula.of_bool (b == has_right)
-        end
-    | Formula.And(phi1, phi2) -> SFormula.and_ (loop phi1) (loop phi2)
-    | Formula.Or (phi1, phi2) -> SFormula.or_  (loop phi1) (loop phi2)
-    end
-  in
-  loop phi
-
-let int_of_conf is_left is_right has_left has_right kind =
-  ((Obj.magic kind) lsl 4) lor
-    ((Obj.magic is_left) lsl 3) lor
-    ((Obj.magic is_right) lsl 2) lor
-    ((Obj.magic has_left) lsl 1) lor
-    (Obj.magic has_right)
-
-let eval_trans auto ltrs fcs nss ps ss is_left is_right has_left has_right kind =
-  let n = int_of_conf is_left is_right has_left has_right kind
-  and k = (fcs.StateSet.id :> int)
-  and l = (nss.StateSet.id :> int)
-  and m = (ps.StateSet.id :> int) in
-  let rec loop ltrs ss =
-    let i = (ltrs.TransList.id :> int)
-    and j = (ss.StateSet.id :> int) in
-    let (new_ltrs, new_ss) as res =
-      let res = Cache.N6.find auto.cache6 i j k l m n in
-      if res == dummy6 then
-        let res =
-          TransList.fold (fun trs (acct, accs) ->
-            let q, lab, phi = Transition.node trs in
-            if StateSet.mem q accs then (acct, accs) else
-              let new_phi =
-                eval_form
-                  phi fcs nss ps accs
-                  is_left is_right has_left has_right kind
-              in
-              if SFormula.is_true new_phi then
-                (acct, StateSet.add q accs)
-              else if SFormula.is_false new_phi then
-                (acct, accs)
-              else
-                 let new_tr = Transition.make (q, lab, new_phi) in
-                (TransList.cons new_tr acct, accs)
-          ) ltrs (TransList.nil, ss)
-        in
-        Cache.N6.add auto.cache6 i j k l m n res; res
-      else
-        res
-    in
-    if new_ss == ss then res else
-      loop new_ltrs new_ss
-  in
-  loop ltrs ss
-
-*)
-
 let simplify_atom atom pos q { Config.node=config; _ } =
   if (pos && StateSet.mem q config.sat)
     || ((not pos) && StateSet.mem q config.unsat) then SFormula.true_