Fixed conflicts due to problem when merging with UEQ implementation

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

diff --git a/helm/software/components/ng_paramodulation/terms.mli b/helm/software/components/ng_paramodulation/terms.mli
index c9c99caa1dfb8295474d32a185dd5f79181945a3..6ef3eeed86ca73018c65d6a662ed45aac9cf1816 100644 (file)
--- a/helm/software/components/ng_paramodulation/terms.mli
+++ b/helm/software/components/ng_paramodulation/terms.mli
@@ -18,7 +18,7 @@ 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 = Superposition | Demodulation
 
@@ -50,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 unit_clause * bool * int) M.t)
+
+(* also gives a fresh ID to the clause *)
+    val add_to_bag : 
+          'a unit_clause -> 'a bag ->
+            'a bag * 'a unit_clause
+
+    val replace_in_bag : 
+          'a unit_clause * bool * int -> 'a bag ->
+            'a bag
+
+    val get_from_bag : 
+          int -> 'a bag -> 'a unit_clause * bool * int
+
+    val empty_bag : 'a bag
 
 module type Blob =
   sig
@@ -71,9 +97,10 @@ module type Blob =
      * *)
     val pp : t -> string
 
-    val embed : t -> t foterm 
+    type input
+    val embed : input -> t foterm
     (* saturate [proof] [type] -> [proof] * [type] *)
-    val saturate : t -> t -> t foterm * t foterm
+    val saturate : input -> input -> t foterm * t foterm
 
   end