X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FnCicParamod.ml;h=b3ab4d5047194c236b362460439cfbc79e21ad41;hb=1cdd34d7c286ab22d942e2dd1b1420e1c1caeff6;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..b3ab4d504 100644
--- a/helm/software/components/ng_paramodulation/nCicParamod.ml
+++ b/helm/software/components/ng_paramodulation/nCicParamod.ml
@@ -11,60 +11,153 @@
 
 (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *)
 
+NCicBlob.set_default_eqP()
+;;
+NCicProof.set_default_sig()
+;;
+
+let debug _ = ();;
+let print s = prerr_endline (Lazy.force s);; 
+
+module B(C : NCicBlob.NCicContext): Orderings.Blob 
+  with type t = NCic.term and type input = NCic.term 
+  = Orderings.LPO(NCicBlob.NCicBlob(C))
+
+module NCicParamod(C : NCicBlob.NCicContext) = Paramod.Paramod(B(C))
+
+let readback 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
+  (* 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
+      | NCic.Implicit _ -> 
+          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
+    in
+      aux 0 metasenv proofterm
+  in *)
+  debug (lazy (NCicPp.ppterm ~metasenv ~subst ~context proofterm));
+(*
+  let stamp = Unix.gettimeofday () in
+  let metasenv, subst, proofterm, _prooftype = 
+    NCicRefiner.typeof 
+      (rdb#set_coerc_db NCicCoercion.empty_db) 
+      metasenv subst context proofterm None
+  in
+    print (lazy (Printf.sprintf "Refined in %fs"
+		     (Unix.gettimeofday() -. stamp)));
+*)
+    proofterm, prooftype, metasenv, subst
+
 let nparamod rdb metasenv subst context t table =
-  let module C = 
-    struct
+  let module C =
+    struct 
       let metasenv = metasenv
       let subst = subst
-      let context = context
-    end
+      let context = context 
+    end 
   in
-  let module B : Terms.Blob 
-      with type t = NCic.term and type input = NCic.term 
-    = NCicBlob.NCicBlob(C) 
-  in
-  let module P = Paramod.Paramod(B) in
+  let module B = B(C) in
+  let module P = NCicParamod(C) 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
-  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"
-        (Unix.gettimeofday() -. stamp));
-      let metasenv, proofterm = 
-        let rec aux k metasenv = function
-          | NCic.Meta _ as t -> metasenv, t
-          | NCic.Implicit _ -> 
-              let metasenv,i,_,_=NCicMetaSubst.mk_meta metasenv context `Term 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
-        in
-         aux 0 metasenv proofterm
-      in
-      let metasenv, subst, proofterm, _prooftype = 
-        NCicRefiner.typeof 
-          (rdb#set_coerc_db NCicCoercion.empty_db) 
-          metasenv subst context proofterm None
-      in
-      proofterm, metasenv, subst)
-    solutions
+  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 (readback rdb metasenv subst context) solutions
 ;;
   
-  
+module EmptyC = 
+  struct
+    let metasenv = []
+    let subst = []
+    let context = []
+  end
 
+module CB = NCicBlob.NCicBlob(EmptyC)
+module P = NCicParamod(EmptyC)
 
+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,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)
+;;
+
+let index_obj s uri =
+  let obj = NCicEnvironment.get_checked_obj uri in
+  match obj with
+    | (_,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 paramod rdb metasenv subst context s goal =
+  (* let stamp = Unix.gettimeofday () in *)
+  match P.nparamod ~useage:true ~max_steps:max_int 
+    ~timeout:(Unix.gettimeofday () +. 300.0) 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 rdb metasenv subst context) solutions
+;;
+
+let fast_eq_check rdb metasenv subst context s goal =
+  (* 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))); *)
+      List.map (readback rdb metasenv subst context) solutions
+;;
+
+let is_equation metasenv subst context ty =
+  let hty, _, _ = 
+    NCicMetaSubst.saturate ~delta:0 metasenv subst context
+      ty 0 
+  in match hty with
+    | NCic.Appl (eq ::tl) when eq = CB.eqP -> true
+    | _ -> false
+;;
+
+
+(*
+let demodulate rdb metasenv subst context s goal =
+  (* 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))); *)
+      List.map (readback rdb metasenv subst context) solutions
+;;
+*)