X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fterms.mli;h=e0576d1f3e95dea87cd8d3955b125ac41e4f9588;hb=65e1aa022da79a3a880f5c2d5d0d512b80e50635;hp=02e3a8b6686b865f2975a44747ee4b19369399d5;hpb=b60b04a930b208dc0bf8876305c4fa5ea2aeb619;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/terms.mli b/helm/software/components/ng_paramodulation/terms.mli
index 02e3a8b66..e0576d1f3 100644
--- a/helm/software/components/ng_paramodulation/terms.mli
+++ b/helm/software/components/ng_paramodulation/terms.mli
@@ -20,12 +20,18 @@ type 'a substitution = (int * 'a foterm) list
 
 type comparison = Lt | Eq | Gt | Incomparable
 
-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 *)
 
@@ -48,7 +54,7 @@ type 'a passive_clause = int * 'a unit_clause (* weight * equation *)
 
 module M : Map.S with type key = int 
 
-type 'a bag = 'a unit_clause M.t
+type 'a bag = ('a unit_clause * bool) M.t
 
 module type Blob =
   sig
@@ -59,20 +65,16 @@ 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
+    val pp : t -> string
 
-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
+    type input
+    val embed : input -> t foterm
+    (* saturate [proof] [type] -> [proof] * [type] *)
+    val saturate : input -> input -> t foterm * t foterm
 
-    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
+