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 5fe0a34c1c074424ad958dbc1ce7498805df790d..8c740a0e4605c5d282ff89270b6f1134587553f2 100644 (file)
--- a/helm/software/components/ng_paramodulation/nCicParamod.ml
+++ b/helm/software/components/ng_paramodulation/nCicParamod.ml
@@ -19,18 +19,30 @@ let nparamod rdb metasenv subst context t table =
       let context = context
     end
   in
-  let module B = NCicBlob.NCicBlob(C) in
+  let module B : Orderings.Blob 
+      with type t = NCic.term and type input = NCic.term 
+    = Orderings.NRKBO(NCicBlob.NCicBlob(C))
+  in
   let module P = Paramod.Paramod(B) in
-  let bag, maxvar = Terms.M.empty, 0 in
+  let module Pp = Pp.Pp(B) in
+  let bag, maxvar = Terms.empty_bag, 0 in
   let (bag,maxvar), passives = 
     HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table
   in
   let (bag,maxvar), goals = 
     HExtlib.list_mapi_acc (fun x _ a -> P.mk_goal a x) (bag,maxvar) [t]
   in
-  let solutions = P.paramod (bag,maxvar) ~g_passives:goals ~passives in
+  match 
+    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 _ -> []
+  | P.Unsatisfiable solutions ->
   List.map 
     (fun (bag,i,l) ->
+      (* List.iter (fun x ->
+        print_endline (Pp.pp_unit_clause ~margin:max_int
+          (fst(Terms.M.find x bag)))) l; *)
       let stamp = Unix.gettimeofday () in
       let proofterm = NCicProof.mk_proof bag i l in
       prerr_endline (Printf.sprintf "Got proof term in %fs"