Fixed conflicts due to problem when merging with UEQ implementation

[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 db4c8cad6bce2680f9b98f538373cb8a9c274d5d..a7173b1b96989be4cdee817a5169f3a895ba4ac9 100644 (file)
--- a/helm/software/components/ng_paramodulation/terms.ml
+++ b/helm/software/components/ng_paramodulation/terms.ml
@@ -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
 type direction = Left2Right | Right2Left | Nodir
@@ -46,8 +46,10 @@ type 'a unit_clause =
 
 type 'a clause =
     int
-    * 'a literal list (* left hand side of the arrow *)
-    * 'a literal list (* right hand side of the arrow *)
+    * ('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