X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FautoTactic.ml;h=568e12ca40c4b303bd182ea3688efba78070ea0f;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=ce700f2de5091c9f7532570453cc10401d4c62d6;hpb=e09713d333183e929f108ff8bb8fbe2a25bfcac7;p=helm.git diff --git a/helm/ocaml/tactics/autoTactic.ml b/helm/ocaml/tactics/autoTactic.ml index ce700f2de..568e12ca4 100644 --- a/helm/ocaml/tactics/autoTactic.ml +++ b/helm/ocaml/tactics/autoTactic.ml @@ -23,29 +23,26 @@ * http://cs.unibo.it/helm/. *) -(* 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 debug_print = ignore (*prerr_endline *) + +(* let debug_print = fun _ -> () *) + +let new_experimental_hint = + let profile = CicUtil.profile "new_experimental_hint" in + fun ~dbd ~facts ?signature ~universe status -> + profile (MetadataQuery.new_experimental_hint ~dbd ~facts ?signature ~universe) status +(* 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 + | NotYetInspected + +let inspected_goals = Hashtbl.create 503;; let search_theorems_in_context status = let (proof, goal) = status in @@ -57,286 +54,242 @@ let search_theorems_in_context status = 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) + 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 -> [] ;; -let depth = 6;; -let new_search_theorems f proof goal depth gtl sign = +let compare_goals 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 new_search_theorems f dbd proof goal depth sign = let choices = f (proof,goal) in List.map - (function (proof, goallist) -> - (proof,(List.map (function g -> (g,depth)) goallist)@gtl, sign)) + (function (subst,(proof, goallist)) -> + (* let goallist = reorder_goals dbd sign proof goallist in *) + let goallist = List.sort (compare_goals proof) goallist in + (subst,(proof,(List.map (function g -> (g,depth)) goallist), 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 *) - (* - prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty)); - prerr_endline ("CURRENT PROOF = " ^ (CicPp.ppterm p)); - prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey))); + +let is_in_metasenv goal metasenv = + try + let (_, ey ,ty) = + CicUtil.lookup_meta goal metasenv in + true + with CicUtil.Meta_not_found _ -> 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 already_seen_goals = ty::already_seen_goals in + let facts = (depth = 1) in + let _,metasenv,p,_ = proof in + (* first of all we check if the goal has been already + inspected *) + assert (is_in_metasenv goal metasenv); + 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,_) -> + (* + debug_print "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; + debug_print (CicPp.ppterm ty); *) - (* 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 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) -> + (* debug_print "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 = " ^ CicPp.ppcontext 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 + search_theorems_in_context dbd + 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. *) + List.map snd + (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 - (match (auto dbd all_choices) + 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 already_seen_goals universe sorted_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 + [] -> + (* 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 + debug_print ("ty = "^CicPp.ppterm ty); + debug_print ("cty = "^CicPp.ppterm cty); + assert false + end + Hashtbl.add inspected_goals + ty (Yes (meta_proof,depth)); + end; +*) + end; + (subst,(proof,[],sign))::tl1 | _ -> assert false) - | None -> auto dbd ((proof,gtl,sign)::tl) -;; - - -let auto_tac ~(dbd:Mysql.dbd) = - let auto_tac dbh (proof,goal) = - prerr_endline "Entro in Auto"; - match (auto dbd [(proof, [(goal,depth)],None)]) with - [] -> prerr_endline("Auto failed"); - raise (ProofEngineTypes.Fail "No Applicable theorem") - | (proof,[],_)::_ -> - prerr_endline "AUTO_TAC HA FINITO"; - (proof,[]) - | _ -> assert false - in - ProofEngineTypes.mk_tactic (auto_tac dbd) -;; - + end + +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 CicUtil.Meta_not_found _ -> false + in + let goals'= List.filter is_in_metasenv goals in + auto_new_aux dbd + width already_seen_goals universe ((subst,(proof, goals', sign))::tl) -(************************** EXPERIMENTAL VERSION ****************************) - -(* 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 - | NotYetInspected - -let inspected_goals = Hashtbl.create 503;; - -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 (PT.apply_tac_verbose ~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 new_search_theorems f proof goal depth subst 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))) - choices -;; - -exception NoOtherChoices;; -let rec auto_new dbd = 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 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)); - 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 - | _ -> assert false) - end - | None -> auto_new dbd ((subst,(proof,gtl,sign))::tl) -;; + | (subst,(proof, (goal,0)::_, _))::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 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) universe + with + [] -> 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 + 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 + auto_new dbd width already_seen_goals universe all_choices + | _ -> assert false + ;; +let default_depth = 5 +let default_width = 3 -let auto_tac_new ~(dbd:Mysql.dbd) = +let auto_tac ?(depth=default_depth) ?(width=default_width) ~(dbd:Mysql.dbd) + () += let auto_tac dbd (proof,goal) = + let universe = MetadataQuery.signature_of_goal ~dbd (proof,goal) in Hashtbl.clear inspected_goals; - prerr_endline "Entro in Auto"; + debug_print "Entro in Auto"; let id t = t in - match (auto_new dbd [id,(proof, [(goal,depth)],None)]) with - [] -> prerr_endline("Auto failed"); + match auto_new dbd width [] universe [id,(proof, [(goal,depth)],None)] with + [] -> debug_print("Auto failed"); raise (ProofEngineTypes.Fail "No Applicable theorem") | (_,(proof,[],_))::_ -> - prerr_endline "AUTO_TAC HA FINITO"; + debug_print "AUTO_TAC HA FINITO"; + let _,_,p,_ = proof in + debug_print (CicPp.ppterm p); (proof,[]) | _ -> assert false in