X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FnCicParamod.ml;h=59018a51719f16d7c2e954f9a1cade94affae8ad;hb=2e55fd0b276071a142e523322a777fef8c9e5a3f;hp=fb60d3142ccb526b5520bff439263d576512fae2;hpb=dce1bca274f93a3bddcc0f6b04cbf126ccff42b0;p=helm.git diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml index fb60d3142..59018a517 100644 --- a/helm/software/components/ng_paramodulation/nCicParamod.ml +++ b/helm/software/components/ng_paramodulation/nCicParamod.ml @@ -31,10 +31,10 @@ let readback rdb metasenv subst context (bag,i,fo_subst,l) = 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 fo_subst l in - print (lazy (Printf.sprintf "Got proof term in %fs" - (Unix.gettimeofday() -. stamp))); + (* let stamp = Unix.gettimeofday () in *) + let proofterm,prooftype = NCicProof.mk_proof bag i fo_subst l in + (* debug (lazy (Printf.sprintf "Got proof term in %fs" + (Unix.gettimeofday() -. stamp))); *) let metasenv, proofterm = let rec aux k metasenv = function | NCic.Meta _ as t -> metasenv, t @@ -47,8 +47,9 @@ let readback rdb metasenv subst context (bag,i,fo_subst,l) = (fun _ k -> k+1) k aux metasenv t in aux 0 metasenv proofterm - in - print (lazy (NCicPp.ppterm ~metasenv ~subst ~context proofterm)); + in + debug (lazy (NCicPp.ppterm ~metasenv ~subst ~context proofterm)); +(* let stamp = Unix.gettimeofday () in let metasenv, subst, proofterm, _prooftype = NCicRefiner.typeof @@ -57,7 +58,8 @@ let readback rdb metasenv subst context (bag,i,fo_subst,l) = in print (lazy (Printf.sprintf "Refined in %fs" (Unix.gettimeofday() -. stamp))); - proofterm, metasenv, subst +*) + proofterm, prooftype, metasenv, subst let nparamod rdb metasenv subst context t table = let module C = @@ -99,7 +101,7 @@ type state = P.state let empty_state = P.empty_state let forward_infer_step s t ty = - let bag = P.bag_of_state s in + let bag = P.bag_of_state s in let bag,clause = P.mk_passive bag (t,ty) in if Terms.is_eq_clause clause then P.forward_infer_step (P.replace_bag s bag) clause 0 @@ -115,12 +117,12 @@ let index_obj s uri = ;; let fast_eq_check rdb metasenv subst context s goal = - let stamp = Unix.gettimeofday () in + (* let stamp = Unix.gettimeofday () in *) match P.fast_eq_check s goal with | P.Error _ | P.GaveUp | P.Timeout _ -> [] | P.Unsatisfiable solutions -> - print (lazy (Printf.sprintf "Got solutions in %fs" - (Unix.gettimeofday() -. stamp))); + (* print (lazy (Printf.sprintf "Got solutions in %fs" + (Unix.gettimeofday() -. stamp))); *) List.map (readback rdb metasenv subst context) solutions ;;