open AutoTypes;;
open AutoCache;;
-let debug = true;;
+let debug = false;;
let debug_print s =
if debug then prerr_endline (Lazy.force s);;
let elems = ref [] ;;
(* closing a term w.r.t. its metavariables
- very naif version: it does not take dependencies into account *)
+ very naif version: it does not take dependencies properly into account *)
-let naif_closure t metasenv context =
+let naif_closure ?(prefix_name="xxx_") t metasenv context =
let metasenv = ProofEngineHelpers.sort_metasenv metasenv in
let n = List.length metasenv in
let what = List.map (fun (i,cc,ty) -> Cic.Meta(i,[])) metasenv in
let _, t =
List.fold_left
(fun (n,t) (_,cc,ty) ->
- n-1, Cic.Lambda(Cic.Name ("x_"^string_of_int n),
+ n-1, Cic.Lambda(Cic.Name (prefix_name^string_of_int n),
CicSubstitution.lift n ty,t))
(n-1,body) metasenv
in
t
;;
+
+let lambda_close ?prefix_name t menv ctx =
+ let t = naif_closure ?prefix_name t menv ctx in
+ List.fold_left
+ (fun t -> function
+ | None -> CicSubstitution.subst (Cic.Implicit None) t (* delift *)
+ | Some (name, Cic.Decl ty) -> Cic.Lambda (name, ty, t)
+ | Some (name, Cic.Def (bo, _)) -> Cic.LetIn (name, bo, t))
+ t ctx
+;;
(* functions for retrieving theorems *)
(proof'',goal)
in
let goal = match goals with [g] -> g | _ -> assert false in
- let subst, (proof'''', _), _ =
- PrimitiveTactics.apply_with_subst ~term:term'' ~subst:[] (proof''',goal)
+ let proof'''', _ =
+ ProofEngineTypes.apply_tactic
+ (PrimitiveTactics.apply_tac term'')
+ (proof''',goal)
in
match
let (active, passive,bag), cache, maxmeta =
- init_cache_and_tables dbd flags.use_library true universe (proof'''',newmeta)
+ init_cache_and_tables dbd flags.use_library true universe
+ (proof'''',newmeta)
in
Saturation.given_clause bag maxmeta (proof'''',newmeta) active passive
max_int max_int flags.timeout
| None, _,_,_ ->
raise (ProofEngineTypes.Fail (lazy ("FIXME: propaga le tabelle")))
| Some (_,proof''''',_), active,passive,_ ->
- subst,proof''''',
+ proof''''',
ProofEngineHelpers.compare_metasenvs ~oldmetasenv
~newmetasenv:(let _,m,_subst,_,_, _ = proof''''' in m), active, passive
;;
in
let termty = CicSubstitution.subst_vars exp_named_subst_diff termty in
let goal_arity = count_prods context ty in
- let subst, proof, gl, active, passive =
+ let proof, gl, active, passive =
new_metasenv_and_unify_and_t dbd flags universe proof goal ?tables
newmeta' metasenv' context term' ty termty goal_arity
in
- subst, proof, gl, active, passive
+ proof, gl, active, passive
;;
(****************** AUTO ********************)
* step *)
| S of goal * AutoCache.cache_key * candidate * int
type elem =
- (* menv, subst, size, operations to do, failures to cache if any op fails *)
- menv * subst * int * op list * fail list
+ (* menv, subst, size, operations done (only S), operations to do, failures to cache if any op fails *)
+ menv * subst * int * op list * op list * fail list
type status =
(* list of computations that may lead to the solution: all op list will
* end with the same (S(g,_)) *)
(* the status exported to the external observer *)
type auto_status =
(* context, (goal,candidate) list, and_list, history *)
- Cic.context * (Cic.term * (int * Cic.term) list) list *
- Cic.term list * Cic.term list
+ Cic.context * (int * Cic.term * bool * int * (int * Cic.term) list) list *
+ (int * Cic.term * int) list * Cic.term list
let d_prefix l =
let rec aux acc = function
in
let rec aux = function
| [] -> ()
- | (m,s,ol,fl)::tl ->
+ | (m,s,_,_,ol,fl)::tl ->
Printf.eprintf "< [%s] ;;; [%s]>\n"
(string_of_ol m s ol) (string_of_fl m s fl);
aux tl
let get_auto_status _ =
let status = !auto_status in
-(*
- debug_print "status:";
- List.iter (fun ((cand,ty),_,_,gl) ->
- Printf.eprintf "cand: %s; ty: %s; gl: %d\n"
- (CicPp.ppterm cand) (CicPp.ppterm ty) (List.length gl)) status;
-*)
let and_list,elems,last =
match status with
| [] -> [],[],[]
- | (m,s,_,gl,fail)::tl ->
+ | (m,s,_,don,gl,fail)::tl ->
let and_list =
- List.map snd
- (HExtlib.filter_map
- (fun g -> calculate_goal_ty g s m) (d_goals gl))
+ HExtlib.filter_map
+ (fun (id,d,_ as g) ->
+ match calculate_goal_ty g s m with
+ | Some (_,x) -> Some (id,x,d) | None -> None)
+ (d_goals gl)
in
let rows =
(* these are the S goalsin the or list *)
let orlist =
List.map
- (fun (m,s,_,gl,fail) ->
+ (fun (m,s,_,don,gl,fail) ->
HExtlib.filter_map
- (function S (g,k,c,_) -> Some (g,k,c) | _ -> None) gl)
+ (function S (g,k,c,_) -> Some (g,k,c) | _ -> None)
+ (List.rev don @ gl))
status
in
(* this function eats id from a list l::[id,x] returning x, l *)
let eat_tail_if_eq id l =
- match (List.rev l) with
- | ((id1,_,_),k1,c)::tl when id = id1 -> Some c, List.rev tl
- | _ -> None, l
+ let rec aux (s, l) = function
+ | [] -> s, l
+ | ((id1,_,_),k1,c)::tl when id = id1 ->
+ (match s with
+ | None -> aux (Some c,l) tl
+ | Some _ -> assert false)
+ | ((id1,_,_),k1,c as e)::tl -> aux (s, e::l) tl
+ in
+ let c, l = aux (None, []) l in
+ c, List.rev l
in
let eat_in_parallel id l =
- let rec aux (eaten, new_l as acc) l =
+ let rec aux (b,eaten, new_l as acc) l =
match l with
| [] -> acc
| l::tl ->
match eat_tail_if_eq id l with
- | None, l -> aux (eaten, new_l@[l]) tl
- | Some t,l -> aux (eaten@[t], new_l@[l]) tl
+ | None, l -> aux (b@[false], eaten, new_l@[l]) tl
+ | Some t,l -> aux (b@[true],eaten@[t], new_l@[l]) tl
in
- aux ([],[]) l
+ aux ([],[],[]) l
in
let rec eat_all rows l =
match l with
| [] -> rows
| elem::or_list ->
match List.rev elem with
- | ((to_eat,_,_),k,_)::next_lunch ->
- let eaten, l = eat_in_parallel to_eat l in
+ | ((to_eat,depth,_),k,_)::next_lunch ->
+ let b, eaten, l = eat_in_parallel to_eat l in
let eaten = HExtlib.list_uniq eaten in
- let rows = rows @ [k,eaten] in
+ let eaten = List.rev eaten in
+ let b = true (* List.hd (List.rev b) *) in
+ let rows = rows @ [to_eat,k,b,depth,eaten] in
eat_all rows l
| [] -> eat_all rows or_list
in
- eat_all [] orlist
+ eat_all [] (List.rev orlist)
in
let history =
HExtlib.filter_map
let eat_head todo id fl orlist =
let rec aux acc = function
| [] -> [], acc
- | (m, s, _, todo1, fl1)::tl as orlist ->
+ | (m, s, _, _, todo1, fl1)::tl as orlist ->
let rec aux1 todo1 =
match first_s todo1 with
| None -> orlist, acc
else (* cache_add_success cache key closed_proof *)
(debug_print (lazy ("NO CACHE: (no gree proof)"));cache)
in
- cache, orlist, fl
+ cache, orlist, fl, true
else
let cache =
debug_print (lazy ("TENTATIVE CACHE: " ^ CicPp.ppterm gty));
| CicTypeChecker.TypeCheckerFailure _ ->*)
(debug_print (lazy ("NO CACHE: (no green gty )"));cache)
in
- cache, orlist, fl
+ cache, orlist, fl, false
;;
let close_failures (fl : fail list) (cache : cache) =
List.fold_left
let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
subst, metasenv
;;
-let mk_fake_proof metasenv (goalno,_,_) goalty context =
- None,metasenv,[],Cic.Meta(goalno,mk_irl context),goalty, []
+let mk_fake_proof metasenv subst (goalno,_,_) goalty context =
+ None,metasenv,subst ,Cic.Meta(goalno,mk_irl context),goalty, []
;;
let equational_case
tables maxm cache depth fake_proof goalno goalty subst context
=
let ppterm = ppterm context in
try
- let subst', ((_,metasenv,_subst,_,_, _), open_goals), maxmeta =
- PrimitiveTactics.apply_with_subst
- ~maxmeta:maxm ~term:cand ~subst (fake_proof,goalno)
+ let subst,((_,metasenv,_,_,_,_), open_goals),maxmeta =
+ (PrimitiveTactics.apply_with_subst ~subst ~maxmeta:maxm ~term:cand)
+ (fake_proof,goalno)
in
debug_print (lazy (" OK: " ^ ppterm cand));
let metasenv = CicRefine.pack_coercion_metasenv metasenv in
- let subst = subst' in
let open_goals = order_new_goals metasenv subst open_goals ppterm in
let open_goals = List.map (fun (x,sort) -> x,depth-1,sort) open_goals in
incr candidate_no;
;;
let sort_new_elems =
- List.sort (fun (_,_,_,l1) (_,_,_,l2) -> List.length l1 - List.length l2)
+ List.sort (fun (_,_,_,l1) (_,_,_,l2) -> List.length l1 - List.length l2)
+(* List.sort (fun (_,_,_,l2) (_,_,_,l1) -> List.length l1 - List.length l2) *)
;;
let applicative_case
universe flags m s g gty tables cache maxm context
=
let goalno, depth, sort = g in
- let fake_proof = mk_fake_proof m g gty context in
+ let fake_proof = mk_fake_proof m s g gty context in
if is_equational_case gty flags then
let elems,tables,cache,maxm1, flags =
equational_case tables maxm cache
in
elems, tables, cache, maxm, flags
;;
-let rec first_s_cand = function
- | [] -> 0
- | S (_,_,(i,_),_):: _ -> i
- | _::tl -> first_s_cand tl
+let rec condition_for_hint i = function
+ | [] -> false
+ | S (_,_,(j,_),_):: tl -> j <> i (* && condition_for_hint i tl *)
+ | _::tl -> condition_for_hint i tl
;;
let remove_s_from_fl (id,_,_) (fl : fail list) =
let rec aux = function
in
aux fl
;;
+let prunable ty todo =
+ let rec aux b = function
+ | (S(_,k,_,_))::tl -> aux (b || Equality.meta_convertibility k ty) tl
+ | (D (_,_,T))::tl -> aux b tl
+ | D _::_ -> false
+ | [] -> b
+ in
+ aux false todo
+;;
+
let auto_main tables maxm context flags universe cache elems =
auto_context := context;
let rec aux tables maxm flags cache (elems : status) =
-(* pp_status context elems; *)
+(* pp_status context elems; *)
match elems with
| [] ->
(* complete failure *)
Gaveup (tables, cache, maxm)
- | (m, s, _, [],_)::orlist ->
+ | (m, s, _, _, [],_)::orlist ->
(* complete success *)
Proved (m, s, orlist, tables, cache, maxm)
- | (m, s, size, (D (_,_,T))::todo, fl)::orlist ->
+ | (m, s, size, don, (D (_,_,T))::todo, fl)::orlist ->
(* skip since not Prop, don't even check if closed by side-effect *)
- aux tables maxm flags cache ((m, s, size, todo, fl)::orlist)
- | (m, s, size, (S(g, key, c,minsize))::todo, fl)::orlist ->
+ aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist)
+ | (m, s, size, don, (S(g, key, c,minsize) as op)::todo, fl)::orlist ->
(* partial success, cache g and go on *)
- let cache, orlist, fl =
+ let cache, orlist, fl, sibling_pruned =
add_to_cache_and_del_from_orlist_if_green_cut
g s m cache key todo orlist fl context size minsize
in
debug_print (lazy (AutoCache.cache_print context cache));
let fl = remove_s_from_fl g fl in
- aux tables maxm flags cache ((m, s, size, todo, fl)::orlist)
- | (m, s, size, todo, fl)::orlist
+ let don = if sibling_pruned then don else op::don in
+ aux tables maxm flags cache ((m, s, size, don, todo, fl)::orlist)
+ | (m, s, size, don, todo, fl)::orlist
when List.length(prop_only (d_goals todo)) > flags.maxwidth ->
debug_print (lazy ("FAIL: WIDTH"));
(* too many goals in and generated by last th *)
let cache = close_failures fl cache in
aux tables maxm flags cache orlist
- | (m, s, size, todo, fl)::orlist
- when size > flags.maxsize ->
- debug_print (lazy ("FAIL: SIZE"));
+ | (m, s, size, don, todo, fl)::orlist when size > flags.maxsize ->
+ debug_print
+ (lazy ("FAIL: SIZE: "^string_of_int size ^
+ " > " ^ string_of_int flags.maxsize ));
(* we already have a too large proof term *)
let cache = close_failures fl cache in
aux tables maxm flags cache orlist
| _ when Unix.gettimeofday () > flags.timeout ->
(* timeout *)
- debug_print (lazy ("FAIL: SIZE"));
+ debug_print (lazy ("FAIL: TIMEOUT"));
Gaveup (tables, cache, maxm)
- | (m, s, size, (D (gno,depth,P as g))::todo, fl)::orlist as status ->
+ | (m, s, size, don, (D (gno,depth,P as g))::todo, fl)::orlist as status ->
(* attack g *)
match calculate_goal_ty g s m with
| None ->
(* closed by side effect *)
debug_print (lazy ("SUCCESS: SIDE EFFECT: " ^ string_of_int gno));
- aux tables maxm flags cache ((m,s,size,todo, fl)::orlist)
+ aux tables maxm flags cache ((m,s,size,don,todo, fl)::orlist)
| Some (canonical_ctx, gty) ->
+ let gsize, _ =
+ Utils.weight_of_term ~count_metas_occurrences:true gty
+ in
+ if gsize > flags.maxgoalsizefactor then
+ (debug_print (lazy ("FAIL: SIZE: goal: "^string_of_int size));
+ aux tables maxm flags cache orlist)
+ else
(* still to be proved *)
- debug_print (lazy ("EXAMINE: "^CicPp.ppterm gty));
- debug_print (lazy (AutoCache.cache_print context cache));
+ (debug_print (lazy ("EXAMINE: "^CicPp.ppterm gty));
match cache_examine cache gty with
| Failed_in d when d >= depth ->
(* fail depth *)
| Succeded t ->
debug_print (lazy ("SUCCESS: CACHE HIT: " ^ string_of_int gno));
let s, m = put_in_subst s m g canonical_ctx t gty in
- aux tables maxm flags cache ((m, s, size, todo, fl)::orlist)
+ aux tables maxm flags cache ((m, s, size, don,todo, fl)::orlist)
| Notfound
| Failed_in _ when depth > 0 ->
(match !hint with
- | Some i when first_s_cand todo <> i ->
+ | Some i when condition_for_hint i todo ->
aux tables maxm flags cache orlist
| _ -> hint := None;
(* more depth or is the first time we see the goal *)
+ if prunable gty todo then
+ (debug_print (lazy(
+ "FAIL: LOOP: one father is equal"));
+ aux tables maxm flags cache orlist)
+ else
let cache = cache_add_underinspection cache gty depth in
auto_status := status;
check_pause ();
debug_print
(lazy ("INSPECTING: " ^
- string_of_int gno ^ "("^ string_of_int size ^ "): "^CicPp.ppterm gty));
+ string_of_int gno ^ "("^ string_of_int size ^ "): "^
+ CicPp.ppterm gty));
(* elems are possible computations for proving gty *)
let elems, tables, cache, maxm, flags =
equational_and_applicative_case
| [] -> assert false
| (cand,m,s,gl)::[] ->
(* in the last one we add the failure *)
- let todo = inj_gl gl @ (S(g,gty,cand,size+1))::todo in
+ let todo =
+ inj_gl gl @ (S(g,gty,cand,size+1))::todo
+ in
(* we are the last in OR, we fail on g and
* also on all failures implied by g *)
- (m,s, size + size_gl gl, todo, (g,gty)::fl) :: orlist
+ (m,s, size + size_gl gl, don, todo, (g,gty)::fl)
+ :: orlist
| (cand,m,s,gl)::tl ->
(* we add the S step after gl and before todo *)
- let todo = inj_gl gl @ (S(g,gty,cand,size+1))::todo in
+ let todo =
+ inj_gl gl @ (S(g,gty,cand,size+1))::todo
+ in
(* since we are not the last in OR, we do not
* imply failures *)
- (m,s, size + size_gl gl, todo, []) :: map tl
+ (m,s, size + size_gl gl, don, todo, []) :: map tl
in
map elems
in
(* no more depth *)
debug_print (lazy ("FAIL: DEPTH: " ^ string_of_int gno));
let cache = close_failures fl cache in
- aux tables maxm flags cache orlist
+ aux tables maxm flags cache orlist)
in
(aux tables maxm flags cache elems : auto_result)
;;
-(*
-let rec auto_main tables maxm context flags elems universe cache =
- auto_context := context;
- let flags = calculate_timeout flags in
- let ppterm = ppterm context in
- let irl = mk_irl context in
- let rec aux flags tables maxm cache elems status =
- match elems with (* elems in OR *)
- | [] -> Fail "no more steps can be done", tables, cache, maxm
- (*COMPLETE FAILURE*)
- | (p ,metasenv,subst,[])::tl ->
- Success (p,metasenv,subst,tl), tables, cache,maxm (* solution::cont *)
- | (_,metasenv,subst,goals)::tl when
- List.length (List.filter prop goals) > flags.maxwidth ->
- debug_print
- (lazy (" FAILURE(width): " ^ string_of_int (List.length goals)));
- aux flags tables maxm cache tl (List.tl status) (* FAILURE (width) *)
- | (p,metasenv,subst,((goalno,depth,sort) as elem)::gl)::tl ->
- let (_,_,_,_::gl_status)::tl_status = status in
- if Unix.gettimeofday() > flags.timeout then
- Fail "timeout",tables,cache,maxm
- else
- try
- let _,cc,goalty = CicUtil.lookup_meta goalno metasenv in
- let id,_,_ = p in
- debug_print
- (lazy ("INSPECTING " ^ string_of_int goalno^
- ":"^"(id="^string_of_int id^")"^ppterm goalty ^
- "with depth"^string_of_int depth));
- debug_print (lazy (AutoCache.cache_print context cache));
- if sort = T (* && tl <> []*) then
- (debug_print
- (lazy (" FAILURE(not in prop)"));
- aux flags tables maxm cache ((p,metasenv,subst,gl)::tl)
- ((p,metasenv,subst,gl)::tl_status))
- else
- match aux_single flags tables maxm universe cache metasenv subst elem
- goalty cc gl_status tl_status p with
- | Fail s, tables, cache, maxm' ->
- let maxm = maxm' in
- debug_print
- (lazy
- (" FAIL "^s^": "^string_of_int goalno^":"^ppterm goalty));
- let cache =
- if flags.dont_cache_failures or s = "hint" then
- cache_remove_underinspection cache goalty
- else
- cache_add_failure cache goalty depth
- in
- aux flags tables maxm cache tl tl_status
- | Success (p1,metasenv,subst,others), tables, cache, maxm' ->
- let maxm = maxm' in
- (* others are alternatives in OR *)
- try
- let goal = Cic.Meta(goalno,irl) in
- let proof = CicMetaSubst.apply_subst subst goal in
- debug_print
- (lazy ("DONE: " ^ ppterm goalty^" with: "^ppterm proof));
- if is_a_green_cut goalty then
- (* assert_proof_is_valid proof metasenv context goalty; *)
- let cache = cache_add_success sort cache goalty proof in
- aux flags tables maxm cache ((p,metasenv,subst,gl)::tl)
- ((p,metasenv,subst,gl)::tl_status)
-
- else
- (let goalty = CicMetaSubst.apply_subst subst goalty in
- (* assert_proof_is_valid proof metasenv context goalty; *)
- let cache =
- if is_a_green_cut goalty then
- cache_add_success sort cache goalty proof
- else
- cache
- in
- let others =
- List.map
- (fun (p,metasenv,subst,goals) ->
- (p,metasenv,subst,goals@gl))
- others
- in
- aux flags tables maxm cache
- ((p,metasenv,subst,gl)::others@tl)
- ((p,metasenv,subst,gl)::others@tl_status)
-
- )
-
- with CicUtil.Meta_not_found i when i = goalno ->
- assert false
- with CicUtil.Meta_not_found i when i = goalno ->
- (* goalno was closed by sideeffect *)
- debug_print
- (lazy ("Goal "^string_of_int goalno^" closed by sideeffect"));
- aux flags tables maxm cache ((p,metasenv,subst,gl)::tl)
- ((p,metasenv,subst,gl)::tl_status)
-
- and aux_single flags tables maxm universe cache metasenv subst (goalno, depth,
- _) goalty cc e l (id,_,_) =
- match !hint with
- | Some id' when id <> id' -> Fail "hint", tables,cache,maxm
- | _ ->
- hint := None;
- (* let flags = if depth < 10 then {flags with maxwidth=3} else flags in *)
- let goalty = CicMetaSubst.apply_subst subst goalty in
-(* else if not (is_in_prop context subst metasenv goalty) then Fail,cache *)
- (* FAILURE (euristic cut) *)
- match cache_examine cache goalty with
- | Failed_in d when d >= depth ->
- Fail ("depth " ^ string_of_int d ^ ">=" ^ string_of_int depth),
- tables,cache,maxm(*FAILURE(depth)*)
- | Succeded t ->
- let entry = goalno, (cc, t,goalty) in
- assert_subst_are_disjoint subst [entry];
- let subst = entry :: subst in
- let metasenv = CicMetaSubst.apply_subst_metasenv subst metasenv in
- debug_print (lazy (" CACHE HIT!"));
- incr candidate_no;
- Success ((!candidate_no,t,goalty),metasenv, subst, []), tables, cache, maxm
- | UnderInspection ->
- (* assert (not (is_a_green_cut goalty)); *)
- Fail "looping",tables,cache, maxm
- | Notfound
- | Failed_in _ when depth > 0 -> (* we have more depth now *)
- let cache = cache_add_underinspection cache goalty depth in
- let fake_proof = None,metasenv,Cic.Meta(goalno,irl),goalty, [] in (* FG: attrs *)
- let elems, tables, cache, maxm, flags =
- if is_equational_case goalty flags then
- let elems,tables,cache,maxm1, flags =
- equational_case tables maxm cache
- depth fake_proof goalno goalty subst context flags in
- let maxm = maxm1 in
- let more_elems, tables, cache, maxm1 =
- if flags.use_only_paramod then
- [],tables, cache, maxm
- else
- applicative_case
- tables maxm depth subst fake_proof goalno
- goalty metasenv context universe cache in
- let maxm = maxm1 in
- elems@more_elems, tables, cache, maxm, flags
- else
- let elems, tables, cache, maxm =
- applicative_case tables maxm depth subst fake_proof goalno
- goalty metasenv context universe cache in
- elems, tables, cache, maxm, flags
- in
- let status =
- List.map (fun (p,m,s,l) -> p,m,s,l@e) elems @ l
- in
- auto_status := status;
- check_pause ();
- let rc = aux flags tables maxm cache elems status in
- debug_print "BACK!";
- rc
- | _ -> Fail "depth = 0",tables,cache,maxm
- in
- aux flags tables maxm cache elems elems
-
-and
-*)
-(*
-let
- auto_all_solutions maxm tables universe cache context metasenv gl flags
-=
- let goals = order_new_goals metasenv [] gl CicPp.ppterm in
- let goals = List.map (fun (x,s) -> x,flags.maxdepth,s) goals in
- let elems = [(0,Cic.Implicit None,Cic.Implicit None), metasenv,[],goals] in
- let rec aux tables maxm solutions cache elems flags =
- match auto_main tables maxm context flags elems universe cache with
- | Fail s,tables,cache,maxm ->debug_print s; solutions,cache,maxm
- | Success (_,metasenv,subst,others),tables,cache,maxm ->
- if Unix.gettimeofday () > flags.timeout then
- ((subst,metasenv)::solutions), cache, maxm
- else
- aux tables maxm ((subst,metasenv)::solutions) cache others flags
- in
- let rc = aux tables maxm [] cache elems flags in
- match rc with
- | [],cache,maxm -> [],cache,maxm
- | solutions,cache,maxm ->
- let solutions =
- HExtlib.filter_map
- (fun (subst,newmetasenv) ->
- let opened =
- ProofEngineHelpers.compare_metasenvs ~oldmetasenv:metasenv ~newmetasenv
- in
- if opened = [] then Some subst else None)
- solutions
- in
- solutions,cache,maxm
-;;
-*)
let
auto_all_solutions maxm tables universe cache context metasenv gl flags
=
List.map
(fun (x,s) -> D (x,flags.maxdepth,s)) goals
in
- let elems = [metasenv,[],1,goals,[]] in
+ let elems = [metasenv,[],1,[],goals,[]] in
let rec aux tables maxm solutions cache elems flags =
match auto_main tables maxm context flags universe cache elems with
| Gaveup (tables,cache,maxm) ->
(* }}} ****************** AUTO ***************)
-(* script generation for applicative proofs
-let cic2grafite context menv t =
- let module PT = CicNotationPt in
- let module GA = GrafiteAst in
- let pp_t context t =
- let names = Utils.names_of_context context in
- CicPp.pp t names
- in
- let sort_of context t =
- let ty,_ =
- CicTypeChecker.type_of_aux' menv context t
- CicUniv.oblivion_ugraph
- in
- let sort,_ = CicTypeChecker.type_of_aux' menv context ty
- CicUniv.oblivion_ugraph
- in
- match sort with
- | Cic.Sort Cic.Prop -> P
- | _ -> T
- in
- let floc = HExtlib.dummy_floc in
- let rec print_term c = function
- | Cic.Rel _
- | Cic.MutConstruct _
- | Cic.MutInd _
- | Cic.Const _ as t ->
- PT.Ident (pp_t c t, None)
- | Cic.Appl l -> PT.Appl (List.map (print_term c) l)
- | Cic.Implicit _ -> PT.Implicit
- | Cic.Lambda (Cic.Name n, s, t) ->
- PT.Binder (`Lambda, (PT.Ident (n,None), Some (print_term c s)),
- print_term (Some (Cic.Name n, Cic.Decl s)::c) t)
- | Cic.Prod (Cic.Name n, s, t) ->
- PT.Binder (`Forall, (PT.Ident (n,None), Some (print_term c s)),
- print_term (Some (Cic.Name n, Cic.Decl s)::c) t)
- | Cic.LetIn (Cic.Name n, s, t) ->
- PT.Binder (`Lambda, (PT.Ident (n,None), Some (print_term c s)),
- print_term (Some (Cic.Name n, Cic.Def (s,None))::c) t)
- | Cic.Meta _ -> PT.Implicit
- | _ as t ->
- PT.Ident ("ERROR"^CicPp.ppterm t, None)
- (*
- debug_print (lazy (CicPp.ppterm t));
- assert false
- *)
- in
- let rec print_proof context = function
- | Cic.Rel _
- | Cic.Const _ as t ->
- [GA.Executable (floc,
- GA.Tactic (floc,
- Some (GA.Apply (floc, print_term context t)), GA.Dot floc))]
- | Cic.Appl (he::tl) ->
- let tl = List.map (fun t -> t, sort_of context t) tl in
- let subgoals =
- HExtlib.filter_map (function (t,P) -> Some t | _ -> None) tl
- in
- let args =
- List.map
- (function
- | (t,P) -> Cic.Implicit None
- | (t,_) -> t)
- tl
- in
- if List.length subgoals > 1 then
- (* branch *)
- [GA.Executable (floc,
- GA.Tactic (floc,
- Some (GA.Apply (floc, print_term context (Cic.Appl (he::args)))),
- GA.Semicolon floc))] @
- [GA.Executable (floc, GA.Tactic (floc, None, GA.Branch floc))] @
- (HExtlib.list_concat
- ~sep:[GA.Executable (floc, GA.Tactic (floc, None,GA.Shift floc))]
- (List.map (print_proof context) subgoals)) @
- [GA.Executable (floc, GA.Tactic (floc, None,GA.Merge floc))]
- else
- (* simple apply *)
- [GA.Executable (floc,
- GA.Tactic (floc,
- Some (GA.Apply
- (floc, print_term context (Cic.Appl (he::args)) )), GA.Dot floc))]
- @
- (match subgoals with
- | [] -> []
- | [x] -> print_proof context x
- | _ -> assert false)
- | _ -> []
- (*
- debug_print (lazy (CicPp.ppterm t));
- assert false
- *)
- in
- let ast = print_proof context t in
- let pp t =
- (* ZACK: setting width to 80 will trigger a bug of BoxPp.render_to_string
- * which will show up using the following command line:
- * ./tptp2grafite -tptppath ~tassi/TPTP-v3.1.1 GRP170-1 *)
- let width = max_int in
- let term_pp content_term =
- let pres_term = TermContentPres.pp_ast content_term in
- let dummy_tbl = Hashtbl.create 1 in
- let markup = CicNotationPres.render dummy_tbl pres_term in
- let s = "(" ^ BoxPp.render_to_string List.hd width markup ^ ")" in
- Pcre.substitute
- ~pat:"\\\\forall [Ha-z][a-z0-9_]*" ~subst:(fun x -> "\n" ^ x) s
- in
- CicNotationPp.set_pp_term term_pp;
- let lazy_term_pp = fun x -> assert false in
- let obj_pp = CicNotationPp.pp_obj CicNotationPp.pp_term in
- GrafiteAstPp.pp_statement ~term_pp ~lazy_term_pp ~obj_pp t
- in
- String.concat "\n" (List.map pp ast)
-;;
-let auto_all tables universe cache context metasenv gl flags =
- let solutions, cache, _ =
- auto_all_solutions 0 tables universe cache context metasenv gl flags
- in
- solutions, cache
-;;
-*)
-
let auto flags metasenv tables universe cache context metasenv gl =
let initial_time = Unix.gettimeofday() in
let goals = order_new_goals metasenv [] gl CicPp.ppterm in
let goals = List.map (fun (x,s) -> D(x,flags.maxdepth,s)) goals in
- let elems = [metasenv,[],1,goals,[]] in
+ let elems = [metasenv,[],1,[],goals,[]] in
match auto_main tables 0 context flags universe cache elems with
| Proved (metasenv,subst,_, tables,cache,_) ->
debug_print(lazy
let depth = int "depth" ((AutoTypes.default_flags()).AutoTypes.maxdepth) in
let width = int "width" ((AutoTypes.default_flags()).AutoTypes.maxwidth) in
let size = int "size" ((AutoTypes.default_flags()).AutoTypes.maxsize) in
+ let gsize = int "gsize" ((AutoTypes.default_flags()).AutoTypes.maxgoalsizefactor) in
let timeout = int "timeout" 0 in
{ AutoTypes.maxdepth =
if use_only_paramod then 2 else depth;
AutoTypes.use_only_paramod = use_only_paramod;
AutoTypes.close_more = close_more;
AutoTypes.dont_cache_failures = false;
+ AutoTypes.maxgoalsizefactor = gsize;
}
let applyS_tac ~dbd ~term ~params ~universe =
ProofEngineTypes.mk_tactic
(fun status ->
try
- let _, proof, gl,_,_ =
+ let proof, gl,_,_ =
apply_smart ~dbd ~term ~subst:[] ~universe
(flags_of_params params ~for_applyS:true ()) status
in
let (_,oldmetasenv,_subst,_,_, _) = proof in
hint := None;
let elem =
- metasenv,[],1,[D (goal,flags.maxdepth,P)],[]
+ metasenv,[],1,[],[D (goal,flags.maxdepth,P)],[]
in
match auto_main tables newmeta context flags universe cache [elem] with
| Proved (metasenv,subst,_, tables,cache,_) ->
prerr_endline
("TIME:"^string_of_float(Unix.gettimeofday()-.initial_time));
- (* script generation
- let irl = mk_irl context in
- let goal_term = Cic.Meta(goal, irl) in
- let proof_term = CicMetaSubst.apply_subst subst goal_term in
- HLog.debug (cic2grafite context metasenv proof_term);
- *)
- let proof,metasenv =
+ let proof,metasenv =
ProofEngineHelpers.subst_meta_and_metasenv_in_proof
proof goal subst metasenv
in
let demodulate_tac ~dbd ~universe =
ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~universe);;
+let pp_proofterm = Equality.pp_proofterm;;
+++ /dev/null
-(* Copyright (C) 2002, HELM Team.
- *
- * This file is part of HELM, an Hypertextual, Electronic
- * Library of Mathematics, developed at the Computer Science
- * Department, University of Bologna, Italy.
- *
- * HELM is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * HELM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HELM; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
- *)
-
-(* $Id$ *)
-
- let debug = false
- let debug_print s = if debug then prerr_endline (Lazy.force s)
-
-(* let debug_print = fun _ -> () *)
-
-(* Profiling code
-let new_experimental_hint =
- let profile = CicUtil.profile "new_experimental_hint" in
- fun ~dbd ~facts ?signature ~universe status ->
- profile.profile (MetadataQuery.new_experimental_hint ~dbd ~facts ?signature ~universe) status
-*) let new_experimental_hint = MetadataQuery.new_experimental_hint
-
-(* 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,_subst,_,_, _ = proof in
- let _,context,ty = CicUtil.lookup_meta goal metasenv in
- let rec find n = function
- | [] -> []
- | hd::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 -> []
-;;
-
-
-let compare_goals proof goal1 goal2 =
- let _,metasenv,_subst,_,_, _ = 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 (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_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,_subst, p,_, _ = proof in
- (* first of all we check if the goal has been already
- inspected *)
- assert (CicUtil.exists_meta 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 (lazy "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- debug_print (lazy (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 *)
- [(goal,(ey, bo, Cic.Implicit None))]
- in
- let _ = assert false in
- let (proof,_) =
- ProofEngineHelpers.subst_meta_and_metasenv_in_proof
- proof goal subst_in metasenv in
- [(CicMetaSubst.apply_subst subst_in,(proof,[],sign))]
- | No d when (d >= depth) ->
- (* debug_print (lazy "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); *)
- [] (* the empty list means no choices, i.e. failure *)
- | No _
- | NotYetInspected ->
- debug_print (lazy ("CURRENT GOAL = " ^ CicPp.ppterm ty));
- debug_print (lazy ("CURRENT PROOF = " ^ CicPp.ppterm p));
- debug_print (lazy ("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 dbd
- proof goal (depth-1) new_sign in
- let global_choices =
- new_search_theorems
- (fun status ->
- 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
- 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
- [] ->
- (* 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 (lazy ("ty = "^CicPp.ppterm ty));
- debug_print (lazy ("cty = "^CicPp.ppterm cty));
- assert false
- end
- Hashtbl.add inspected_goals
- ty (Yes (meta_proof,depth));
- end;
-*)
- end;
- (subst,(proof,[],sign))::tl1
- | _ -> assert false)
- end
-
-and auto_new dbd width already_seen_goals universe = function
- | [] -> []
- | (subst,(proof, goals, sign))::tl ->
- let _,metasenv, _subst, _,_, _ = proof in
- let goals'=
- List.filter (fun (goal, _) -> CicUtil.exists_meta goal metasenv) goals
- in
- auto_new_aux dbd
- width already_seen_goals universe ((subst,(proof, goals', sign))::tl)
-
-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 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,_subst,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_old ?(depth=default_depth) ?(width=default_width) ~(dbd:HSql.dbd)
- ()
-=
- let auto_tac dbd (proof,goal) =
- let universe = MetadataQuery.signature_of_goal ~dbd (proof,goal) in
- Hashtbl.clear inspected_goals;
- debug_print (lazy "Entro in Auto");
- let id t = t in
- let t1 = Unix.gettimeofday () in
- match auto_new dbd width [] universe [id,(proof, [(goal,depth)],None)] with
- [] -> debug_print (lazy "Auto failed");
- raise (ProofEngineTypes.Fail (lazy "No Applicable theorem"))
- | (_,(proof,[],_))::_ ->
- let t2 = Unix.gettimeofday () in
- debug_print (lazy "AUTO_TAC HA FINITO");
- let _,_,_subst,p,_, _ = proof in
- debug_print (lazy (CicPp.ppterm p));
- debug_print (lazy (Printf.sprintf "tempo: %.9f\n" (t2 -. t1)));
- (proof,[])
- | _ -> assert false
- in
- auto_tac dbd
-;;
-
-let bool params name default =
- try
- let s = List.assoc name params in
- if s = "" || s = "1" || s = "true" || s = "yes" || s = "on" then true
- else if s = "0" || s = "false" || s = "no" || s= "off" then false
- else
- let msg = "Unrecognized value for parameter "^name^"\n" in
- let msg = msg^"Accepted values are 1,true,yes,on and 0,false,no,off" in
- raise (ProofEngineTypes.Fail (lazy msg))
- with Not_found -> default
-;;
-
-let string params name default =
- try List.assoc name params with
- | Not_found -> default
-;;
-
-let int params name default =
- try int_of_string (List.assoc name params) with
- | Not_found -> default
- | Failure _ ->
- raise (ProofEngineTypes.Fail (lazy (name ^ " must be an integer")))
-;;
-
-let auto_tac ~params ~(dbd:HSql.dbd) ~universe (proof, goal) =
- (* argument parsing *)
- let int = int params in
- let bool = bool params in
- let oldauto = bool "old" false in
- let use_only_paramod = bool "paramodulation" false in
- let oldauto = if use_only_paramod then false else oldauto in
- let depth = int "depth" ((AutoTypes.default_flags()).AutoTypes.maxdepth) in
- let width = int "width" ((AutoTypes.default_flags()).AutoTypes.maxwidth) in
- if oldauto then
- auto_tac_old ~depth ~width ~dbd () (proof,goal)
- else
- ProofEngineTypes.apply_tactic (Auto.auto_tac ~dbd ~params ~universe) (proof,goal)
-
-let auto_tac ~params ~dbd ~universe=
- ProofEngineTypes.mk_tactic (auto_tac ~params ~dbd ~universe)
-;;
-
-let pp_proofterm = Equality.pp_proofterm;;
projects / helm.git / commitdiff