X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FnCicParamod.ml;h=a1e2a9ff5ea96b58cee526825ac456af267804f4;hb=ad8d37cce3b39565861014d870b91b1add0ec0e3;hp=89660143de5e426b53f9cdc291442237aed5dc57;hpb=895efaa0e4375de535226002fcb1ed14d1fa8301;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml
index 89660143d..a1e2a9ff5 100644
--- a/helm/software/components/ng_paramodulation/nCicParamod.ml
+++ b/helm/software/components/ng_paramodulation/nCicParamod.ml
@@ -19,28 +19,30 @@ 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.LPO(NCicBlob.NCicBlob(C))
   in
   let module P = Paramod.Paramod(B) in
   let module Pp = Pp.Pp(B) in
-  let bag, maxvar = Terms.M.empty, 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 = Terms.empty_bag, 0 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 ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) 
-      ~g_passives:goals ~passives (bag,maxvar) 
+  let (bag,maxvar), passives = 
+    HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table
   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 ->
+      (* List.iter (fun x ->
         print_endline (Pp.pp_unit_clause ~margin:max_int
-          (fst(Terms.M.find x bag)))) l;
+          (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"