Fixed conflicts due to problem when merging with UEQ implementation

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

diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml
index 8c75baeea18e058f2999fe77a90949b3d8f72d7f..6f36d5939dad21ef02fad09c2c8d3af1fee45dd3 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -91,8 +91,8 @@ module Utils (B : Orderings.Blob) = struct
           let p = Subst.apply_subst subst p in
           Terms.Predicate p
     in
-    let nlit = List.map apply_subst_on_lit nlit in
-    let plit = List.map apply_subst_on_lit plit in
+    let nlit = List.map (fun (l,s) -> (apply_subst_on_lit l,s)) nlit in
+    let plit = List.map (fun (l,s) -> (apply_subst_on_lit l,s)) plit in
     let proof =
       match proof with
       | Terms.Exact t -> Terms.Exact (Subst.apply_subst subst t)
@@ -109,8 +109,8 @@ module Utils (B : Orderings.Blob) = struct
       match ty with
       | Terms.Node [ Terms.Leaf eq ; ty; l; r ] when B.eq B.eqP eq ->
            let o = Order.compare_terms l r in
-           (vars,Terms.Equation (l, r, ty, o)::literals)
-      | _ -> (vars,Terms.Predicate ty::literals)
+           (vars,(Terms.Equation (l, r, ty, o),false)::literals)
+      | _ -> (vars,(Terms.Predicate ty,false)::literals)
     in
     let varlist = Terms.vars_of_term proofterm in
     let (varlist,nlit) = List.fold_left foterm_to_lit (varlist,[]) nlit in