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 47295035ca47e7196beb616887c4d98cccbb7a5c..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,9 +50,18 @@ 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
 
-val vars_of_term : 'a foterm -> int list
+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