=
let _, metasenv, subst, _, _, _ = proof in
let _,context,_ = CicUtil.lookup_meta goal metasenv in
- let is_prop m s c t =
- let ty,_ =
- CicTypeChecker.type_of_aux' m ~subst:s c t CicUniv.oblivion_ugraph
- in
- let sort,_ =
- CicTypeChecker.type_of_aux' m ~subst:s c ty CicUniv.oblivion_ugraph
- in
- match CicReduction.whd ~subst c sort with
- | Cic.Sort Cic.Prop | Cic.Sort (Cic.CProp _) -> true
- | _ -> false
- in
let add_list_to_tables metasenv subst automation_cache ct =
- let _,_,bag = automation_cache.AutomationCache.tables in
- let maxmeta = Equality.maxmeta bag in
- List.fold_left
- (fun (c,maxmeta) (t,ty) ->
- let head, metasenv, args, maxmeta =
- TermUtil.saturate_term maxmeta metasenv context ty 0
- in
- if List.exists (is_prop metasenv subst context) args then
- c,maxmeta
- else
- let st = if args = [] then t else Cic.Appl (t::args) in
- AutomationCache.add_term_to_active
- c metasenv [] context st (Some head), maxmeta)
- (automation_cache,maxmeta) ct
+ List.fold_left
+ (fun automation_cache (t,_) ->
+ AutomationCache.add_term_to_active automation_cache
+ metasenv subst context t None)
+ automation_cache ct
in
if restricted_univ = [] then
let ct =
in
let cache = AutoCache.cache_empty in
let cache = cache_add_list cache context (ct@lt) in
- let automation_cache, _ = add_list_to_tables metasenv subst automation_cache ct
+ let automation_cache =
+ add_list_to_tables metasenv subst automation_cache ct
in
- (* AutomationCache.pp_cache automation_cache; *)
+(* AutomationCache.pp_cache automation_cache; *)
automation_cache.AutomationCache.univ,
automation_cache.AutomationCache.tables,
cache
else
- let metasenv, t_ty, s_t_ty, _ =
- List.fold_left
- (fun (metasenv as orig,acc, sacc, maxmeta) t ->
- let ty, _ =
- CicTypeChecker.type_of_aux'
- metasenv ~subst:[] context t CicUniv.oblivion_ugraph
- in
- let head, metasenv, args, maxmeta =
- TermUtil.saturate_term maxmeta metasenv context ty 0
- in
- if List.exists (is_prop metasenv subst context) args then
- orig, (t,ty)::acc, sacc, maxmeta
- else
- let st = if args = [] then t else Cic.Appl (t::args) in
- metasenv, (t, ty)::acc, (st,head)::sacc, maxmeta)
- (metasenv, [],[], CicMkImplicit.new_meta metasenv subst) restricted_univ
+ let t_ty =
+ List.map
+ (fun t ->
+ let ty, _ = CicTypeChecker.type_of_aux'
+ metasenv ~subst:[] context t CicUniv.oblivion_ugraph
+ in
+ t, ty)
+ restricted_univ
in
(* let automation_cache = AutomationCache.empty () in *)
let automation_cache =
{ automation_cache with AutomationCache.univ = universe }
in
let ct =
- if use_context then find_context_theorems context metasenv else []
- in
- let automation_cache, _ = add_list_to_tables metasenv subst automation_cache ct
+ if use_context then find_context_theorems context metasenv else t_ty
in
- (* proviamo a tenere tutte le equazioni
let automation_cache =
- List.fold_left
- (fun c (t,ty) ->
- AutomationCache.add_term_to_active c metasenv [] context t (Some ty))
- automation_cache s_t_ty
- in *)
+ add_list_to_tables metasenv subst automation_cache ct
+ in
(* AutomationCache.pp_cache automation_cache; *)
automation_cache.AutomationCache.univ,
automation_cache.AutomationCache.tables,
- (* cache_add_list cache_empty context t_ty *)
cache_empty
;;
- (*
-(* let signature = MetadataQuery.signature_of metasenv goal in *)
-(* let newmeta = CicMkImplicit.new_meta metasenv [] in *)
- let equations =
- retrieve_equations dont_filter (* true *) signature universe cache context metasenv
- in
- debug_print
- (lazy ("ho trovato equazioni n. "^(string_of_int (List.length equations))));
- let eqs_and_types =
- HExtlib.filter_map
- (fun t ->
- let ty,_ =
- CicTypeChecker.type_of_aux'
- metasenv context t CicUniv.oblivion_ugraph
- in
- (* retrieve_equations could also return flexible terms *)
- if is_an_equality ty then Some(t,ty)
- else
- try
- let ty' = unfold context ty in
- if is_an_equality ty' then Some(t,ty') else None
- with ProofEngineTypes.Fail _ -> None)
- equations
- in
- let bag = Equality.mk_equality_bag () in
- let units, other_equalities, newmeta =
- partition_unit_equalities context metasenv newmeta bag eqs_and_types
- in
- (* SIMPLIFICATION STEP
- let equalities =
- let env = (metasenv, context, CicUniv.oblivion_ugraph) in
- let eq_uri = HExtlib.unopt (LibraryObjects.eq_URI()) in
- Saturation.simplify_equalities bag eq_uri env units
- in
- *)
- let passive = Saturation.make_passive units in
- let no = List.length units in
- let active = Saturation.make_active [] in
- let active,passive,newmeta =
- if paramod then active,passive,newmeta
- else
- Saturation.pump_actives
- context bag newmeta active passive (no+1) infinity
- in
- (active,passive,bag),cache,newmeta
-*)
-let fill_hypothesis context metasenv term tables (universe:Universe.universe) cache auto fast =
+let fill_hypothesis context metasenv subst term tables (universe:Universe.universe) cache auto fast =
let actives, passives, bag = tables in
let bag, head, metasenv, args =
- Equality.saturate_term bag metasenv context term
+ Equality.saturate_term bag metasenv subst context term
in
let tables = actives, passives, bag in
let propositional_args =
results,cache,tables
;;
-let build_equalities auto context metasenv tables universe cache equations =
+let build_equalities auto context metasenv subst tables universe cache equations =
List.fold_left
(fun (tables,facts,cache) (t,ty) ->
(* in any case we add the equation to the cache *)
let cache = AutoCache.cache_add_list cache context [(t,ty)] in
try
let saturated, cache, tables =
- fill_hypothesis context metasenv ty tables universe cache auto true
+ fill_hypothesis context metasenv subst ty tables universe cache auto true
in
let eqs, tables =
List.fold_left
let close_more tables context status auto universe cache =
let proof, goalno = status in
- let _, metasenv,_subst,_,_, _ = proof in
+ let _, metasenv,subst,_,_, _ = proof in
let signature = MetadataQuery.signature_of metasenv goalno in
let equations =
retrieve_equations false signature universe cache context metasenv
if is_an_equality ty then Some(t,ty) else None)
equations in
let tables, units, cache =
- build_equalities auto context metasenv tables universe cache eqs_and_types
+ build_equalities auto context metasenv subst tables universe cache eqs_and_types
in
let active,passive,bag = tables in
let passive = Saturation.add_to_passive units passive in
let module C = Cic in
let module S = CicSubstitution in
let module T = CicTypeChecker in
- let _,metasenv,_subst,_,_, _ = proof in
+ let _,metasenv,subst,_,_, _ = proof in
(* if use_auto is true, we try to close the hypothesis of equational
statements using auto; a naif, and probably wrong approach *)
let rec aux tables cache index = function
(try
let term = S.lift index term in
let saturated, cache, tables =
- fill_hypothesis context metasenv term
+ fill_hypothesis context metasenv subst term
tables universe cache default_auto false
in
let actives, passives, bag = tables in
automation_cache univ (proof'''',newmeta)
in
match
- Saturation.given_clause bag (proof'''',newmeta) active passive
- 1 0 infinity
+ Saturation.solve_narrowing bag (proof'''',newmeta) active passive
+ 1 (*0 infinity*)
with
| None, active, passive, bag ->
raise (ProofEngineTypes.Fail (lazy ("paramod fails")))
1,0,flags.timeout
in
match
- Saturation.given_clause bag status active passive
- goal_steps saturation_steps timeout
+ Saturation.solve_narrowing bag status active passive goal_steps
with
| None, active, passive, bag ->
[], (active,passive,bag), cache, flags
projects / helm.git / blobdiff