From 118c6bda722a65bf13b09efaa25ee391f2955dae Mon Sep 17 00:00:00 2001 From: Andrea Asperti Date: Mon, 6 Dec 2004 12:16:07 +0000 Subject: [PATCH] New version of auto with "width". --- helm/ocaml/tactics/autoTactic.ml | 292 +++++++++++++++++++------------ 1 file changed, 183 insertions(+), 109 deletions(-) diff --git a/helm/ocaml/tactics/autoTactic.ml b/helm/ocaml/tactics/autoTactic.ml index ce700f2de..918e7bd71 100644 --- a/helm/ocaml/tactics/autoTactic.ml +++ b/helm/ocaml/tactics/autoTactic.ml @@ -75,7 +75,8 @@ let search_theorems_in_context status = [] ;; -let depth = 6;; +let depth = 9;; +let width = 9;; let new_search_theorems f proof goal depth gtl sign = let choices = f (proof,goal) @@ -174,7 +175,8 @@ let auto_tac ~(dbd:Mysql.dbd) = 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 @@ -183,6 +185,26 @@ type exitus = let inspected_goals = Hashtbl.create 503;; +let compare_goal_list proof goal1 goal2 = + let _,metasenv,_,_ = proof in + let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in + let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in + let ty_sort1,_ = CicTypeChecker.type_of_aux' metasenv ey1 ty1 + CicUniv.empty_ugraph in + let ty_sort2,_ = CicTypeChecker.type_of_aux' metasenv ey2 ty2 + CicUniv.empty_ugraph in + let prop1 = + let b,_ = CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1 + CicUniv.empty_ugraph in + if b then 0 else 1 + in + let prop2 = + let b,_ = CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2 + CicUniv.empty_ugraph in + if b then 0 else 1 + in + prop1 - prop2 + let search_theorems_in_context status = let (proof, goal) = status in let module C = Cic in @@ -196,8 +218,12 @@ let search_theorems_in_context status = [] -> [] | hd::tl -> let res = - try - Some (PT.apply_tac_verbose ~term:(C.Rel n) status ) + 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 @@ -210,120 +236,166 @@ let search_theorems_in_context status = [] ;; -let new_search_theorems f proof goal depth subst sign = +let new_search_theorems f proof goal depth sign = let choices = f (proof,goal) in List.map - (function (local_subst,(proof, goallist)) -> - let new_subst t= local_subst (subst t) in - (new_subst,(proof,(List.map (function g -> (g,depth)) goallist), sign))) + (function (subst,(proof, goallist)) -> + (subst,(proof,(List.map (function g -> (g,depth)) goallist), sign))) choices ;; exception NoOtherChoices;; -let rec auto_new dbd = function - [] -> [] - | (subst,(proof, [], sign))::tl -> (subst,(proof, [], sign))::tl - | (subst,(proof, (goal,0)::_, _))::tl -> auto_new dbd tl - | (subst,(proof, (((goal,depth)::gtl) as allg), sign))::tl -> - 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) -> - (* first of all we check if the goal has been already - inspected *) - let exitus = - try Hashtbl.find inspected_goals ty - with Not_found -> NotYetInspected in - let is_meta_closed = CicUtil.is_meta_closed ty in - begin - match exitus with - Yes (bo,_) -> - (* - prerr_endline "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; - prerr_endline (CicPp.ppterm ty); - *) - let subst_in = - (* if we just apply the subtitution, the type - is irrelevant: we may use Implicit, since it will - be dropped *) - CicMetaSubst.apply_subst - [(goal,(ey, bo, Cic.Implicit None))] in - let (proof,_) = - ProofEngineHelpers.subst_meta_and_metasenv_in_proof - proof goal subst_in metasenv in - let new_subst t = (subst_in (subst t)) in - auto_new dbd ((new_subst,(proof,gtl,sign))::tl) - | No d when (d >= depth) -> - (* - prerr_endline "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; - *) - auto_new dbd tl - - | No _ - | NotYetInspected -> - (* - prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty)); - prerr_endline ("CURRENT PROOF = " ^ (CicPp.ppterm p)); - prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey))); - *) - 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) subst new_sign in - let global_choices = - new_search_theorems - (fun status -> - List.map snd - (MetadataQuery.experimental_hint - ~dbd ~facts:facts ?signature:sign status)) - proof goal (depth-1) subst new_sign in - let all_choices = - local_choices@global_choices in - (match (auto_new dbd all_choices) - with - [] -> - (* no proof has been found; we update the - hastable *) - Hashtbl.add inspected_goals ty (No depth); - auto_new dbd tl - | (new_subst,(proof,[],_))::tl1 -> - (* a proof for goal has been found: - in order to get the proof we apply subst to - Meta[goal] *) - if is_meta_closed then - begin - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable ey in - let meta_proof = - new_subst (Cic.Meta(goal,irl)) in - Hashtbl.add inspected_goals - ty (Yes (meta_proof,depth)); + +let rec auto_single dbd proof goal ey ty depth width sign + = + if depth = 0 then [] else + let facts = (depth = 1) in + let _,metasenv,_,_ = proof in + (* first of all we check if the goal has been already + inspected *) + let exitus = + try Hashtbl.find inspected_goals ty + with Not_found -> NotYetInspected in + let is_meta_closed = CicUtil.is_meta_closed ty in + begin + match exitus with + Yes (bo,_) -> + (* + prerr_endline "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; + prerr_endline (CicPp.ppterm ty); + *) + let subst_in = + (* if we just apply the subtitution, the type + is irrelevant: we may use Implicit, since it will + be dropped *) + CicMetaSubst.apply_subst + [(goal,(ey, bo, Cic.Implicit None))] in + let (proof,_) = + ProofEngineHelpers.subst_meta_and_metasenv_in_proof + proof goal subst_in metasenv in + [(subst_in,(proof,[],sign))] + | No d when (d >= depth) -> + (* + prerr_endline "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; + *) + [] (* the empty list means no choices, i.e. failure *) + | No _ + | NotYetInspected -> + (* + prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty)); + prerr_endline ("CURRENT PROOF = " ^ (CicPp.ppterm p)); + prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey))); + *) + 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.experimental_hint + ~dbd ~facts:facts ?signature:sign status)) + proof goal (depth-1) new_sign in + let all_choices = + local_choices@global_choices in + let sorted_choices = + List.stable_sort + (fun (_, (_, goals1, _)) (_, (_, goals2, _)) -> + Pervasives.compare + (List.length goals1) (List.length goals2)) + all_choices in + (match (auto_new dbd width sorted_choices) + with + [] -> + (* no proof has been found; we update the + hastable *) + (* if is_meta_closed then *) + Hashtbl.add inspected_goals ty (No depth); + [] + | (subst,(proof,[],sign))::tl1 -> + (* a proof for goal has been found: + in order to get the proof we apply subst to + Meta[goal] *) + if is_meta_closed then + begin + let irl = + CicMkImplicit.identity_relocation_list_for_metavariable ey in + let meta_proof = + subst (Cic.Meta(goal,irl)) in + Hashtbl.add inspected_goals + ty (Yes (meta_proof,depth)); +(* + begin + let cty,_ = + CicTypeChecker.type_of_aux' metasenv ey meta_proof CicUniv.empty_ugraph + in + if not (cty = ty) then + begin + prerr_endline ("ty = "^CicPp.ppterm ty); + prerr_endline ("cty = "^CicPp.ppterm cty); + assert false + end + Hashtbl.add inspected_goals + ty (Yes (meta_proof,depth)); end; - let all_choices = - let gtl' = List.map fst gtl in - if (gtl = [] || is_meta_closed) then - (new_subst,(proof,gtl,sign))::tl - else - let tl2 = - (List.map - (function (f,(p,l,s)) - -> (f,(p,l@gtl,s))) tl1) - in - (new_subst,(proof,gtl,sign))::tl2@tl in - auto_new dbd all_choices +*) + end; + (subst,(proof,[],sign))::tl1 | _ -> assert false) + end + +and auto_new dbd width = function + [] -> [] + | (subst,(proof, [], sign))::tl -> (subst,(proof, [], sign))::tl + | (subst,(proof, (goal,0)::_, _))::tl -> auto_new dbd width tl + | (subst,(proof, (goal,depth)::goals, _))::tl when + (List.length goals) > width -> auto_new dbd width tl + | (subst,(proof, (goal,depth)::gtl, sign))::tl -> + let _,metasenv,p,_ = 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) -> + let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in + begin + match (auto_single dbd proof goal ey ty depth + (width - (List.length gtl)) sign) + with + [] -> auto_new dbd width 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 + let all_choices = + if is_meta_closed then + (new_subst local_subst,(proof,gtl,sign))::tl + else + let tl2 = + (List.map + (function (f,(p,l,s)) -> (new_subst f,(p,l@gtl,s))) tl1) + in + (new_subst local_subst,(proof,gtl,sign))::tl2@tl in + let sorted_choices = all_choices in +(* + List.stable_sort + (fun (_, (_, goals1, _)) (_, (_, goals2, _)) -> + Pervasives.compare + (List.length goals1) (List.length goals2)) + all_choices in *) + + auto_new dbd width sorted_choices + | _ -> assert false end - | None -> auto_new dbd ((subst,(proof,gtl,sign))::tl) + | None -> auto_new dbd width ((subst,(proof, gtl, sign))::tl) ;; @@ -332,11 +404,13 @@ let auto_tac_new ~(dbd:Mysql.dbd) = Hashtbl.clear inspected_goals; prerr_endline "Entro in Auto"; let id t = t in - match (auto_new dbd [id,(proof, [(goal,depth)],None)]) with + match (auto_new dbd width [id,(proof, [(goal,depth)],None)]) with [] -> prerr_endline("Auto failed"); raise (ProofEngineTypes.Fail "No Applicable theorem") | (_,(proof,[],_))::_ -> prerr_endline "AUTO_TAC HA FINITO"; + let _,_,p,_ = proof in + prerr_endline (CicPp.ppterm p); (proof,[]) | _ -> assert false in -- 2.39.2