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
prerr_endline "Entro in search_context";
let _,metasenv,_,_ = proof in
let _,context,ty = CicUtil.lookup_meta goal metasenv in
| hd::tl ->
let res =
try
- Some (PrimitiveTactics.apply_tac status ~term:(C.Rel n))
+ Some (PET.apply_tactic (PT.apply_tac ~term:(C.Rel n)) status )
with
- ProofEngineTypes.Fail _ -> None in
+ PET.Fail _ -> None in
(match res with
Some res -> res::(find (n+1) tl)
| None -> find (n+1) tl)
let depth = 3;;
+(*
let rec auto_tac_aux mqi_handle level proof goal =
prerr_endline ("Entro in Auto_rec; level = " ^ (string_of_int level));
if level = 0 then
Some (ey, ty) ->
prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
- (*
- let time1 = Unix.gettimeofday() in
- let _, all_paths = NewConstraints.prefixes 5 ty in
- let time2 = Unix.gettimeofday() in
- prerr_endline
- (Printf.sprintf "TEMPO DI CALCOLO = %1.3f" (time2 -. time1) );
- prerr_endline
- ("ALL PATHS: n = " ^ string_of_int
- (List.length all_paths));
- prerr_endline (NewConstraints.pp_prefixes all_paths);
- *)
- (* if the goal does not have a sort Prop we return the
+ (* if the goal does not have a sort Prop we return the
current proof and a list containing the goal *)
let ty_sort = CicTypeChecker.type_of_aux' metasenv ey ty in
if CicReduction.are_convertible
| None -> proof
;;
-let auto_tac mqi_handle (proof,goal) =
+let auto_tac mqi_handle =
+ let module PET = ProofEngineTypes in
+ let auto_tac mqi_handle (proof,goal) =
prerr_endline "Entro in Auto";
try
let proof = auto_tac_aux mqi_handle depth proof goal in
-prerr_endline "AUTO_TAC HA FINITO";
- (proof,[])
+ prerr_endline "AUTO_TAC HA FINITO";
+ (proof,[])
with
| MaxDepth -> assert false (* this should happens only if depth is 0 above *)
| NotApplicableTheorem ->
prerr_endline("No applicable theorem");
- raise (ProofEngineTypes.Fail "No Applicable theorem");;
+ raise (ProofEngineTypes.Fail "No Applicable theorem")
+ in
+ PET.mk_tactic (auto_tac mqi_handle)
+;;
+
+*)
+
+(**** ESPERIMENTO ************************)
+
+let new_search_theorems f proof goal depth gtl =
+ let local_choices = f (proof,goal)
+ in
+ List.map
+ (function (proof, goallist) ->
+ (proof, (List.map (function g -> (g,depth)) goallist)@gtl))
+ local_choices
+;;
+
+exception NoOtherChoices;;
+
+let rec auto_new mqi_handle = function
+ [] -> raise NoOtherChoices
+ | (proof, [])::tl -> (proof, [])::tl
+ | (proof, (goal,0)::gtl)::tl -> auto_new mqi_handle tl
+ | (proof, (goal,depth)::gtl)::tl ->
+ let _,metasenv,_,_ = 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) ->
+ prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
+ prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
+ let local_choices =
+ new_search_theorems
+ search_theorems_in_context proof goal (depth-1) gtl in
+ let global_choices =
+ new_search_theorems
+ (TacticChaser.searchTheorems mqi_handle)
+ proof goal (depth-1) gtl in
+ let all_choices =
+ local_choices@global_choices@tl in
+ let sorting_list (_,g1) (_,g2) =
+ let l1 = List.length g1 in
+ let l2 = List.length g2 in
+ if (l1 = l2 && not(l1 = 0)) then
+ (snd(List.nth g2 0)) - (snd(List.nth g1 0))
+ else l1 - l2 in
+ let reorder =
+ List.stable_sort sorting_list all_choices
+ in
+ auto_new mqi_handle reorder
+ | None -> auto_new mqi_handle ((proof,gtl)::tl)
+;;
+
+
+let auto_tac mqi_handle =
+(* CicMetaSubst.reset_counters (); *)
+ let auto_tac mqi_handle (proof,goal) =
+ prerr_endline "Entro in Auto";
+ try
+ let (proof,_)::_ = auto_new mqi_handle [(proof, [(goal,depth)])] in
+ prerr_endline "AUTO_TAC HA FINITO";
+(* CicMetaSubst.print_counters (); *)
+ (proof,[])
+ with
+ | NoOtherChoices ->
+ prerr_endline("Auto failed");
+ raise (ProofEngineTypes.Fail "No Applicable theorem")
+ in
+ ProofEngineTypes.mk_tactic (auto_tac mqi_handle)
+;;
(* TODO se ce n'e' piu' di una, prende la prima che trova... sarebbe meglio
chiedere: find dovrebbe restituire una lista di hyp (?) da passare all'utonto con una
funzione di callback che restituisce la (sola) hyp da applicare *)
-let assumption_tac status =
+let assumption_tac =
+ let module PET = ProofEngineTypes in
+ let assumption_tac status =
let (proof, goal) = status in
let module C = Cic in
let module R = CicReduction in
let module S = CicSubstitution in
+ let module PT = PrimitiveTactics in
let _,metasenv,_,_ = proof in
let _,context,ty = CicUtil.lookup_meta goal metasenv in
let rec find n = function
(CicTypeChecker.type_of_aux' metasenv context (S.lift n t)) ty) -> n
| _ -> find (n+1) tl
)
- | [] -> raise (ProofEngineTypes.Fail "Assumption: No such assumption")
- in PrimitiveTactics.apply_tac status ~term:(C.Rel (find 1 context))
+ | [] -> raise (PET.Fail "Assumption: No such assumption")
+ in PET.apply_tactic (PT.apply_tac ~term:(C.Rel (find 1 context))) status
+ in
+ PET.mk_tactic assumption_tac
;;
(* ANCORA DA DEBUGGARE *)
e li aggiunga nel context, poi si conta la lunghezza di questo nuovo
contesto e si lifta di tot... COSA SIGNIFICA TUTTO CIO'?????? *)
-let generalize_tac
- ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name)
- terms status
-=
- let (proof, goal) = status in
- let module C = Cic in
- let module P = PrimitiveTactics in
- let module T = Tacticals in
- let _,metasenv,_,_ = proof in
- let _,context,ty = CicUtil.lookup_meta goal metasenv in
- let typ =
- match terms with
- [] -> assert false
- | he::tl ->
- (* We need to check that all the convertibility of all the terms *)
- List.iter
- (function t ->
- if not (CicReduction.are_convertible context he t) then
- raise AllSelectedTermsMustBeConvertible
- ) tl ;
- (CicTypeChecker.type_of_aux' metasenv context he)
- in
- T.thens
- ~start:
- (P.cut_tac
- (C.Prod(
- (mk_fresh_name_callback metasenv context C.Anonymous typ),
- typ,
- (ProofEngineReduction.replace_lifting_csc 1
- ~equality:(==)
- ~what:terms
- ~with_what:(List.map (function _ -> C.Rel 1) terms)
- ~where:ty)
- )))
- ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac]
- status
+let generalize_tac
+ ?(mk_fresh_name_callback = FreshNamesGenerator.mk_fresh_name) terms
+ =
+ let module PET = ProofEngineTypes in
+ let generalize_tac mk_fresh_name_callback terms status =
+ let (proof, goal) = status in
+ let module C = Cic in
+ let module P = PrimitiveTactics in
+ let module T = Tacticals in
+ let _,metasenv,_,_ = proof in
+ let _,context,ty = CicUtil.lookup_meta goal metasenv in
+ let typ =
+ match terms with
+ [] -> assert false
+ | he::tl ->
+ (* We need to check that all the convertibility of all the terms *)
+ List.iter
+ (function t ->
+ if not (CicReduction.are_convertible context he t) then
+ raise AllSelectedTermsMustBeConvertible
+ ) tl ;
+ (CicTypeChecker.type_of_aux' metasenv context he)
+ in
+ PET.apply_tactic
+ (T.thens
+ ~start:
+ (P.cut_tac
+ (C.Prod(
+ (mk_fresh_name_callback metasenv context C.Anonymous ~typ:typ),
+ typ,
+ (ProofEngineReduction.replace_lifting_csc 1
+ ~equality:(==)
+ ~what:terms
+ ~with_what:(List.map (function _ -> C.Rel 1) terms)
+ ~where:ty)
+ )))
+ ~continuations: [(P.apply_tac ~term:(C.Rel 1)) ; T.id_tac])
+ status
+ in
+ PET.mk_tactic (generalize_tac mk_fresh_name_callback terms)
;;
projects / helm.git / blobdiff