Fixed conflicts due to problem when merging with UEQ implementation

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

diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml
index 79ea569a2927a82af9c6d2c828a8fe92d23de55d..8c740a0e4605c5d282ff89270b6f1134587553f2 100644 (file)
--- a/helm/software/components/ng_paramodulation/nCicParamod.ml
+++ b/helm/software/components/ng_paramodulation/nCicParamod.ml
@@ -19,9 +19,9 @@ let nparamod rdb metasenv subst context t table =
       let context = context
     end
   in
-  let module B : Terms.Blob 
+  let module B : Orderings.Blob 
       with type t = NCic.term and type input = NCic.term 
-    = NCicBlob.NCicBlob(C) 
+    = Orderings.NRKBO(NCicBlob.NCicBlob(C))
   in
   let module P = Paramod.Paramod(B) in
   let module Pp = Pp.Pp(B) in
@@ -33,7 +33,7 @@ let nparamod rdb metasenv subst context t table =
     HExtlib.list_mapi_acc (fun x _ a -> P.mk_goal a x) (bag,maxvar) [t]
   in
   match 
-    P.paramod ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) 
+    P.paramod ~useage:true ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) 
       ~g_passives:goals ~passives (bag,maxvar) 
   with 
   | P.Error _ | P.GaveUp | P.Timeout _ -> []