X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2Fparamodulation%2Fsaturation.ml;h=b3a53d92953f61e2f86dad7baf146deab69dec79;hb=f5943d511ac074948a317bb35b35faa6ad508c4e;hp=351bc11bd0b88f67def8add7000da426cb418c4a;hpb=2d242b51687938075e568d360b93f83a4b0a1ce9;p=helm.git diff --git a/components/tactics/paramodulation/saturation.ml b/components/tactics/paramodulation/saturation.ml index 351bc11bd..b3a53d929 100644 --- a/components/tactics/paramodulation/saturation.ml +++ b/components/tactics/paramodulation/saturation.ml @@ -23,9 +23,9 @@ * http://cs.unibo.it/helm/. *) -(* $Id$ *) +let _profiler = <:profiler<_profiler>>;; -(* <:profiler<"saturation">> *) +(* $Id$ *) open Inference;; open Utils;; @@ -73,7 +73,7 @@ let maxdepth = ref 3;; let maxwidth = ref 3;; type new_proof = - Equality.goal_proof * Equality.proof * Subst.substitution * Cic.metasenv + Equality.goal_proof * Equality.proof * int * Subst.substitution * Cic.metasenv type result = | ParamodulationFailure of string | ParamodulationSuccess of new_proof @@ -106,7 +106,7 @@ module OrderedEquality = struct let compare eq1 eq2 = match Equality.meta_convertibility_eq eq1 eq2 with | true -> 0 - | false -> + | false -> let w1, _, (ty,left, right, _), m1,_ = Equality.open_equality eq1 in let w2, _, (ty',left', right', _), m2,_ = Equality.open_equality eq2 in match Pervasives.compare w1 w2 with @@ -142,10 +142,10 @@ let age_factor = 0.01;; of weight, age and goal-similarity *) -let rec select env goals passive = +let rec select env (goals,_) passive = processed_clauses := !processed_clauses + 1; let goal = - match (List.rev goals) with (_, goal::_)::_ -> goal | _ -> assert false + match (List.rev goals) with goal::_ -> goal | _ -> assert false in let (pos_list, pos_set), passive_table = passive in let remove eq l = List.filter (fun e -> Equality.compare e eq <> 0) l in @@ -342,8 +342,14 @@ let infer env current (active_list, active_table) = (ignore(Indexing.check_target c current "infer1"); ignore(List.map (function current -> Indexing.check_target c current "infer2") active_list)); let new_pos = - let maxm, res = - Indexing.superposition_right !maxmeta env active_table current in + let maxm, copy_of_current = Equality.fix_metas !maxmeta current in + maxmeta := maxm; + let active_table = Indexing.index active_table copy_of_current in + let _ = <:start> in + let maxm, res = + Indexing.superposition_right !maxmeta env active_table current + in + let _ = <:stop> in if Utils.debug_metas then ignore(List.map (function current -> @@ -353,7 +359,8 @@ let infer env current (active_list, active_table) = | [] -> [] | equality::tl -> let maxm, res = - Indexing.superposition_right !maxmeta env table equality in + Indexing.superposition_right ~subterms_only:true !maxmeta env table equality + in maxmeta := maxm; if Utils.debug_metas then ignore @@ -363,16 +370,19 @@ let infer env current (active_list, active_table) = let pos = infer_positive table tl in res @ pos in +(* let maxm, copy_of_current = Equality.fix_metas !maxmeta current in maxmeta := maxm; +*) let curr_table = Indexing.index Indexing.empty current in - let pos = infer_positive curr_table (copy_of_current::active_list) - in + let _ = <:start> in + let pos = infer_positive curr_table ((*copy_of_current::*)active_list) in + let _ = <:stop> in if Utils.debug_metas then ignore(List.map (function current -> Indexing.check_target c current "sup3") pos); - res @ pos + res @ pos in derived_clauses := !derived_clauses + (List.length new_pos); match !maximal_retained_equality with @@ -389,41 +399,17 @@ let infer env current (active_list, active_table) = let check_for_deep_subsumption env active_table eq = let _,_,(eq_ty, left, right, order),metas,id = Equality.open_equality eq in - if id = 14242 then assert false; - let check_subsumed deep l r = let eqtmp = Equality.mk_tmp_equality(0,(eq_ty,l,r,Utils.Incomparable),metas)in match Indexing.subsumption env active_table eqtmp with | None -> false - | Some (s,eq') -> -(* - prerr_endline - ("\n\n " ^ Equality.string_of_equality ~env eq ^ - "\nis"^(if deep then " CONTEXTUALLY " else " ")^"subsumed by \n " ^ - Equality.string_of_equality ~env eq' ^ "\n\n"); -*) - true + | Some _ -> true in let rec aux b (ok_so_far, subsumption_used) t1 t2 = match t1,t2 with | t1, t2 when not ok_so_far -> ok_so_far, subsumption_used | t1, t2 when subsumption_used -> t1 = t2, subsumption_used -(* VERSIONE ERRATA - | Cic.Appl (h1::l),Cic.Appl (h2::l') when h1 = h2 -> - let rc = check_subsumed b t1 t1 in - if rc then - true, true - else if h1 = h2 then - (try - List.fold_left2 - (fun (ok_so_far, subsumption_used) t t' -> - aux true (ok_so_far, subsumption_used) t t') - (ok_so_far, subsumption_used) l l' - with Invalid_argument _ -> false,subsumption_used) - else - false, subsumption_used - | _ -> false, subsumption_used *) | Cic.Appl (h1::l),Cic.Appl (h2::l') -> let rc = check_subsumed b t1 t2 in if rc then @@ -442,20 +428,6 @@ let check_for_deep_subsumption env active_table eq = fst (aux false (true,false) left right) ;; -(* -let check_for_deep env active_table eq = - match Indexing.subsumption env active_table eq with - | None -> false - | Some _ -> true -;; -*) - -let profiler = HExtlib.profile "check_for_deep";; - -let check_for_deep_subsumption env active_table eq = - profiler.HExtlib.profile (check_for_deep_subsumption env active_table) eq -;; - (* buttare via sign *) (** simplifies current using active and passive *) @@ -471,17 +443,7 @@ let forward_simplify env (sign,current) ?passive (active_list, active_table) = Indexing.demodulation_equality !maxmeta env table sign current in maxmeta := newmeta; if Equality.is_identity env newcurrent then -(* debug_print *) -(* (lazy *) -(* (Printf.sprintf "\ncurrent was: %s\nnewcurrent is: %s\n" *) -(* (string_of_equality current) *) -(* (string_of_equality newcurrent))); *) -(* debug_print *) -(* (lazy *) -(* (Printf.sprintf "active is: %s" *) -(* (String.concat "\n" *) -(* (List.map (fun (_, e) -> (string_of_equality e)) active_list)))); *) - None + None else Some newcurrent in @@ -533,7 +495,7 @@ let forward_simplify env (sign,current) ?passive (active_list, active_table) = (* if Indexing.subsumption env active_table c = None then*) (match Indexing.subsumption env passive_table c with | None -> res - | Some (_,c') -> + | Some (_,c',_) -> None (*prerr_endline "\n\nPESCO DALLE PASSIVE LA PIU' GENERALE\n\n"; Some c'*)) @@ -543,15 +505,6 @@ let forward_simplify env (sign,current) ?passive (active_list, active_table) = *) ;; -type fs_time_info_t = { - mutable build_all: float; - mutable demodulate: float; - mutable subsumption: float; -};; - -let fs_time_info = { build_all = 0.; demodulate = 0.; subsumption = 0. };; - - (** simplifies new using active and passive *) let forward_simplify_new env new_pos ?passive active = if Utils.debug_metas then @@ -561,37 +514,27 @@ let forward_simplify_new env new_pos ?passive active = (fun current -> Indexing.check_target c current "forward new pos") new_pos;) end; - let t1 = Unix.gettimeofday () in - let active_list, active_table = active in let passive_table = match passive with | None -> None | Some ((_, _), pt) -> Some pt in - let t2 = Unix.gettimeofday () in - fs_time_info.build_all <- fs_time_info.build_all +. (t2 -. t1); - let demodulate sign table target = let newmeta, newtarget = Indexing.demodulation_equality !maxmeta env table sign target in maxmeta := newmeta; newtarget in - let t1 = Unix.gettimeofday () in (* we could also demodulate using passive. Currently we don't *) let new_pos = List.map (demodulate Positive active_table) new_pos in - let t2 = Unix.gettimeofday () in - fs_time_info.demodulate <- fs_time_info.demodulate +. (t2 -. t1); - let new_pos_set = List.fold_left (fun s e -> if not (Equality.is_identity env e) then - if EqualitySet.mem e s then s - else EqualitySet.add e s + EqualitySet.add e s else s) EqualitySet.empty new_pos in @@ -605,9 +548,6 @@ let forward_simplify_new env new_pos ?passive active = (fun e -> ((Indexing.subsumption env active_table e = None) && (Indexing.subsumption env passive_table e = None))) in -(* let t1 = Unix.gettimeofday () in *) -(* let t2 = Unix.gettimeofday () in *) -(* fs_time_info.subsumption <- fs_time_info.subsumption +. (t2 -. t1); *) let is_duplicate = match passive_table with | None -> @@ -617,7 +557,7 @@ let forward_simplify_new env new_pos ?passive active = not ((Indexing.in_index active_table e) || (Indexing.in_index passive_table e))) in - List.filter subs (List.filter is_duplicate new_pos) + List.filter subs (List.filter is_duplicate new_pos) ;; @@ -628,12 +568,7 @@ let rec simplify_goal env goal ?passive (active_list, active_table) = | None -> None | Some ((_, _), pt) -> Some pt in - let demodulate table goal = - let changed, newmeta, newgoal = - Indexing.demodulation_goal !maxmeta env table goal in - maxmeta := newmeta; - changed, newgoal - in + let demodulate table goal = Indexing.demodulation_goal env table goal in let changed, goal = match passive_table with | None -> demodulate active_table goal @@ -654,25 +589,15 @@ let simplify_goals env goals ?passive active = let a_goals, p_goals = goals in let p_goals = List.map - (fun (d, gl) -> - let gl = - List.map (fun g -> snd (simplify_goal env g ?passive active)) gl in - d, gl) + (fun g -> snd (simplify_goal env g ?passive active)) p_goals in - let goals = - List.fold_left - (fun (a, p) (d, gl) -> - let changed = ref false in - let gl = - List.map - (fun g -> - let c, g = simplify_goal env g ?passive active in - changed := !changed || c; g) gl in - if !changed then (a, (d, gl)::p) else ((d, gl)::a, p)) - ([], p_goals) a_goals + let a_goals = + List.map + (fun g -> snd (simplify_goal env g ?passive active)) + a_goals in - goals + a_goals, p_goals ;; @@ -718,8 +643,6 @@ let backward_simplify_active env new_pos new_table min_weight active = else eq::p) newa [] in - if List.length active1 <> List.length (fst active) then - prerr_endline "\n\n\nMANCAVANO DELLE PRUNED!!!!\n\n\n"; match newa with | [] -> (active1,tbl), None, pruned | _ -> (active1,tbl), Some newa, pruned @@ -843,6 +766,9 @@ let make_goals goal = active, passive ;; +let make_goal_set goal = + ([],[goal]) +;; (** initializes the set of theorems *) let make_theorems theorems = @@ -955,10 +881,12 @@ let print_goals goals = in Printf.sprintf "%d: %s" d (String.concat "; " gl')) goals)) ;; - + let check_if_goal_is_subsumed ((_,ctx,_) as env) table (goalproof,menv,ty) = +(* let names = names_of_context ctx in Printf.eprintf "check_goal_subsumed: %s\n" (CicPp.pp ty names); +*) match ty with | Cic.Appl[Cic.MutInd(uri,_,_);eq_ty;left;right] when UriManager.eq uri (LibraryObjects.eq_URI ()) -> @@ -966,12 +894,21 @@ let check_if_goal_is_subsumed ((_,ctx,_) as env) table (goalproof,menv,ty) = Equality.mk_equality (0,Equality.Exact (Cic.Implicit None),(eq_ty,left,right,Eq),menv) in - match Indexing.subsumption env table goal_equation with -(* match Indexing.unification env table goal_equation with *) - | Some (subst, equality ) -> +(* match Indexing.subsumption env table goal_equation with*) + match Indexing.unification env table goal_equation with + | Some (subst, equality, swapped ) -> + prerr_endline + ("GOAL SUBSUMED BY: " ^ Equality.string_of_equality equality); + prerr_endline ("SUBST:" ^ Subst.ppsubst subst); let (_,p,(ty,l,r,_),m,id) = Equality.open_equality equality in let cicmenv = Subst.apply_subst_metasenv subst (m @ menv) in - Some (goalproof, p, subst, cicmenv) + let p = + if swapped then + Equality.symmetric eq_ty l id uri m + else + p + in + Some (goalproof, p, id, subst, cicmenv) | None -> None) | _ -> None ;; @@ -982,11 +919,18 @@ let counter = ref 0 let rec given_clause_fullred dbd env goals theorems ~passive active = let goals = simplify_goals env goals ~passive active in let _,context,_ = env in - let ok, goals = activate_goal goals in + let ok, (goals: + (Equality.goal_proof * Cic.metasenv * Cic.term) list * + (Equality.goal_proof * Cic.metasenv * Cic.term) list) = activate_goal + + (goals: + (Equality.goal_proof * Cic.metasenv * Cic.term) list * + (Equality.goal_proof * Cic.metasenv * Cic.term) list) + in (* let theorems = simplify_theorems env theorems ~passive active in *) if ok then let names = List.map (HExtlib.map_option (fun (name,_) -> name)) context in - let _, _, t = List.hd (snd (List.hd (fst goals))) in + let _, _, t = List.hd (fst goals) in let _ = prerr_endline ("goal activated = " ^ (CicPp.pp t names)) in (* let _ = *) (* debug_print *) @@ -1003,12 +947,12 @@ let rec given_clause_fullred dbd env goals theorems ~passive active = let ok, proof = (* apply_goal_to_theorems dbd env theorems ~passive active goals in *) let iseq uri = UriManager.eq uri (LibraryObjects.eq_URI ()) in - match (fst goals) with - | (_,[goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]])::_ + match fst goals with + | (goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right])::_ when left = right && iseq uri -> let reflproof = Equality.Exact (Equality.refl_proof eq_ty left) in - true, Some (goalproof, reflproof, Subst.empty_subst,m) - | (_, [goal])::_ -> + true, Some (goalproof, reflproof, 0, Subst.empty_subst,m) + | goal::_ -> (match check_if_goal_is_subsumed env (snd active) goal with | None -> false,None | Some p -> @@ -1122,7 +1066,7 @@ and given_clause_fullred_aux dbd env goals theorems passive active = | true -> ParamodulationFailure "" (* given_clause_fullred dbd env goals theorems passive active *) | false -> - let current, passive = select env (fst goals) passive in + let current, passive = select env goals passive in prerr_endline ("Selected = " ^ Equality.string_of_equality ~env current); (* ^ @@ -1257,7 +1201,7 @@ let check_if_goal_is_identity env = function | (goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]) when left = right && iseq uri -> let reflproof = Equality.Exact (Equality.refl_proof eq_ty left) in - Some (goalproof, reflproof,Subst.empty_subst,m) + Some (goalproof, reflproof, 0, Subst.empty_subst,m) | _ -> None ;; @@ -1270,27 +1214,29 @@ let rec check goal = function ;; let simplify_goal_set env goals passive active = - (* - let supl_goals = - (List.flatten - (List.map (Indexing.superposition_left env (snd active)) - goals)) + let active_goals, passive_goals = goals in + let find (_,_,g) where = + List.exists (fun (_,_,g1) -> Equality.meta_convertibility g g1) where in - *) let simplified = - HExtlib.filter_map - (fun g -> - match simplify_goal env g ~passive active with - | true, g -> Some g - | false, g -> Some g) - goals + List.fold_left + (fun acc goal -> + match simplify_goal env goal ~passive active with + | _, g -> if find g acc then acc else g::acc) + [] active_goals in + if List.length active_goals <> List.length simplified then + prerr_endline "SEMPLIFICANDO HO SCARTATO..."; + (simplified,passive_goals) + (* HExtlib.list_uniq ~eq:(fun (_,_,t1) (_,_,t2) -> t1 = t2) (List.sort (fun (_,_,t1) (_,_,t2) -> compare t1 t1) ((*goals @*) simplified)) + *) ;; let check_if_goals_set_is_solved env active goals = + let active_goals, passive_goals = goals in List.fold_left (fun proof goal -> match proof with @@ -1299,14 +1245,46 @@ let check_if_goals_set_is_solved env active goals = check goal [ check_if_goal_is_identity env; check_if_goal_is_subsumed env (snd active)]) - None goals + None active_goals ;; -let size_of_goal_set = List.length;; +let infer_goal_set env active goals = + let active_goals, passive_goals = goals in + let rec aux = function + | [] -> goals + | ((_,_,t1) as hd)::tl when + not (List.exists + (fun (_,_,t) -> Equality.meta_convertibility t t1) + active_goals) + -> + let selected = hd in + let passive_goals = tl in + let new' = Indexing.superposition_left env (snd active) selected in + selected::active_goals, passive_goals @ new' + | _::tl -> aux tl + in + aux passive_goals +;; + +let infer_goal_set_with_current env current goals = + let active_goals, passive_goals = goals in + let _,table,_ = build_table [current] in + active_goals, + List.fold_left + (fun acc g -> + let new' = Indexing.superposition_left env table g in + acc @ new') + passive_goals active_goals +;; + + + +let size_of_goal_set_a (l,_) = List.length l;; +let size_of_goal_set_p (_,l) = List.length l;; (** given-clause algorithm with full reduction strategy: NEW implementation *) (* here goals is a set of goals in OR *) -let given_clause +let given_clause ((_,context,_) as env) goals theorems passive active max_iterations max_time = let initial_time = Unix.gettimeofday () in @@ -1326,17 +1304,20 @@ let given_clause else if Unix.gettimeofday () > max_time then (ParamodulationFailure "No more time to spend") else + let _ = prerr_endline "simpl goal with active" in let goals = simplify_goal_set env goals passive active in match check_if_goals_set_is_solved env active goals with | Some p -> - Printf.eprintf "Found a proof in: %f\n" - (Unix.gettimeofday() -. initial_time); + prerr_endline + (Printf.sprintf "Found a proof in: %f\n" + (Unix.gettimeofday() -. initial_time)); +(* assert false;*) ParamodulationSuccess p | None -> prerr_endline - (Printf.sprintf "%d #ACTIVES: %d #PASSIVES: %d #GOALSET: %d\n" + (Printf.sprintf "%d #ACTIVES: %d #PASSIVES: %d #GOALSET: %d(%d)\n" iterno (size_of_active active) (size_of_passive passive) - (size_of_goal_set goals)); + (size_of_goal_set_a goals) (size_of_goal_set_p goals)); (* PRUNING OF PASSIVE THAT WILL NEVER BE PROCESSED *) let passive = let selection_estimate = iterations_left iterno in @@ -1352,12 +1333,13 @@ let given_clause kept_clauses := (size_of_passive passive) + (size_of_active active); (* SELECTION *) if passive_is_empty passive then - ParamodulationFailure "No more passive" (* maybe this is a success! *) + ParamodulationFailure "No more passive"(*maybe this is a success! *) else begin - let current, passive = select env [1,goals] passive in - Printf.eprintf "Selected = %s\n" - (Equality.string_of_equality ~env current); + let goals = infer_goal_set env active goals in + let current, passive = select env goals passive in + prerr_endline (Printf.sprintf "Selected = %s\n" + (Equality.string_of_equality ~env current)); (* SIMPLIFICATION OF CURRENT *) let res = forward_simplify env (Positive, current) ~passive active @@ -1366,22 +1348,24 @@ let given_clause | None -> step goals theorems passive active (iterno+1) | Some current -> (* GENERATION OF NEW EQUATIONS *) + prerr_endline "infer"; let new' = infer env current active in + prerr_endline "infer goal"; + let goals = infer_goal_set_with_current env current goals in let active = - if Equality.is_identity env current then - assert false - (* nonsense code, check to se if it can be removed *) - else let al, tbl = active in al @ [current], Indexing.index tbl current in (* FORWARD AND BACKWARD SIMPLIFICATION *) + prerr_endline "fwd/back simpl"; let rec simplify new' active passive = let new' = forward_simplify_new env new' ~passive active in let active, passive, newa, retained, pruned = backward_simplify env new' ~passive active in - let passive = List.fold_left filter_dependent passive pruned in + let passive = + List.fold_left filter_dependent passive pruned + in match newa, retained with | None, None -> active, passive, new' | Some p, None @@ -1389,6 +1373,7 @@ let given_clause | Some p, Some rp -> simplify (new' @ p @ rp) active passive in let active, passive, new' = simplify new' active passive in + prerr_endline "simpl goal with new"; let goals = let a,b,_ = build_table new' in simplify_goal_set env goals passive (a,b) @@ -1405,7 +1390,7 @@ let rec saturate_equations env goal accept_fun passive active = if !elapsed_time > !time_limit then (active, passive) else - let current, passive = select env [1, [goal]] passive in + let current, passive = select env ([goal],[]) passive in let res = forward_simplify env (Positive, current) ~passive active in match res with | None -> @@ -1652,31 +1637,18 @@ let saturate maxdepth := depth; maxwidth := width; (* CicUnification.unif_ty := false;*) - let proof, goal = status in - let goal' = goal in + let proof, goalno = status in let uri, metasenv, meta_proof, term_to_prove = proof in - let _, context, goal = CicUtil.lookup_meta goal' metasenv in + let _, context, type_of_goal = CicUtil.lookup_meta goalno metasenv in let names = names_of_context context in let eq_indexes, equalities, maxm = find_equalities context proof in - let new_meta_goal, metasenv, type_of_goal = - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable context in - let _, context, ty = CicUtil.lookup_meta goal' metasenv in - debug_print - (lazy (Printf.sprintf "\n\nTIPO DEL GOAL: %s\n" (CicPp.ppterm ty))); - Cic.Meta (maxm+1, irl), - (maxm+1, context, ty)::metasenv, - ty - in let ugraph = CicUniv.empty_ugraph in let env = (metasenv, context, ugraph) in - prerr_endline - ("METASENV DEL GOAL: " ^ CicMetaSubst.ppmetasenv [] metasenv ); - let goal = [], metasenv, goal in + let goal = [], List.filter (fun (i,_,_)->i<>goalno) metasenv, type_of_goal in let res, time = let t1 = Unix.gettimeofday () in let lib_eq_uris, library_equalities, maxm = - find_library_equalities dbd context (proof, goal') (maxm+2) + find_library_equalities dbd context (proof, goalno) (maxm+2) in let library_equalities = List.map snd library_equalities in let t2 = Unix.gettimeofday () in @@ -1688,7 +1660,7 @@ let saturate let t1 = Unix.gettimeofday () in let theorems = if full then - let thms = find_library_theorems dbd env (proof, goal') lib_eq_uris in + let thms = find_library_theorems dbd env (proof, goalno) lib_eq_uris in let context_hyp = find_context_hypotheses env eq_indexes in context_hyp @ thms, [] else @@ -1725,12 +1697,9 @@ let saturate let goals = make_goals goal in given_clause_fullred dbd env goals theorems passive active *) - let goals = [goal] in - let max_iterations = 1000 in - let max_time = - Unix.gettimeofday () +. - 600. (* minutes *) - in + let goals = make_goal_set goal in + let max_iterations = 10000 in + let max_time = Unix.gettimeofday () +. 300. (* minutes *) in given_clause env goals theorems passive active max_iterations max_time in let finish = Unix.gettimeofday () in @@ -1740,155 +1709,113 @@ let saturate | ParamodulationFailure s -> raise (ProofEngineTypes.Fail (lazy ("NO proof found: " ^ s))) | ParamodulationSuccess - (goalproof,newproof,subsumption_subst, proof_menv) -> + (goalproof,newproof,subsumption_id,subsumption_subst, proof_menv) -> prerr_endline "OK, found a proof!"; - - prerr_endline "NEWPROOF"; - (* prerr_endline (Equality.string_of_proof_new ~names newproof - * goalproof);*) - prerr_endline (Equality.pp_proof names goalproof newproof); - -(* assert false; *) - - (* generation of the proof *) - let cic_proof_new = - Equality.build_goal_proof - goalproof (Equality.build_proof_term newproof) type_of_goal + prerr_endline + (Equality.pp_proof names goalproof newproof subsumption_subst + subsumption_id type_of_goal); + prerr_endline (CicMetaSubst.ppmetasenv [] proof_menv); + prerr_endline "ENDOFPROOFS"; + (* generation of the CIC proof *) + let side_effects = + List.filter (fun i -> i <> goalno) + (ProofEngineHelpers.compare_metasenvs + ~newmetasenv:metasenv ~oldmetasenv:proof_menv) in - let cic_proof_new = - Subst.apply_subst subsumption_subst cic_proof_new + let goal_proof, side_effects_t = + let initial = newproof in + Equality.build_goal_proof goalproof initial type_of_goal side_effects in - - (* replacing fake mets with real ones *) - let equality_for_replace i t1 = - match t1 with - | C.Meta (n, _) -> n = i - | _ -> false +(*prerr_endline (CicPp.pp goal_proof names);*) + let goal_proof = Subst.apply_subst subsumption_subst goal_proof in + let side_effects_t = + List.map (Subst.apply_subst subsumption_subst) side_effects_t in - let mkirl = CicMkImplicit.identity_relocation_list_for_metavariable in - prerr_endline "replacing metas (new)"; - let newproof_menv, what, with_what,_ = - let irl = mkirl context in + (* replacing fake mets with real ones *) + prerr_endline "replacing metas..."; + let irl=CicMkImplicit.identity_relocation_list_for_metavariable context in + let goal_proof_menv, what, with_what,free_meta = List.fold_left (fun (acc1,acc2,acc3,uniq) (i,_,ty) -> match uniq with | Some m -> - acc1, - (Cic.Meta(i,[]))::acc2, - m::acc3, uniq + acc1, (Cic.Meta(i,[]))::acc2, m::acc3, uniq | None -> - [i,context,ty], - (Cic.Meta(i,[]))::acc2, + [i,context,ty], (Cic.Meta(i,[]))::acc2, (Cic.Meta(i,irl)) ::acc3,Some (Cic.Meta(i,irl))) ([],[],[],None) proof_menv in - let cic_proof_new = ProofEngineReduction.replace_lifting - ~equality:(=) - ~what ~with_what - ~where:cic_proof_new + let replace where = + (* we need this fake equality since the metas of the hypothesis may be + * with a real local context *) + ProofEngineReduction.replace_lifting + ~equality:(fun x y -> + match x,y with Cic.Meta(i,_),Cic.Meta(j,_) -> i=j | _-> false) + ~what ~with_what ~where in - - (* pp new/old proof *) -(* prerr_endline "NEWPROOFCIC";*) -(* prerr_endline (CicPp.pp cic_proof_new names); *) - - (* generation of proof metasenv *) - let newmetasenv_new = metasenv@newproof_menv in - let newmetasenv_new = - let i1 = - match new_meta_goal with - | C.Meta (i, _) -> i | _ -> assert false - in - List.filter (fun (i, _, _) -> i <> i1 && i <> goal') newmetasenv_new + let goal_proof = replace goal_proof in + (* ok per le meta libere... ma per quelle che c'erano e sono rimaste? + * what mi pare buono, sostituisce solo le meta farlocche *) + let side_effects_t = List.map replace side_effects_t in + let free_metas = + List.filter (fun i -> i <> goalno) + (ProofEngineHelpers.compare_metasenvs + ~oldmetasenv:metasenv ~newmetasenv:goal_proof_menv) in +prerr_endline ("freemetas: " ^ String.concat "," (List.map string_of_int free_metas) ); (* check/refine/... build the new proof *) - let newstatus = - let cic_proof,newmetasenv,proof_menv,ty, ug = - let cic_proof_new,new_ty,newmetasenv_new,newug = - try - (* - prerr_endline "refining ... (new) "; - CicRefine.type_of_aux' - newmetasenv_new context cic_proof_new ugraph - *) - let ty,ug = - prerr_endline "typechecking ... (new) "; - CicTypeChecker.type_of_aux' - newmetasenv_new context cic_proof_new ugraph - in - cic_proof_new, ty, newmetasenv_new, ug - with - | CicTypeChecker.TypeCheckerFailure s -> - prerr_endline "THE PROOF DOESN'T TYPECHECK!!!"; - prerr_endline (Lazy.force s); - assert false - | CicRefine.RefineFailure s - | CicRefine.Uncertain s - | CicRefine.AssertFailure s -> - prerr_endline "FAILURE IN REFINE"; - prerr_endline (Lazy.force s); - assert false - in - if List.length newmetasenv_new <> 0 then - prerr_endline - ("Some METAS are still open: "(* ^ CicMetaSubst.ppmetasenv - [] newmetasenv_new*)); - cic_proof_new, newmetasenv_new, newmetasenv_new,new_ty, newug - (* THE OLD PROOF: cic_proof,newmetasenv,proof_menv,oldty,oldug *) - in - prerr_endline "FINAL PROOF"; - prerr_endline (CicPp.pp cic_proof names); - prerr_endline "ENDOFPROOFS"; - (* - debug_print - (lazy - (Printf.sprintf - "\nGOAL was: %s\nPROOF has type: %s\nconvertible?: %s\n" - (CicPp.pp type_of_goal names) (CicPp.pp ty names) - (string_of_bool - (fst (CicReduction.are_convertible - context type_of_goal ty ug))))); - *) - let real_proof = - ProofEngineReduction.replace - ~equality:equality_for_replace - ~what:[goal'] ~with_what:[cic_proof] - ~where:meta_proof + let replaced_goal = + ProofEngineReduction.replace + ~what:side_effects ~with_what:side_effects_t + ~equality:(fun i t -> match t with Cic.Meta(j,_)->j=i|_->false) + ~where:type_of_goal + in + let subst_side_effects,real_menv,_ = + let fail t s = raise (ProofEngineTypes.Fail (lazy (t^Lazy.force s))) in + let free_metas_menv = + List.map (fun i -> CicUtil.lookup_meta i goal_proof_menv) free_metas in - (* - debug_print - (lazy - (Printf.sprintf "status:\n%s\n%s\n%s\n%s\n" - (match uri with Some uri -> UriManager.string_of_uri uri - | None -> "") - (print_metasenv newmetasenv) - (CicPp.pp real_proof [](* names *)) - (CicPp.pp term_to_prove names))); - *) - let open_goals = List.map (fun (i,_,_) -> i) proof_menv in - (uri, newmetasenv, real_proof, term_to_prove), open_goals + try + CicUnification.fo_unif_subst [] context (metasenv @ free_metas_menv) + replaced_goal type_of_goal CicUniv.empty_ugraph + with + | CicUnification.UnificationFailure s + | CicUnification.Uncertain s + | CicUnification.AssertFailure s -> + fail "Maybe the local context of metas in the goal was not an IRL" s + in + let final_subst = + (goalno,(context,goal_proof,type_of_goal))::subst_side_effects + in +prerr_endline ("MENVreal_menv: " ^ CicMetaSubst.ppmetasenv [] real_menv); + let _ = + try + CicTypeChecker.type_of_aux' real_menv context goal_proof + CicUniv.empty_ugraph + with + | CicUtil.Meta_not_found _ + | CicTypeChecker.TypeCheckerFailure _ + | CicTypeChecker.AssertFailure _ + | Invalid_argument "list_fold_left2" as exn -> + prerr_endline "THE PROOF DOES NOT TYPECHECK!"; + prerr_endline (CicPp.pp goal_proof names); + prerr_endline "THE PROOF DOES NOT TYPECHECK!"; + raise exn in - if Utils.time then - begin - let tall = fs_time_info.build_all in - let tdemodulate = fs_time_info.demodulate in - let tsubsumption = fs_time_info.subsumption in - prerr_endline ( - (Printf.sprintf "\nTIME NEEDED: %.9f" time) ^ - (Printf.sprintf "\ntall: %.9f" tall) ^ - (Printf.sprintf "\ntdemod: %.9f" tdemodulate) ^ - (Printf.sprintf "\ntsubsumption: %.9f" tsubsumption) ^ - (Printf.sprintf "\ninfer_time: %.9f" !infer_time) ^ - (Printf.sprintf "\nforward_simpl_times: %.9f" - !forward_simpl_time) ^ - (Printf.sprintf "\nforward_simpl_new_times: %.9f" - !forward_simpl_new_time) ^ - (Printf.sprintf "\nbackward_simpl_times: %.9f" - !backward_simpl_time) ^ - (Printf.sprintf "\npassive_maintainance_time: %.9f" - !passive_maintainance_time)) - end; - newstatus + let proof, real_metasenv = + ProofEngineHelpers.subst_meta_and_metasenv_in_proof + proof goalno (CicMetaSubst.apply_subst final_subst) real_menv + in + let open_goals = + match free_meta with Some(Cic.Meta(m,_)) when m<>goalno ->[m] | _ ->[] + in + Printf.eprintf + "GOALS APERTI: %s\nMETASENV PRIMA:\n%s\nMETASENV DOPO:\n%s\n" + (String.concat ", " (List.map string_of_int open_goals)) + (CicMetaSubst.ppmetasenv [] metasenv) + (CicMetaSubst.ppmetasenv [] real_metasenv); + prerr_endline (Printf.sprintf "\nTIME NEEDED: %8.2f" time); + proof, open_goals ;; let retrieve_and_print dbd term metasenv ugraph = @@ -1901,18 +1828,8 @@ let retrieve_and_print dbd term metasenv ugraph = let proof, goals = status in let goal' = List.nth goals 0 in let uri, metasenv, meta_proof, term_to_prove = proof in - let _, context, goal = CicUtil.lookup_meta goal' metasenv in + let _, context, type_of_goal = CicUtil.lookup_meta goal' metasenv in let eq_indexes, equalities, maxm = find_equalities context proof in - let new_meta_goal, metasenv, type_of_goal = - let irl = - CicMkImplicit.identity_relocation_list_for_metavariable context in - let _, context, ty = CicUtil.lookup_meta goal' metasenv in - debug_print - (lazy (Printf.sprintf "\n\nTIPO DEL GOAL: %s\n" (CicPp.ppterm ty))); - Cic.Meta (maxm+1, irl), - (maxm+1, context, ty)::metasenv, - ty - in let ugraph = CicUniv.empty_ugraph in let env = (metasenv, context, ugraph) in let t1 = Unix.gettimeofday () in @@ -2061,7 +1978,7 @@ let main_demod_equalities dbd term metasenv ugraph = *) ;; -let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) = +let demodulate_tac ~dbd ~pattern ((proof,goal)(*s initialstatus*)) = let module I = Inference in let curi,metasenv,pbo,pty = proof in let metano,context,ty = CicUtil.lookup_meta goal metasenv in @@ -2079,15 +1996,15 @@ let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) = (fun tbl eq -> Indexing.index tbl eq) Indexing.empty equalities in - let _, newmeta,(newproof,newmetasenv, newty) = + let changed,(newproof,newmetasenv, newty) = Indexing.demodulation_goal - maxm (metasenv,context,CicUniv.empty_ugraph) table initgoal + (metasenv,context,CicUniv.empty_ugraph) table initgoal in - if newmeta != maxm then + if changed then begin - let opengoal = Cic.Meta(maxm,irl) in - let proofterm = - Equality.build_goal_proof newproof opengoal ty in + let opengoal = Equality.Exact (Cic.Meta(maxm,irl)) in + let proofterm,_ = + Equality.build_goal_proof newproof opengoal ty [] in let extended_metasenv = (maxm,context,newty)::metasenv in let extended_status = (curi,extended_metasenv,pbo,pty),goal in @@ -2097,13 +2014,17 @@ let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) = extended_status in (status,maxm::newgoals) end - else if newty = ty then + else (* if newty = ty then *) raise (ProofEngineTypes.Fail (lazy "no progress")) - else ProofEngineTypes.apply_tactic + (*else ProofEngineTypes.apply_tactic (ReductionTactics.simpl_tac ~pattern) - initialstatus + initialstatus*) ;; let demodulate_tac ~dbd ~pattern = ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~pattern) ;; + +let get_stats () = + <:show> ^ Indexing.get_stats () ^ Inference.get_stats ();; +