X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2Fparamodulation%2Fsaturation.ml;h=f8c20d0e3b61250633e5dc4841fabe932b911470;hb=9559b53134624dbee523cf6406a9852665c0ff77;hp=d5da5485f72526bc4ded022d3953dc7acd5ff50e;hpb=1f82709017e4ec5bab8e0311e00992b89572d856;p=helm.git diff --git a/components/tactics/paramodulation/saturation.ml b/components/tactics/paramodulation/saturation.ml index d5da5485f..f8c20d0e3 100644 --- a/components/tactics/paramodulation/saturation.ml +++ b/components/tactics/paramodulation/saturation.ml @@ -71,14 +71,13 @@ let maxdepth = ref 3;; let maxwidth = ref 3;; type new_proof = - Equality.goal_proof * Equality.new_proof * Equality.substitution * Cic.metasenv -type old_proof = Equality.old_proof * Cic.metasenv + Equality.goal_proof * Equality.proof * Subst.substitution * Cic.metasenv type result = | ParamodulationFailure - | ParamodulationSuccess of (new_proof * old_proof) option + | ParamodulationSuccess of new_proof option ;; -type goal = (Equality.goal_proof * Equality.old_proof) * Cic.metasenv * Cic.term;; +type goal = Equality.goal_proof * Cic.metasenv * Cic.term;; type theorem = Cic.term * Cic.term * Cic.metasenv;; @@ -153,12 +152,22 @@ let rec select env goals passive = match !weight_age_counter with | 0 -> ( weight_age_counter := !weight_age_ratio; - match pos_list with - | (hd:EqualitySet.elt)::tl -> - let passive_table = - Indexing.remove_index passive_table hd - in hd, ((tl, EqualitySet.remove hd pos_set), passive_table) - | _ -> assert false) + let rec skip_giant pos_list pos_set passive_table = + match pos_list with + | (hd:EqualitySet.elt)::tl -> + let w,_,_,_,_ = Equality.open_equality hd in + let passive_table = + Indexing.remove_index passive_table hd + in + let pos_set = EqualitySet.remove hd pos_set in + if w < 50 then + hd, ((tl, pos_set), passive_table) + else + (prerr_endline ("\n\n\nGIANT SKIPPED: "^string_of_int w^"\n\n\n"); + skip_giant tl pos_set passive_table) + | _ -> assert false + in + skip_giant pos_list pos_set passive_table) | _ when (!symbols_counter > 0) -> (symbols_counter := !symbols_counter - 1; let cardinality map = @@ -211,6 +220,27 @@ let rec select env goals passive = passive_table) ;; +let filter_dependent passive id = + prerr_endline ("+++++++++++++++passives "^ + ( string_of_int (size_of_passive passive))); + let (pos_list, pos_set), passive_table = passive in + let passive = + List.fold_right + (fun eq ((list,set),table) -> + if Equality.depend eq id then + (let _,_,_,_,id_eq = Equality.open_equality eq in + if id_eq = 9228 then + prerr_endline ("\n\n--------filtering "^(string_of_int id_eq)); + ((list, + EqualitySet.remove eq set), + Indexing.remove_index table eq)) + else ((eq::list, set),table)) + pos_list (([],pos_set),passive_table) in + prerr_endline ("+++++++++++++++passives "^ + ( string_of_int (size_of_passive passive))); + passive +;; + (* initializes the passive set of equalities *) let make_passive pos = @@ -354,6 +384,73 @@ let infer env current (active_list, active_table) = List.filter (fun e -> OrderedEquality.compare e eq <= 0) new_pos ;; +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 + 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 + 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 + in + 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 *) @@ -407,26 +504,38 @@ let forward_simplify env (sign,current) ?passive (active_list, active_table) = match res with | None -> None | Some c -> - (* immagino non funzioni piu'... *) if Indexing.in_index active_table c then None else match passive_table with | None -> + if check_for_deep_subsumption env active_table c then + None + else + res +(* if Indexing.subsumption env active_table c = None then res else None +*) | Some passive_table -> if Indexing.in_index passive_table c then None else - if Indexing.subsumption env active_table c = None then - if Indexing.subsumption env passive_table c = None then - res - else - None + if check_for_deep_subsumption env active_table c then + None + else +(* if Indexing.subsumption env active_table c = None then*) + (match Indexing.subsumption env passive_table c with + | None -> res + | Some (_,c') -> + None + (*prerr_endline "\n\nPESCO DALLE PASSIVE LA PIU' GENERALE\n\n"; + Some c'*)) +(* else None +*) ;; type fs_time_info_t = { @@ -525,8 +634,8 @@ let rec simplify_goal env goal ?passive (active_list, active_table) = | None -> demodulate active_table goal | Some passive_table -> let changed, goal = demodulate active_table goal in - let changed', goal = demodulate passive_table goal in - (changed || changed'), goal +(* let changed', goal = demodulate passive_table goal in*) + (changed (*|| changed'*)), goal in changed, if not changed then @@ -565,45 +674,50 @@ let simplify_goals env goals ?passive active = (** simplifies active usign new *) let backward_simplify_active env new_pos new_table min_weight active = let active_list, active_table = active in - let active_list, newa = + let active_list, newa, pruned = List.fold_right - (fun equality (res, newn) -> - let ew, _, _, _,_ = Equality.open_equality equality in + (fun equality (res, newn,pruned) -> + let ew, _, _, _,id = Equality.open_equality equality in if ew < min_weight then - equality::res, newn + equality::res, newn,pruned else match forward_simplify env (Utils.Positive, equality) (new_pos, new_table) with - | None -> res, newn + | None -> res, newn, id::pruned | Some e -> if Equality.compare equality e = 0 then - e::res, newn + e::res, newn, pruned else - res, e::newn) - active_list ([], []) + res, e::newn, pruned) + active_list ([], [],[]) in let find eq1 where = List.exists (Equality.meta_convertibility_eq eq1) where in - let active, newa = + let id_of_eq eq = + let _, _, _, _,id = Equality.open_equality eq in id + in + let ((active1,pruned),tbl), newa = List.fold_right - (fun eq (res, tbl) -> + (fun eq ((res,pruned), tbl) -> if List.mem eq res then - res, tbl + (res, (id_of_eq eq)::pruned),tbl else if (Equality.is_identity env eq) || (find eq res) then ( - res, tbl + (res, (id_of_eq eq)::pruned),tbl ) else - eq::res, Indexing.index tbl eq) - active_list ([], Indexing.empty), + (eq::res,pruned), Indexing.index tbl eq) + active_list (([],pruned), Indexing.empty), List.fold_right (fun eq p -> if (Equality.is_identity env eq) then p 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 - | [] -> active, None - | _ -> active, Some newa + | [] -> (active1,tbl), None, pruned + | _ -> (active1,tbl), Some newa, pruned ;; @@ -634,22 +748,32 @@ let backward_simplify_passive env new_pos new_table min_weight passive = | _ -> ((pl, ps), passive_table), Some (newp) ;; +let build_table equations = + List.fold_left + (fun (l, t, w) e -> + let ew, _, _, _ , _ = Equality.open_equality e in + e::l, Indexing.index t e, min ew w) + ([], Indexing.empty, 1000000) equations +;; + let backward_simplify env new' ?passive active = - let new_pos, new_table, min_weight = + let new_pos, new_table, min_weight = build_table new' in +(* List.fold_left (fun (l, t, w) e -> let ew, _, _, _ , _ = Equality.open_equality e in e::l, Indexing.index t e, min ew w) ([], Indexing.empty, 1000000) new' in - let active, newa = +*) + let active, newa, pruned = backward_simplify_active env new_pos new_table min_weight active in match passive with | None -> - active, (make_passive []), newa, None + active, (make_passive []), newa, None, pruned | Some passive -> - active, passive, newa, None + active, passive, newa, None, pruned (* prova let passive, newp = backward_simplify_passive env new_pos new_table min_weight passive in @@ -827,42 +951,21 @@ let print_goals goals = Printf.sprintf "%d: %s" d (String.concat "; " gl')) goals)) ;; -let check_if_goal_is_subsumed env ((cicproof,proof),menv,ty) table = +let check_if_goal_is_subsumed env (goalproof,menv,ty) table = + prerr_endline "check_goal_subsumed"; match ty with | Cic.Appl[Cic.MutInd(uri,_,_);eq_ty;left;right] when UriManager.eq uri (LibraryObjects.eq_URI ()) -> (let goal_equation = Equality.mk_equality - (0,(Equality.Exact (Cic.Rel (-1)),proof),(eq_ty,left,right,Eq),menv) - in - match Indexing.subsumption env table goal_equation with - | Some (subst, equality ) -> - let (_,(np,p),(ty,l,r,_),m,id) = - Equality.open_equality equality in - let p = Equality.apply_subst subst - (Equality.build_proof_term_old p) in - let newp = - let rec repl = function - | Equality.ProofGoalBlock (_, gp) -> - Equality.ProofGoalBlock - (Equality.BasicProof (Equality.empty_subst,p), gp) - | Equality.NoProof -> - Equality.BasicProof (Equality.empty_subst,p) - | Equality.BasicProof _ -> - Equality.BasicProof (Equality.empty_subst,p) - | Equality.SubProof (t, i, p2) -> - Equality.SubProof (t, i, repl p2) - | _ -> assert false - in - repl proof - in - let newcicp,np,subst,cicmenv = - cicproof,np, subst, (m @ menv) - in - Some - ((newcicp,np,subst,cicmenv), - (newp, Equality.apply_subst_metasenv subst m @ menv )) - | None -> None) + (0,Equality.Exact (Cic.Implicit None),(eq_ty,left,right,Eq),menv) + in + match Indexing.subsumption env table goal_equation with + | Some (subst, equality ) -> + 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) + | None -> None) | _ -> None ;; @@ -894,35 +997,12 @@ let rec given_clause_fullred dbd env goals theorems ~passive active = (* 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 - | (_, [proof, m, Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]])::_ + | (_,[goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]])::_ when left = right && iseq uri -> - let p = - Cic.Appl [Cic.MutConstruct (* reflexivity *) - (LibraryObjects.eq_URI (), 0, 1, []);eq_ty; left] - in - let newp = - let rec repl = function - | Equality.ProofGoalBlock (_, gp) -> - Equality.ProofGoalBlock - (Equality.BasicProof (Equality.empty_subst,p), gp) - | Equality.NoProof -> - - Equality.BasicProof (Equality.empty_subst,p) - | Equality.BasicProof _ -> - Equality.BasicProof (Equality.empty_subst,p) - | Equality.SubProof (t, i, p2) -> - Equality.SubProof (t, i, repl p2) - | _ -> assert false - in - repl (snd proof) - in - let reflproof = Equality.refl_proof eq_ty left in - true, - Some ((fst proof,Equality.Exact reflproof, - Equality.empty_subst,m), - (newp,m)) - | (_, [proof,m,ty])::_ -> - (match check_if_goal_is_subsumed env (proof,m,ty) (snd active) with + let reflproof = Equality.Exact (Equality.refl_proof eq_ty left) in + true, Some (goalproof, reflproof, Subst.empty_subst,m) + | (_, [goal])::_ -> + (match check_if_goal_is_subsumed env goal (snd active) with | None -> false,None | Some p -> prerr_endline "Proof found by subsumption!"; @@ -1056,8 +1136,8 @@ and given_clause_fullred_aux dbd env goals theorems passive active = (* weight_age_counter := !weight_age_counter + 1; *) given_clause_fullred dbd env goals theorems passive active | Some current -> - prerr_endline (Printf.sprintf "selected sipl: %s" - (Equality.string_of_equality ~env current)); +(* prerr_endline (Printf.sprintf "selected simpl: %s" + (Equality.string_of_equality ~env current));*) let t1 = Unix.gettimeofday () in let new' = infer env current active in let _ = @@ -1084,8 +1164,10 @@ and given_clause_fullred_aux dbd env goals theorems passive active = forward_simpl_new_time := !forward_simpl_new_time +. (t2 -. t1); let t1 = Unix.gettimeofday () in - let active, passive, newa, retained = + let active, passive, newa, retained, pruned = backward_simplify env new' ~passive active in + let passive = + List.fold_left filter_dependent passive pruned in let t2 = Unix.gettimeofday () in backward_simpl_time := !backward_simpl_time +. (t2 -. t1); match newa, retained with @@ -1102,7 +1184,12 @@ and given_clause_fullred_aux dbd env goals theorems passive active = | Some p, Some rp -> simplify (new' @ p @ rp) active passive in - let active, _, new' = simplify new' active passive in + let active, passive, new' = simplify new' active passive in + let goals = + let a,b,_ = build_table new' in + simplify_goals env goals ~passive (a,b) + in + (* pessima prova let new1 = prova env new' active in let new' = (fst new') @ (fst new1), (snd new') @ (snd new1) in @@ -1178,8 +1265,10 @@ let rec saturate_equations env goal accept_fun passive active = in let rec simplify new' active passive = let new' = forward_simplify_new env new' ~passive active in - let active, passive, newa, retained = + let active, passive, newa, retained, pruned = backward_simplify env new' ~passive active in + let passive = + List.fold_left filter_dependent passive pruned in match newa, retained with | None, None -> active, passive, new' | Some p, None @@ -1410,6 +1499,7 @@ let saturate let goal' = goal in let uri, metasenv, meta_proof, term_to_prove = proof in let _, context, goal = CicUtil.lookup_meta goal' 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 = @@ -1423,9 +1513,7 @@ let saturate in let ugraph = CicUniv.empty_ugraph in let env = (metasenv, context, ugraph) in - let goal = - ([],Equality.BasicProof (Equality.empty_subst,new_meta_goal)), [], goal - in + let goal = [], [], goal in let res, time = let t1 = Unix.gettimeofday () in let lib_eq_uris, library_equalities, maxm = @@ -1482,26 +1570,22 @@ let saturate in match res with | ParamodulationSuccess - (Some - ((goalproof,newproof,subsumption_subst, newproof_menv), (* NEW *) - (proof, proof_menv))) (* OLD *) + (Some (goalproof,newproof,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); - (* generation of the old proof *) - let cic_proof = Equality.build_proof_term_old proof in - - (* generation of the new proof *) - let cic_proof_new,cic_proof_new_menv = + (* generation of the proof *) + let cic_proof_new = Equality.build_goal_proof - goalproof (Equality.build_proof_term_new newproof) - in - let newproof_menv = - Equality.apply_subst_metasenv subsumption_subst - (newproof_menv @ cic_proof_new_menv) + goalproof (Equality.build_proof_term newproof) type_of_goal in let cic_proof_new = - Equality.apply_subst subsumption_subst cic_proof_new + Subst.apply_subst subsumption_subst cic_proof_new in (* replacing fake mets with real ones *) @@ -1511,21 +1595,6 @@ let saturate | _ -> false in let mkirl = CicMkImplicit.identity_relocation_list_for_metavariable in - prerr_endline "replacing metas (old)"; - let proof_menv, what, with_what = - let irl = mkirl context in - List.fold_left - (fun (acc1,acc2,acc3) (i,_,ty) -> - (i,context,ty)::acc1, - (Cic.Meta(i,[]))::acc2, - (Cic.Meta(i,irl)) ::acc3) - ([],[],[]) proof_menv - in - let cic_proof = ProofEngineReduction.replace_lifting - ~equality:(=) - ~what ~with_what - ~where:cic_proof - in prerr_endline "replacing metas (new)"; let newproof_menv, what, with_what = let irl = mkirl context in @@ -1534,7 +1603,7 @@ let saturate (i,context,ty)::acc1, (Cic.Meta(i,[]))::acc2, (Cic.Meta(i,irl)) ::acc3) - ([],[],[]) newproof_menv + ([],[],[]) proof_menv in let cic_proof_new = ProofEngineReduction.replace_lifting ~equality:(=) @@ -1543,15 +1612,8 @@ let saturate in (* pp new/old proof *) - let names = names_of_context context in - prerr_endline "OLDPROOF"; - prerr_endline (Equality.string_of_proof_old proof); - prerr_endline "OLDPROOFCIC"; - prerr_endline (CicPp.pp cic_proof names); - prerr_endline "NEWPROOF"; - prerr_endline (Equality.string_of_proof_new ~names newproof goalproof); - prerr_endline "NEWPROOFCIC"; - prerr_endline (CicPp.pp cic_proof_new names); +(* prerr_endline "NEWPROOFCIC";*) +(* prerr_endline (CicPp.pp cic_proof_new names); *) (* generation of proof metasenv *) let newmetasenv = @@ -1561,22 +1623,10 @@ let saturate in List.filter (fun (i, _, _) -> i <> i1 && i <> goal') metasenv in - let newmetasenv = newmetasenv@proof_menv in let newmetasenv_new = newmetasenv@newproof_menv in - (* check/refine/... build the new proof *) let newstatus = let cic_proof,newmetasenv,proof_menv,ty, ug = - prerr_endline "type checking ... (old) "; - let _old_ty, _oldug = - try - CicTypeChecker.type_of_aux' newmetasenv context cic_proof ugraph - with - CicTypeChecker.TypeCheckerFailure s -> - prerr_endline "THE *OLD* PROOF DOESN'T TYPECHECK!!!"; - prerr_endline (Lazy.force s); - Cic.Implicit None, CicUniv.empty_ugraph - in let cic_proof_new,new_ty,newmetasenv_new,newug = try (* @@ -1604,13 +1654,13 @@ let saturate in if List.length newmetasenv_new <> 0 then prerr_endline - ("Some METAS are still open: " ^ CicMetaSubst.ppmetasenv - [] newmetasenv_new); + ("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 "FINAL PROOF";*) +(* prerr_endline (CicPp.pp cic_proof names);*) prerr_endline "ENDOFPROOFS"; (* debug_print @@ -1791,8 +1841,7 @@ let main_demod_equalities dbd term metasenv ugraph = in let env = (metasenv, context, ugraph) in (*try*) - let goal = - ([],Equality.BasicProof (Equality.empty_subst,new_meta_goal)), [], goal + let goal = [], [], goal in let equalities = simplify_equalities env (equalities@library_equalities) in let active = make_active () in @@ -1852,10 +1901,7 @@ let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) = if library_equalities = [] then prerr_endline "VUOTA!!!"; let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in let library_equalities = List.map snd library_equalities in - let goalterm = Cic.Meta (metano,irl) in - let initgoal = - ([],Equality.BasicProof (Equality.empty_subst,goalterm)), [], ty - in + let initgoal = [], [], ty in let env = (metasenv, context, CicUniv.empty_ugraph) in let equalities = simplify_equalities env (equalities@library_equalities) in let table = @@ -1871,7 +1917,7 @@ let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) = begin let opengoal = Cic.Meta(maxm,irl) in let proofterm = - Equality.build_proof_term_old ~noproof:opengoal (snd newproof) in + 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