X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FvariousTactics.ml;h=0df44420c99ef25f52511d5a4ba46c1927afc2c8;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=98c13e80b8b742b775df418788b1eaa215fc17e1;hpb=a6fc115fd7d4cfba94a43f001f4c27322d3db1a8;p=helm.git diff --git a/helm/ocaml/tactics/variousTactics.ml b/helm/ocaml/tactics/variousTactics.ml index 98c13e80b..0df44420c 100644 --- a/helm/ocaml/tactics/variousTactics.ml +++ b/helm/ocaml/tactics/variousTactics.ml @@ -23,6 +23,34 @@ * 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 search_theorems_in_context status = let (proof, goal) = status in let module C = Cic in @@ -51,53 +79,89 @@ let search_theorems_in_context status = prerr_endline ("SIAM QUI = " ^ s); [] ;; - +exception NotAProposition;; exception NotApplicableTheorem;; exception MaxDepth;; -let depth = 5;; +let depth = 3;; -let rec auto_tac mqi_handle level proof goal = -prerr_endline "Entro in Auto_rec"; +(* +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 (* (proof, [goal]) *) - (prerr_endline ("NON ci credo"); + (prerr_endline ("MaxDepth"); raise MaxDepth) else - (* choices is a list of pairs proof and goallist *) - let choices = - (search_theorems_in_context (proof,goal))@ - (TacticChaser.searchTheorems mqi_handle (proof,goal)) - in - let rec try_choices = function - [] -> raise NotApplicableTheorem - | (proof,goallist)::tl -> + (* let us verify that the metavariable is still an open goal -- + it could have been closed by closing other goals -- and that + it is of sort Prop *) + 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 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 + current proof and a list containing the goal *) + let ty_sort = CicTypeChecker.type_of_aux' metasenv ey ty in + if CicReduction.are_convertible + ey (Cic.Sort Cic.Prop) ty_sort then + (* sort Prop *) + (* choices is a list of pairs proof and goallist *) + let choices = + (search_theorems_in_context (proof,goal))@ + (TacticChaser.searchTheorems mqi_handle (proof,goal)) + in + let rec try_choices = function + [] -> raise NotApplicableTheorem + | (proof,goallist)::tl -> prerr_endline ("GOALLIST = " ^ string_of_int (List.length goallist)); - (try - List.fold_left - (fun proof goal -> - (* It may happen that to close the first open goal - also some other goals are closed *) - let _,metasenv,_,_ = proof in - if List.exists (fun (i,_,_) -> i = goal) metasenv then - let newproof = - auto_tac mqi_handle (level-1) proof goal - in - newproof - else - (* goal already closed *) - proof) - proof goallist - with - | MaxDepth - | NotApplicableTheorem -> - try_choices tl) in - try_choices choices;; + (try + List.fold_left + (fun proof goal -> + auto_tac_aux mqi_handle (level-1) proof goal) + proof goallist + with + | MaxDepth + | NotApplicableTheorem + | NotAProposition -> + try_choices tl) in + try_choices choices + else + (* CUT AND PASTE DI PROVA !! *) + let choices = + (search_theorems_in_context (proof,goal))@ + (TacticChaser.searchTheorems mqi_handle (proof,goal)) + in + let rec try_choices = function + [] -> raise NotApplicableTheorem + | (proof,[])::tl -> proof + | _::tl -> try_choices tl in + try_choices choices + (* raise NotAProposition *) + | None -> proof +;; let auto_tac mqi_handle (proof,goal) = prerr_endline "Entro in Auto"; try - let proof = auto_tac mqi_handle depth proof goal in + let proof = auto_tac_aux mqi_handle depth proof goal in prerr_endline "AUTO_TAC HA FINITO"; (proof,[]) with @@ -105,6 +169,59 @@ prerr_endline "AUTO_TAC HA FINITO"; | NotApplicableTheorem -> prerr_endline("No applicable theorem"); raise (ProofEngineTypes.Fail "No Applicable theorem");; +*) + +(**** 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 _ -> + 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 reorder = all_choices in + auto_new mqi_handle reorder + | None -> auto_new mqi_handle ((proof,gtl)::tl) +;; + + +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"; + (proof,[]) + with + | NoOtherChoices -> + prerr_endline("Auto failed"); + raise (ProofEngineTypes.Fail "No Applicable theorem");; (* 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