* http://cs.unibo.it/helm/.
*)
- let debug_print = prerr_endline
+(* $Id$ *)
-(* let debug_print = fun _ -> () *)
-
-(* Da rimuovere, solo per debug*)
-let print_context ctx =
- let print_name =
- function
- Cic.Name n -> n
- | Cic.Anonymous -> "_"
- in
- List.fold_right
- (fun i (output,context) ->
- let (newoutput,context') =
- match i with
- Some (n,Cic.Decl t) ->
- print_name n ^ ":" ^ CicPp.pp t context ^ "\n", (Some n)::context
- | Some (n,Cic.Def (t,None)) ->
- print_name n ^ ":=" ^ CicPp.pp t context ^ "\n", (Some n)::context
- | None ->
- "_ ?= _\n", None::context
- | Some (_,Cic.Def (_,Some _)) -> assert false
- in
- output^newoutput,context'
- ) ctx ("",[])
- ;;
-
-
-let search_theorems_in_context status =
- let (proof, goal) = status in
- let module C = Cic in
- let module R = CicReduction in
- let module S = CicSubstitution in
- let module PET = ProofEngineTypes in
- let module PT = PrimitiveTactics in
- let _,metasenv,_,_ = proof in
- let _,context,ty = CicUtil.lookup_meta goal metasenv in
- let rec find n = function
- [] -> []
- | hd::tl ->
- let res =
- try
- Some (PET.apply_tactic
- (PT.apply_tac ~term:(C.Rel n)) status )
- with
- PET.Fail _ -> None in
- (match res with
- Some res -> res::(find (n+1) tl)
- | None -> find (n+1) tl)
- in
- try
- find 1 context
- with Failure s ->
- []
-;;
-
-let depth = 5;;
-let width = 3;;
-
-let new_search_theorems f proof goal depth gtl sign =
- let choices = f (proof,goal)
- in
- List.map
- (function (proof, goallist) ->
- (proof,(List.map (function g -> (g,depth)) goallist)@gtl, sign))
- choices
-;;
-
-exception NoOtherChoices;;
-let rec auto dbd = function
- [] -> []
- | (proof, [], sign)::tl -> (proof, [], sign)::tl
- | (proof, (goal,0)::_, _)::tl -> auto dbd tl
- | (proof, (((goal,depth)::gtl) as allg), sign)::tl ->
- (* first we check if the metavariable has not been already
- closed as a side effect by some other application *)
- let facts = (depth = 1) in
- let name,metasenv,p,statement = proof in
- let meta_inf =
- (try
- let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in
- Some (ey, ty)
- with _ -> None) in
- match meta_inf with
- Some (ey, ty) ->
- (* the goal is still there *)
- (*
- debug_print ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
- debug_print ("CURRENT PROOF = " ^ (CicPp.ppterm p));
- debug_print ("CURRENT HYP = " ^ (fst (print_context ey)));
- *)
- (* if the goal contains metavariables we use the input
- signature for at_most constraints *)
- let is_meta_closed = CicUtil.is_meta_closed ty in
- let sign, new_sign =
- if is_meta_closed then
- None, Some (MetadataConstraints.signature_of ty)
- else sign,sign in (* maybe the union ? *)
- let local_choices =
- new_search_theorems
- search_theorems_in_context
- proof goal (depth-1) [] new_sign in
- let global_choices =
- new_search_theorems
- (fun status ->
- List.map snd
- (MetadataQuery.hint
- ~dbd ~facts:facts ?signature:sign status))
- proof goal (depth-1) [] new_sign in
- (* we proceed depth-first on the current goal. This is
- a MAJOR optimization, since in case of success, and
- if the goal is meta_closed, we may just drop the alternatives
- tl1, avoiding useless backtracking. *)
- let all_choices =
- local_choices@global_choices in
- (match (auto dbd all_choices)
- with
- [] -> auto dbd tl
- | (proof,[],_)::tl1 ->
- let all_choices =
- let gtl' = List.map fst gtl in
- if (gtl = [] || is_meta_closed) then
- (proof,gtl,sign)::tl
- else
- let tl2 =
- (List.map
- (function (p,l,s) -> (p,l@gtl,s)) tl1)
- in
- (proof,gtl,sign)::tl2@tl in
- auto dbd all_choices
- | _ -> assert false)
- | None -> auto dbd ((proof,gtl,sign)::tl)
-;;
-
-
-let auto_tac ?num dbd =
- let auto_tac dbh (proof,goal) =
- debug_print "Entro in Auto";
- match (auto dbd [(proof, [(goal,depth)],None)]) with
- [] -> debug_print("Auto failed");
- raise (ProofEngineTypes.Fail "No Applicable theorem")
- | (proof,[],_)::_ ->
- debug_print "AUTO_TAC HA FINITO";
- (proof,[])
- | _ -> assert false
- in
- ProofEngineTypes.mk_tactic (auto_tac dbd)
-;;
+ let debug = false
+ let debug_print s = if debug then prerr_endline (Lazy.force s)
+(* let debug_print = fun _ -> () *)
-(************************** EXPERIMENTAL VERSION ****************************)
+(* Profiling code
+let new_experimental_hint =
+ let profile = CicUtil.profile "new_experimental_hint" in
+ fun ~dbd ~facts ?signature ~universe status ->
+ profile.profile (MetadataQuery.new_experimental_hint ~dbd ~facts ?signature ~universe) status
+*) let new_experimental_hint = MetadataQuery.new_experimental_hint
(* In this versions of auto_tac we maintain an hash table of all inspected
goals. We assume that the context is invariant for application.
To this aim, it is essential to sall hint_verbose, that in turns calls
apply_verbose. *)
-
-
type exitus =
No of int
| Yes of Cic.term * int
let _,metasenv,_,_ = proof in
let _,context,ty = CicUtil.lookup_meta goal metasenv in
let rec find n = function
- [] -> []
+ | [] -> []
| hd::tl ->
- let res =
- try
- let (subst,(proof, goal_list)) =
- PT.apply_tac_verbose ~term:(C.Rel n) status in
- (*
- let goal_list =
- List.stable_sort (compare_goal_list proof) goal_list in
- *)
- Some (subst,(proof, goal_list))
- with
- PET.Fail _ -> None in
- (match res with
- Some res -> res::(find (n+1) tl)
- | None -> find (n+1) tl)
+ let res =
+ (* we should check that the hypothesys has not been cleared *)
+ if List.nth context (n-1) = None then
+ None
+ else
+ try
+ let (subst,(proof, goal_list)) =
+ PT.apply_tac_verbose ~term:(C.Rel n) status
+ in
+ (*
+ let goal_list =
+ List.stable_sort (compare_goal_list proof) goal_list in
+ *)
+ Some (subst,(proof, goal_list))
+ with
+ PET.Fail _ -> None
+ in
+ (match res with
+ | Some res -> res::(find (n+1) tl)
+ | None -> find (n+1) tl)
in
try
find 1 context
- with Failure s ->
- []
+ with Failure s -> []
;;
exception NoOtherChoices;;
-let is_in_metasenv goal metasenv =
- try
- let (_, ey ,ty) =
- CicUtil.lookup_meta goal metasenv in
- true
- with _ -> false
-
let rec auto_single dbd proof goal ey ty depth width sign already_seen_goals
+ universe
=
if depth = 0 then [] else
if List.mem ty already_seen_goals then [] else
let _,metasenv,p,_ = proof in
(* first of all we check if the goal has been already
inspected *)
- assert (is_in_metasenv goal metasenv);
+ assert (CicUtil.exists_meta goal metasenv);
let exitus =
try Hashtbl.find inspected_goals ty
with Not_found -> NotYetInspected in
match exitus with
Yes (bo,_) ->
(*
- debug_print "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
- debug_print (CicPp.ppterm ty);
+ debug_print (lazy "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ debug_print (lazy (CicPp.ppterm ty));
*)
let subst_in =
(* if we just apply the subtitution, the type
proof goal subst_in metasenv in
[(subst_in,(proof,[],sign))]
| No d when (d >= depth) ->
- (* debug_print "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; *)
+ (* debug_print (lazy "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); *)
[] (* the empty list means no choices, i.e. failure *)
| No _
| NotYetInspected ->
- debug_print ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
- debug_print ("CURRENT PROOF = " ^ (CicPp.ppterm p));
- debug_print ("CURRENT HYP = " ^ (fst (print_context ey)));
+ debug_print (lazy ("CURRENT GOAL = " ^ CicPp.ppterm ty));
+ debug_print (lazy ("CURRENT PROOF = " ^ CicPp.ppterm p));
+ debug_print (lazy ("CURRENT HYP = " ^ CicPp.ppcontext ey));
let sign, new_sign =
if is_meta_closed then
None, Some (MetadataConstraints.signature_of ty)
new_search_theorems
(fun status ->
List.map snd
- (MetadataQuery.experimental_hint
- ~dbd ~facts:facts ?signature:sign status))
+ (new_experimental_hint
+ ~dbd ~facts:facts ?signature:sign ~universe status))
dbd proof goal (depth-1) new_sign in
let all_choices =
local_choices@global_choices in
Pervasives.compare
(List.length goals1) (List.length goals2))
all_choices in
- (match (auto_new dbd width already_seen_goals sorted_choices)
+ (match (auto_new dbd width already_seen_goals universe sorted_choices)
with
[] ->
(* no proof has been found; we update the
in
if not (cty = ty) then
begin
- debug_print ("ty = "^CicPp.ppterm ty);
- debug_print ("cty = "^CicPp.ppterm cty);
+ debug_print (lazy ("ty = "^CicPp.ppterm ty));
+ debug_print (lazy ("cty = "^CicPp.ppterm cty));
assert false
end
Hashtbl.add inspected_goals
| _ -> assert false)
end
-and auto_new dbd width already_seen_goals = function
- [] -> []
+and auto_new dbd width already_seen_goals universe = function
+ | [] -> []
| (subst,(proof, goals, sign))::tl ->
let _,metasenv,_,_ = proof in
- let is_in_metasenv (goal, _) =
- try
- let (_, ey ,ty) =
- CicUtil.lookup_meta goal metasenv in
- true
- with _ -> false in
- let goals'= List.filter is_in_metasenv goals in
- auto_new_aux dbd width already_seen_goals
- ((subst,(proof, goals', sign))::tl)
+ let goals'=
+ List.filter (fun (goal, _) -> CicUtil.exists_meta goal metasenv) goals
+ in
+ auto_new_aux dbd
+ width already_seen_goals universe ((subst,(proof, goals', sign))::tl)
-and auto_new_aux dbd width already_seen_goals = function
- [] -> []
+and auto_new_aux dbd width already_seen_goals universe = function
+ | [] -> []
| (subst,(proof, [], sign))::tl -> (subst,(proof, [], sign))::tl
| (subst,(proof, (goal,0)::_, _))::tl ->
- auto_new dbd width already_seen_goals tl
+ auto_new dbd width already_seen_goals universe tl
| (subst,(proof, goals, _))::tl when
(List.length goals) > width ->
- auto_new dbd width already_seen_goals tl
+ auto_new dbd width already_seen_goals universe tl
| (subst,(proof, (goal,depth)::gtl, sign))::tl ->
let _,metasenv,p,_ = proof in
let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in
match (auto_single dbd proof goal ey ty depth
- (width - (List.length gtl)) sign already_seen_goals)
+ (width - (List.length gtl)) sign already_seen_goals) universe
with
- [] -> auto_new dbd width already_seen_goals tl
+ [] -> auto_new dbd width already_seen_goals universe tl
| (local_subst,(proof,[],sign))::tl1 ->
let new_subst f t = f (subst t) in
let is_meta_closed = CicUtil.is_meta_closed ty in
(function (f,(p,l,s)) -> (new_subst f,(p,l@gtl,s))) tl1)
in
(new_subst local_subst,(proof,gtl,sign))::tl2@tl in
- auto_new dbd width already_seen_goals all_choices
+ auto_new dbd width already_seen_goals universe all_choices
| _ -> assert false
;;
let default_depth = 5
let default_width = 3
-let auto_tac_new ?(depth=default_depth) ?(width=default_width) ~(dbd:Mysql.dbd)
+(*
+let auto_tac ?(depth=default_depth) ?(width=default_width) ~(dbd:HMysql.dbd)
()
=
let auto_tac dbd (proof,goal) =
+ let universe = MetadataQuery.signature_of_goal ~dbd (proof,goal) in
Hashtbl.clear inspected_goals;
- debug_print "Entro in Auto";
+ debug_print (lazy "Entro in Auto");
let id t = t in
- match (auto_new dbd width [] [id,(proof, [(goal,depth)],None)]) with
- [] -> debug_print("Auto failed");
+ let t1 = Unix.gettimeofday () in
+ match auto_new dbd width [] universe [id,(proof, [(goal,depth)],None)] with
+ [] -> debug_print (lazy "Auto failed");
raise (ProofEngineTypes.Fail "No Applicable theorem")
- | (_,(proof,[],_))::_ ->
- debug_print "AUTO_TAC HA FINITO";
+ | (_,(proof,[],_))::_ ->
+ let t2 = Unix.gettimeofday () in
+ debug_print (lazy "AUTO_TAC HA FINITO");
let _,_,p,_ = proof in
- debug_print (CicPp.ppterm p);
+ debug_print (lazy (CicPp.ppterm p));
+ Printf.printf "tempo: %.9f\n" (t2 -. t1);
(proof,[])
| _ -> assert false
in
ProofEngineTypes.mk_tactic (auto_tac dbd)
;;
+*)
+(*
+let paramodulation_tactic = ref
+ (fun dbd ?full ?depth ?width status ->
+ raise (ProofEngineTypes.Fail (lazy "Not Ready yet...")));;
+let term_is_equality = ref
+ (fun term -> debug_print (lazy "term_is_equality E` DUMMY!!!!"); false);;
+*)
+
+let auto_tac ?(depth=default_depth) ?(width=default_width) ?paramodulation
+ ?full ~(dbd:HMysql.dbd) () =
+ let auto_tac dbd (proof, goal) =
+ let normal_auto () =
+ let universe = MetadataQuery.signature_of_goal ~dbd (proof, goal) in
+ Hashtbl.clear inspected_goals;
+ debug_print (lazy "Entro in Auto");
+ let id t = t in
+ let t1 = Unix.gettimeofday () in
+ match
+ auto_new dbd width [] universe [id, (proof, [(goal, depth)], None)]
+ with
+ [] -> debug_print(lazy "Auto failed");
+ raise (ProofEngineTypes.Fail (lazy "No Applicable theorem"))
+ | (_,(proof,[],_))::_ ->
+ let t2 = Unix.gettimeofday () in
+ debug_print (lazy "AUTO_TAC HA FINITO");
+ let _,_,p,_ = proof in
+ debug_print (lazy (CicPp.ppterm p));
+ debug_print (lazy (Printf.sprintf "tempo: %.9f\n" (t2 -. t1)));
+ (proof,[])
+ | _ -> assert false
+ in
+ let full = match full with None -> false | Some _ -> true in
+ let paramodulation_ok =
+ match paramodulation with
+ | None -> false
+ | Some _ ->
+ let _, metasenv, _, _ = proof in
+ let _, _, meta_goal = CicUtil.lookup_meta goal metasenv in
+ full || (Inference.term_is_equality meta_goal)
+ in
+ if paramodulation_ok then (
+ debug_print (lazy "USO PARAMODULATION...");
+(* try *)
+ Saturation.saturate dbd ~depth ~width ~full (proof, goal)
+(* with ProofEngineTypes.Fail _ -> *)
+(* normal_auto () *)
+ ) else
+ normal_auto ()
+ in
+ ProofEngineTypes.mk_tactic (auto_tac dbd)
+;;