X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FnCicParamod.ml;h=846a576c7861f9268aada91cc4642b98150d4e72;hb=94c7a260ca00f045a3ec1b371f19de757f83003b;hp=5fe0a34c1c074424ad958dbc1ce7498805df790d;hpb=d268de514258947484a22a106c220b102c611cc3;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml
index 5fe0a34c1..846a576c7 100644
--- 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 P = Paramod.Paramod(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
+  let module B : Orderings.Blob 
+      with type t = NCic.term and type input = NCic.term 
+    = Orderings.LPO(NCicBlob.NCicBlob(C))
   in
+  let module P = Paramod.Paramod(B) in
+  let module Pp = Pp.Pp(B) 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 (bag,maxvar) ~g_passives:goals ~passives in
+  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 ->
+        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"
@@ -39,7 +51,9 @@ let nparamod rdb metasenv subst context t table =
         let rec aux k metasenv = function
           | NCic.Meta _ as t -> metasenv, t
           | NCic.Implicit _ -> 
-              let metasenv,i,_,_=NCicMetaSubst.mk_meta metasenv context `Term in
+              let metasenv, i, _, _ =
+                NCicMetaSubst.mk_meta metasenv context `IsTerm 
+              in
               metasenv, NCic.Meta (i,(k,NCic.Irl (List.length context)))
           | t -> NCicUntrusted.map_term_fold_a 
                   (fun _ k -> k+1) k aux metasenv t