X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Fauto%2Fata.ml;fp=src%2Fauto%2Fata.ml;h=af729da49c50ea00e56c05ae3c0e7cf9686eb6b3;hp=1015513f2563db0d5ebc669c5d47681c3a8f3004;hb=09058e990c86555c9c9211f00639901bbd386730;hpb=d0165b2cd48fb800c0e3bcacfc85e452233f4525

diff --git a/src/auto/ata.ml b/src/auto/ata.ml
index 1015513..af729da 100644
--- a/src/auto/ata.ml
+++ b/src/auto/ata.ml
@@ -14,7 +14,7 @@
 (***********************************************************************)
 
 (*
-  Time-stamp: <Last modified on 2013-03-14 19:14:03 CET by Kim Nguyen>
+  Time-stamp: <Last modified on 2013-03-15 18:18:11 CET by Kim Nguyen>
 *)
 
 INCLUDE "utils.ml"
@@ -137,21 +137,6 @@ struct
 
 end
 
-type t = {
-  id : Uid.t;
-  mutable states : StateSet.t;
-  mutable selection_states: StateSet.t;
-  transitions: (State.t, (QNameSet.t*SFormula.t) list) Hashtbl.t;
-}
-
-let next = Uid.make_maker ()
-
-let create () = { id = next ();
-                  states = StateSet.empty;
-                  selection_states = StateSet.empty;
-                  transitions = Hashtbl.create 17;
- }
-
 
 module Transition = Hcons.Make (struct
   type t = State.t * QNameSet.t * SFormula.t
@@ -161,19 +146,52 @@ module Transition = Hcons.Make (struct
     HASHINT4 (PRIME1, a, ((QNameSet.uid b) :> int), ((SFormula.uid c) :> int))
 end)
 
+
 module TransList : sig
   include Hlist.S with type elt = Transition.t
-  val print : Format.formatter -> t -> unit
+  val print : Format.formatter -> ?sep:string -> t -> unit
 end =
   struct
     include Hlist.Make(Transition)
-    let print ppf l =
+    let print ppf ?(sep="\n") l =
       iter (fun t ->
         let q, lab, f = Transition.node t in
-        fprintf ppf "%a, %a -> %a<br/>" State.print q QNameSet.print lab SFormula.print f) l
+        fprintf ppf "%a, %a -> %a%s" State.print q QNameSet.print lab SFormula.print f sep) l
   end
 
-let get_trans a states tag =
+
+type t = {
+  id : Uid.t;
+  mutable states : StateSet.t;
+  mutable selection_states: StateSet.t;
+  transitions: (State.t, (QNameSet.t*SFormula.t) list) Hashtbl.t;
+  mutable cache2 : TransList.t Cache.N2.t;
+  mutable cache6 : (TransList.t*StateSet.t) Cache.N6.t;
+}
+
+let next = Uid.make_maker ()
+
+let dummy2 = TransList.cons
+  (Transition.make (State.dummy,QNameSet.empty, SFormula.false_))
+  TransList.nil
+
+let dummy6 = (dummy2, StateSet.empty)
+
+
+let create s ss = { id = next ();
+                  states = s;
+                  selection_states = ss;
+                  transitions = Hashtbl.create 17;
+                  cache2 = Cache.N2.create dummy2;
+                  cache6 = Cache.N6.create dummy6;
+ }
+
+let reset a =
+  a.cache2 <- Cache.N2.create dummy2;
+  a.cache6 <- Cache.N6.create dummy6
+
+
+let get_trans_aux a tag states =
   StateSet.fold (fun q acc0 ->
     try
       let trs = Hashtbl.find a.transitions q in
@@ -182,6 +200,96 @@ let get_trans a states tag =
     with Not_found -> acc0
   ) states TransList.nil
 
+
+let get_trans a tag states =
+  let trs =
+    Cache.N2.find a.cache2
+      (tag.QName.id :> int) (states.StateSet.id :> int)
+  in
+  if trs == dummy2 then
+    let trs = get_trans_aux a tag states in
+    (Cache.N2.add
+       a.cache2
+       (tag.QName.id :> int)
+       (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 -> true
+    | Formula.False -> false
+    | Formula.Atom a ->
+        let p, b, q = Atom.node a in
+        let pos =
+          match p with
+          | First_child -> StateSet.mem q fcs
+          | Next_sibling ->  StateSet.mem q nss
+          | Parent | Previous_sibling -> StateSet.mem q ps
+          | Stay -> StateSet.mem q ss
+          | Is_first_child -> is_left
+          | Is_next_sibling -> is_right
+          | Is k -> k == kind
+          | Has_first_child -> has_left
+          | Has_next_sibling -> has_right
+        in
+        if is_move p && (not b) then
+          eprintf "Warning: Invalid negative atom %a" Atom.print a;
+        b == pos
+    | Formula.And(phi1, phi2) -> loop phi1 && loop phi2
+    | Formula.Or (phi1, phi2) -> 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 i = 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 j = (ltrs.TransList.id :> int)
+    and n = (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, _, phi = Transition.node trs in
+            if StateSet.mem q accs then (acct, accs) else
+              if eval_form
+                phi fcs nss ps accs
+                is_left is_right has_left has_right kind
+              then
+                (acct, StateSet.add q accs)
+              else
+                (TransList.cons trs 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
+
+
+
+
+
 (*
   [add_trans a q labels f] adds a transition [(q,labels) -> f] to the
   automaton [a] but ensures that transitions remains pairwise disjoint