X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=ata.mli;h=cd6610b37873ca945894467ee1b5105a87a772d4;hb=cea756c7adc49891004bfe455628010eb7a28bc9;hp=32f28a0144c4c1864421304c14f4bc3f6292d8f9;hpb=83aa6cf8a120ea6681402ce42ae56631fca1ddf4;p=SXSI%2Fxpathcomp.git

diff --git a/ata.mli b/ata.mli
index 32f28a0..cd6610b 100644
--- a/ata.mli
+++ b/ata.mli
@@ -1,85 +1,73 @@
-(*  module Ptset : sig
-  include Set.S with type elt = int
-  val from_list : elt list -> t
- end
-   *)
+module TS : sig
+  type t
+  val empty : t
+  val cons : Tree.t -> t -> t
+  val append : Tree.t -> t -> t
+  val concat : t -> t -> t
+  val length  : t -> int
+  val iter : (Tree.t -> unit) -> t -> unit
+end
 
 type state = int
 val mk_state : unit -> state
 
-type predicate = [ `Left of (Tree.Binary.t -> bool) | `Right of (Tree.Binary.t -> bool) |
-		       `True
-		 ]
-
-
-val eval_pred : Tree.Binary.t -> predicate -> bool
-
 type formula_expr =
     False
   | True
   | Or of formula * formula
   | And of formula * formula
-  | Atom of ([ `Left | `Right ] * bool * state)
-and formula = { fid : int; pos : formula_expr; neg : formula; st : Ptset.t*Ptset.t; size: int;}
+  | Atom of ([ `Left | `Right | `LLeft | `RRight ] * bool * state)
+and formula = { fid : int; fkey : int; pos : formula_expr; neg : formula; st : (Ptset.t*Ptset.t*Ptset.t)*(Ptset.t*Ptset.t*Ptset.t); size: int;}
 val true_ : formula
 val false_ : formula
-val atom_ : [`Left | `Right ] -> bool -> state -> formula
+val atom_ : [`Left | `Right | `LLeft | `RRight ] -> bool -> state -> formula
 val and_ : formula -> formula -> formula
 val or_ : formula -> formula -> formula
 val not_ : formula -> formula 
-val equal_form : formula -> formula -> bool
+(*val equal_form : formula -> formula -> bool *)
 val pr_frm : Format.formatter -> formula -> unit
 
 
 module HTagSet : Hashtbl.S with type key = Ptset.t*Tag.t
 
-type t = {
-  id : int;
-  mutable states : Ptset.t;
-  init : Ptset.t;
-  mutable final : Ptset.t;
-  universal : Ptset.t;
-  phi : (state,(TagSet.t*(bool*formula*predicate)) list) Hashtbl.t;
-  delta : (state*Tag.t, (bool*formula*predicate)) Hashtbl.t;
-(*  delta : (state,(bool*formula*predicate) TagMap.t) Hashtbl.t; *)
-  sigma : (bool*formula*(predicate list*predicate list)*bool) HTagSet.t;
-
+type dispatch = { first : Tree.t -> Tree.t;
+		  flabel : string;
+		  next : Tree.t -> Tree.t -> Tree.t;	
+		  nlabel : string;
+		}
+type t = { 
+    id : int;
+    mutable states : Ptset.t;
+    init : Ptset.t;
+    mutable final : Ptset.t;
+    universal : Ptset.t;
+    (* Transitions of the Alternating automaton *)
+    phi : (state,(TagSet.t*(bool*formula*bool)) list) Hashtbl.t;
+    sigma : (dispatch*bool*formula) HTagSet.t;
 }
 val dump : Format.formatter -> t -> unit
     
 module Transitions : sig
-type t = state*TagSet.t*bool*formula*predicate
+type t = state*TagSet.t*bool*formula*bool
 (* Doing this avoid the parenthesis *)
 val ( ?< ) : state -> state 
-val ( >< ) : state -> TagSet.t*bool -> state*(TagSet.t*bool*predicate)
-val ( ><@ ) : state -> TagSet.t*bool*predicate -> state*(TagSet.t*bool*predicate)
-val ( >=> ) : state*(TagSet.t*bool*predicate) -> formula -> t
+val ( >< ) : state -> TagSet.t*bool -> state*(TagSet.t*bool*bool)
+val ( ><@ ) : state -> TagSet.t*bool -> state*(TagSet.t*bool*bool)
+val ( >=> ) : state*(TagSet.t*bool*bool) -> formula -> t
 val ( +| ) : formula -> formula -> formula
 val ( *& ) : formula -> formula -> formula
-val ( ** ) : [`Left | `Right ] -> state -> formula
+val ( ** ) : [`Left | `Right | `LLeft | `RRight ] -> state -> formula
 
 end
 type transition = Transitions.t
-val equal_trans : transition -> transition -> bool
+val equal_trans : transition -> transition -> bool 
 
-module TS : sig
-  type t
-  val empty : t
-  val cons : Tree.Binary.t -> t -> t
-  val append : Tree.Binary.t -> t -> t
-  val concat : t -> t -> t
-  val to_list_rev : t -> Tree.Binary.t list
-  val length  : t -> int
-  val iter : (Tree.Binary.t -> unit) -> t -> unit
-end
 
-module BottomUpNew : 
-sig
-  val run : t -> Tree.Binary.t -> TS.t
-  val run_count : t -> Tree.Binary.t -> int
-end
 
-module Jump : 
-sig
-  val run : t -> Tree.Binary.t -> Ptset.t -> TS.t
-end
+(*module BottomUpJumpNew : 
+sig *)
+  val run : t -> Tree.t -> TS.t*int
+  val run_count : t -> Tree.t -> int
+  val run_time :  t -> Tree.t -> TS.t*int
+(*end *)
+