X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fterms.mli;h=c15c85af24a6c4a91d756441a738d4be2833be27;hb=38c54dd8e2234836d5f3e8011c478daf7d59fa25;hp=c16b6f9b7212dd564aa07c67b4a39a1ee8eb86e6;hpb=6b0a195b180e3526af7b55771b2df7b10acd7c30;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/terms.mli b/helm/software/components/ng_paramodulation/terms.mli
index c16b6f9b7..c15c85af2 100644
--- a/helm/software/components/ng_paramodulation/terms.mli
+++ b/helm/software/components/ng_paramodulation/terms.mli
@@ -18,10 +18,13 @@ type 'a foterm =
 
 type 'a substitution = (int * 'a foterm) list
 
-type comparison = Lt | Eq | Gt | Incomparable
+type comparison = Lt | Eq | Gt | Incomparable | Invertible
 
-type rule = SuperpositionRight | SuperpositionLeft | Demodulation
+type rule = Superposition | Demodulation
+
+(* A Discrimination tree is a map: foterm |-> (dir, clause) *)
 type direction = Left2Right | Right2Left | Nodir
+
 type position = int list
 
 type 'a proof =
@@ -47,11 +50,37 @@ type 'a unit_clause =
  * varlist
  * 'a proof      (* proof *)
 
-type 'a passive_clause = int * 'a unit_clause (* weight * equation *)
+type 'a clause =
+    int
+    * ('a literal * bool) list (* left hand side of the arrow,
+				  with flag for selection *)
+    * ('a literal * bool) list (* right hand side of the arrow,
+				  with flag for selection *)
+    * varlist
+    * 'a proof
+
+type 'a passive_clause = int * 'a clause (* weight * equation *)
+
+val vars_of_term : ?start_acc:int list -> 'a foterm  -> int list
 
 module M : Map.S with type key = int 
 
-type 'a bag = 'a unit_clause M.t
+type 'a bag = int (* max ID  *)
+              * (('a clause * bool * int) M.t)
+
+(* also gives a fresh ID to the clause *)
+    val add_to_bag : 
+          'a clause -> 'a bag ->
+            'a bag * 'a clause
+
+    val replace_in_bag : 
+          'a clause * bool * int -> 'a bag ->
+            'a bag
+
+    val get_from_bag : 
+          int -> 'a bag -> 'a clause * bool * int
+
+    val empty_bag : 'a bag
 
 module type Blob =
   sig
@@ -62,14 +91,11 @@ module type Blob =
     type t
     val eq : t -> t -> bool
     val compare : t -> t -> int
-    val is_eq_predicate : t -> bool
+    val eqP : t
     (* TODO: consider taking in input an imperative buffer for Format 
      *  val pp : Format.formatter -> t -> unit
      * *)
     val pp : t -> string
 
-    val embed : t -> t foterm 
-    (* saturate [proof] [type] -> [proof] * [type] *)
-    val saturate : t -> t -> t foterm * t foterm
   end