Various fixes

[helm.git] / helm / software / components / ng_paramodulation / terms.ml

diff --git a/helm/software/components/ng_paramodulation/terms.ml b/helm/software/components/ng_paramodulation/terms.ml
index 91ca56271404a9e9ccb2cd9df6ee37fa99e8a81b..f2a3de0209e190e349a0435604ea0d9cc91d55ce 100644 (file)
--- a/helm/software/components/ng_paramodulation/terms.ml
+++ b/helm/software/components/ng_paramodulation/terms.ml
@@ -18,14 +18,14 @@ type 'a foterm =
 
 type 'a substitution = (int * 'a foterm) list
 
-type comparison = Lt | Le | Eq | Ge | Gt | Incomparable
+type comparison = Lt | Eq | Gt | Incomparable
 
-type rule = SuperpositionRight | SuperpositionLeft | Demodulation
+type rule = Superposition | Demodulation
 type direction = Left2Right | Right2Left | Nodir
 type position = int list
 
 type 'a proof =
-  | Exact of 'a
+  | Exact of 'a foterm
   | Step of rule * int * int * direction * position * 'a substitution
          (* rule, eq1, eq2, direction of eq2, position, substitution *)
 
@@ -56,4 +56,16 @@ module OT =
 module M : Map.S with type key = int 
   = Map.Make(OT) 
 
-type 'a bag = 'a unit_clause M.t
+type 'a bag = ('a unit_clause * bool) M.t
+
+module type Blob =
+  sig
+    type t
+    val eq : t -> t -> bool
+    val compare : t -> t -> int
+    val eqP : t
+    val pp : t -> string
+    val embed : t -> t foterm
+    val saturate : t -> t -> t foterm * t foterm
+  end
+