New functorialization: paramod is abstracted over a Orderings.Blob, that is like...

[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 454432ec48925a4e53dc734aa6680faff7e14d7f..7b57e5bb3d2037b98ff681521c3b55d1ecd6a2cc 100644 (file)
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -21,9 +21,9 @@ let rec lexicograph f l1 l2 =
   | _,[] -> 1
 ;;
   
-module Utils (B : Terms.Blob) = struct
-        module Subst = FoSubst;; (*.Subst(B) ;;*)
-  module Order = Orderings.Orderings(B) ;;
+module Utils (B : Orderings.Blob) = struct
+  module Subst = FoSubst;; 
+  module Order = B;;
 
   let rec eq_foterm x y =
     x == y ||
@@ -72,15 +72,15 @@ module Utils (B : Terms.Blob) = struct
   let eq_unit_clause (id1,_,_,_) (id2,_,_,_) = id1 = id2
   let compare_unit_clause (id1,_,_,_) (id2,_,_,_) = Pervasives.compare id1 id2
     
-  let relocate maxvar varlist =
+  let relocate maxvar varlist subst =
     List.fold_right
       (fun i (maxvar, varlist, s) -> 
          maxvar+1, maxvar::varlist, Subst.build_subst i (Terms.Var maxvar) s)
-      varlist (maxvar+1, [], Subst.id_subst)
+      varlist (maxvar+1, [], subst)
   ;;
 
   let fresh_unit_clause maxvar (id, lit, varlist, proof) =
-    let maxvar, varlist, subst = relocate maxvar varlist in
+    let maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
     let lit = 
       match lit with
       | Terms.Equation (l,r,ty,o) ->