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

diff --git a/helm/software/components/ng_paramodulation/terms.mli b/helm/software/components/ng_paramodulation/terms.mli
index f5aaa619f..c15c85af2 100644
--- a/helm/software/components/ng_paramodulation/terms.mli
+++ b/helm/software/components/ng_paramodulation/terms.mli
@@ -18,14 +18,20 @@ type 'a foterm =
 
 type 'a substitution = (int * 'a foterm) list
 
-type comparison = Lt | Le | Eq | Ge | 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 =
-  | Exact of 'a
+  | Exact of 'a foterm
+         (* for theorems like T : \forall x. C[x] = D[x] the proof is 
+          * a foterm like (Node [ Leaf T ; Var i ]), while for the Goal
+          * it is just (Var g), i.e. the identity proof *)
   | Step of rule * int * int * direction * position * 'a substitution
          (* rule, eq1, eq2, direction of eq2, position, substitution *)
 
@@ -44,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
@@ -59,20 +91,11 @@ module type Blob =
     type t
     val eq : t -> t -> bool
     val compare : t -> t -> int
+    val eqP : t
     (* TODO: consider taking in input an imperative buffer for Format 
      *  val pp : Format.formatter -> t -> unit
      * *)
-    val pp : t -> string 
-  end
-
-module Utils (B : Blob) :
-  sig
-    val eq_foterm : B.t foterm -> B.t foterm -> bool
-    val compare_foterm : B.t foterm -> B.t foterm -> int
-
-    val eq_literal : B.t literal -> B.t literal -> bool
-    val compare_literal : B.t literal -> B.t literal -> int
+    val pp : t -> string
 
-    val eq_unit_clause : B.t unit_clause -> B.t unit_clause -> bool
-    val compare_unit_clause : B.t unit_clause -> B.t unit_clause -> int
   end
+