module NCicParamod(C : NCicBlob.NCicContext) = Paramod.Paramod(B(C))
-let readback rdb metasenv subst context (bag,i,fo_subst,l) =
+let readback ?(demod=false) rdb metasenv subst context (bag,i,fo_subst,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,prooftype = NCicProof.mk_proof bag i fo_subst l in
+ let proofterm,prooftype = NCicProof.mk_proof ~demod 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
(fun _ k -> k+1) k aux metasenv t
in
aux 0 metasenv proofterm
- in
+ in *)
debug (lazy (NCicPp.ppterm ~metasenv ~subst ~context proofterm));
(*
let stamp = Unix.gettimeofday () 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
- else (prerr_endline "not eq"; s)
+ else (debug (lazy "not eq"); s)
;;
let index_obj s uri =
let obj = NCicEnvironment.get_checked_obj uri in
+ debug (lazy ("indexing : " ^ (NUri.string_of_uri uri)));
+ debug (lazy ("no : " ^ (string_of_int (fst (Obj.magic uri)))));
match obj with
+ | (_,_,[],[],NCic.Constant(_,_,None,ty,_)) ->
+ let nref = NReference.reference_of_spec uri NReference.Decl in
+ forward_infer_step s (NCic.Const nref) ty
| (_,d,[],[],NCic.Constant(_,_,Some(_),ty,_)) ->
let nref = NReference.reference_of_spec uri (NReference.Def d) in
forward_infer_step s (NCic.Const nref) ty
| _ -> s
;;
+let demod rdb metasenv subst context s goal =
+ (* let stamp = Unix.gettimeofday () in *)
+ match P.demod s goal with
+ | P.Error _ | P.GaveUp | P.Timeout _ -> []
+ | P.Unsatisfiable solutions ->
+ (* print (lazy (Printf.sprintf "Got solutions in %fs"
+ (Unix.gettimeofday() -. stamp))); *)
+ List.map (readback ~demod:true rdb metasenv subst context) solutions
+;;
+
let paramod rdb metasenv subst context s goal =
(* let stamp = Unix.gettimeofday () in *)
match P.nparamod ~useage:true ~max_steps:max_int