From 1db44a3e28f767afea3b87f21aaeb81c586b1733 Mon Sep 17 00:00:00 2001 From: Claudio Sacerdoti Coen Date: Mon, 27 Jun 2005 12:24:13 +0000 Subject: [PATCH] * auto_tac removed (it can be found in CVS) * auto_tac_new renamed to auto_tac * TacticAst.Auto ported to auto_tac[_new] (i.e. width added) * MetadataQuery.hint removed (only {new_,}experimental_hint were used) --- helm/ocaml/tactics/autoTactic.ml | 128 +-------------------------- helm/ocaml/tactics/autoTactic.mli | 5 +- helm/ocaml/tactics/metadataQuery.ml | 59 ------------ helm/ocaml/tactics/metadataQuery.mli | 8 -- helm/ocaml/tactics/tactics.ml | 1 - helm/ocaml/tactics/tactics.mli | 3 +- 6 files changed, 3 insertions(+), 201 deletions(-) diff --git a/helm/ocaml/tactics/autoTactic.ml b/helm/ocaml/tactics/autoTactic.ml index ea29499a4..d0a44c561 100644 --- a/helm/ocaml/tactics/autoTactic.ml +++ b/helm/ocaml/tactics/autoTactic.ml @@ -32,137 +32,11 @@ let new_experimental_hint = fun ~dbd ~facts ?signature ~universe status -> profile (MetadataQuery.new_experimental_hint ~dbd ~facts ?signature ~universe) status -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 = " ^ CicPp.ppcontext 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) -;; - - -(************************** 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 @@ -396,7 +270,7 @@ and auto_new_aux dbd width already_seen_goals universe = function 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:Mysql.dbd) () = let auto_tac dbd (proof,goal) = diff --git a/helm/ocaml/tactics/autoTactic.mli b/helm/ocaml/tactics/autoTactic.mli index 14627a4a3..90f958e7b 100644 --- a/helm/ocaml/tactics/autoTactic.mli +++ b/helm/ocaml/tactics/autoTactic.mli @@ -24,9 +24,6 @@ * http://cs.unibo.it/helm/. *) -val auto_tac : ?num:int option -> Mysql.dbd -> ProofEngineTypes.tactic - -val auto_tac_new: +val auto_tac: ?depth:int -> ?width:int -> dbd:Mysql.dbd -> unit -> ProofEngineTypes.tactic - diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml index fab96475c..a3e774d1d 100644 --- a/helm/ocaml/tactics/metadataQuery.ml +++ b/helm/ocaml/tactics/metadataQuery.ml @@ -176,65 +176,6 @@ let compare_goal_list proof goal1 goal2 = in prop1 - prop2 -let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) = - let (_, metasenv, _, _) = proof in - let (_, context, ty) = CicUtil.lookup_meta goal metasenv in - let (uris, (main, sig_constants)) = - match signature with - | Some signature -> (Constr.sigmatch ~dbd ~facts signature, signature) - | None -> (Constr.cmatch' ~dbd ~facts ty, Constr.signature_of ty) - in - let uris = List.filter nonvar (List.map snd uris) in - let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in - let types_constants = - match main with - | None -> Constr.UriManagerSet.empty - | Some (main, types) -> - List.fold_right Constr.UriManagerSet.add (main :: types) - Constr.UriManagerSet.empty - in - let hyp_constants = - Constr.UriManagerSet.diff (signature_of_hypothesis context) types_constants - in -(* Constr.UriManagerSet.iter debug_print hyp_constants; *) - let other_constants = Constr.UriManagerSet.union sig_constants hyp_constants in - let uris = - let pow = 2 ** (Constr.UriManagerSet.cardinal other_constants) in - if ((List.length uris < pow) or (pow <= 0)) - then begin -(* debug_print "MetadataQuery: large sig, falling back to old method"; *) - filter_uris_forward ~dbd (main, other_constants) uris - end else - filter_uris_backward ~dbd ~facts (main, other_constants) uris - in - let rec aux = function - | [] -> [] - | uri :: tl -> - (let status' = - try - let (proof, goal_list) = -(* debug_print ("STO APPLICANDO " ^ uri); *) - PET.apply_tactic - (PrimitiveTactics.apply_tac - ~term:(CicUtil.term_of_uri uri)) - status - in - let goal_list = - List.stable_sort (compare_goal_list proof) goal_list - in - Some (uri, (proof, goal_list)) - with ProofEngineTypes.Fail _ -> None - in - match status' with - | None -> aux tl - | Some status' -> - status' :: aux tl) - in - List.stable_sort - (fun (_, (_, goals1)) (_, (_, goals2)) -> - Pervasives.compare (List.length goals1) (List.length goals2)) - (aux uris) - (* experimental_hint is a version of hint for experimental purposes. It uses auto_tac_verbose instead of auto tac. Auto_tac verbose also returns a substitution - for the moment diff --git a/helm/ocaml/tactics/metadataQuery.mli b/helm/ocaml/tactics/metadataQuery.mli index 36e0e7497..c4b844537 100644 --- a/helm/ocaml/tactics/metadataQuery.mli +++ b/helm/ocaml/tactics/metadataQuery.mli @@ -35,14 +35,6 @@ val locate: dbd:Mysql.dbd -> ?vars:bool -> string -> UriManager.uri list -val hint: - dbd:Mysql.dbd -> - ?facts:bool -> - ?signature:MetadataConstraints.term_signature -> - ProofEngineTypes.status -> - (UriManager.uri * - (ProofEngineTypes.proof * ProofEngineTypes.goal list)) list - val experimental_hint: dbd:Mysql.dbd -> ?facts:bool -> diff --git a/helm/ocaml/tactics/tactics.ml b/helm/ocaml/tactics/tactics.ml index 60c60c7ff..e67fa5fde 100644 --- a/helm/ocaml/tactics/tactics.ml +++ b/helm/ocaml/tactics/tactics.ml @@ -27,7 +27,6 @@ let absurd = NegationTactics.absurd_tac let apply = PrimitiveTactics.apply_tac let assumption = VariousTactics.assumption_tac let auto = AutoTactic.auto_tac -let auto_new = AutoTactic.auto_tac_new let change = PrimitiveTactics.change_tac let compare = DiscriminationTactics.compare_tac let constructor = IntroductionTactics.constructor_tac diff --git a/helm/ocaml/tactics/tactics.mli b/helm/ocaml/tactics/tactics.mli index 2fbb409cd..d5016dabc 100644 --- a/helm/ocaml/tactics/tactics.mli +++ b/helm/ocaml/tactics/tactics.mli @@ -2,8 +2,7 @@ val absurd : term:Cic.term -> ProofEngineTypes.tactic val apply : term:Cic.term -> ProofEngineTypes.tactic val assumption : ProofEngineTypes.tactic -val auto : ?num:int option -> Mysql.dbd -> ProofEngineTypes.tactic -val auto_new : +val auto : ?depth:int -> ?width:int -> dbd:Mysql.dbd -> unit -> ProofEngineTypes.tactic val change : what:Cic.term -> with_what:Cic.term -> ProofEngineTypes.tactic -- 2.39.2