michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(library/blast/forward/pattern): remove redundant multi-patterns

Browse source
This commit is contained in:
Leonardo de Moura 2015-12-02 17:56:56 -07:00
parent ec7c38d847
commit a83a7f8356
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/library/blast/forward/pattern.cpp
View file

@ -501,8 +501,10 @@ struct mk_hi_lemma_fn {
// If heuristic is true, then // If heuristic is true, then
// 1. Give preference to unary patterns // 1. Give preference to unary patterns
// 2. If there are no unary patterns, then // 2. If there are no unary patterns, then
// delet any candidate c_1 if there is a c_2 s.t. // a) delete any candidate c_1 if there is a c_2 s.t.
// trackable(c_1) == trackable(c_2) and weight(c_1) > weight(c_2). // trackable(c_1) == trackable(c_2) and weight(c_1) > weight(c_2).
// b) delete any candidate c_1 if there is a c_2 s.t.
// c_1 is a subterm of c_2, and c_2.m_vars is a strict superset of c_1.m_vars
list<multi_pattern> mk_multi_patterns_using(candidate_set s, bool heuristic) { list<multi_pattern> mk_multi_patterns_using(candidate_set s, bool heuristic) {
if (heuristic) { if (heuristic) {
buffer<multi_pattern> unit_patterns; buffer<multi_pattern> unit_patterns;
@ -514,13 +516,17 @@ struct mk_hi_lemma_fn {
return to_list(unit_patterns); return to_list(unit_patterns);
} }
buffer<candidate> to_delete; buffer<candidate> to_delete;
s.for_each([&](candidate const & c1) { s.for_each([&](candidate const & c_1) {
if (s.find_if([&](candidate const & c2) { if (s.find_if([&](candidate const & c_2) {
return return
c1.m_mvars == c2.m_mvars && // a) delete any candidate c_1 if there is a c_2 s.t.
get_weight(c1.m_expr) > get_weight(c2.m_expr); // trackable(c_1) == trackable(c_2) and weight(c_1) > weight(c_2).
(c_1.m_mvars == c_2.m_mvars && get_weight(c_1.m_expr) > get_weight(c_2.m_expr)) ||
// b) delete any candidate c_1 if there is a c_2 s.t.
// c_1 is a subterm of c_2, and c_2.m_vars is a strict superset of c_1.m_vars
(occurs(c_1.m_expr, c_2.m_expr) && c_2.m_mvars.is_strict_superset(c_1.m_mvars));
})) { })) {
to_delete.push_back(c1); to_delete.push_back(c_1);
} }
}); });
for (candidate const & c : to_delete) { for (candidate const & c : to_delete) {

8
tests/lean/run/redundant_pattern.lean Normal file
View file

@ -0,0 +1,8 @@
constants P : nat → Prop
constants R : nat → nat → Prop
constants f g : nat → nat
definition foo [forward] (m n k : nat) : P (f m) → P (g n) → P (f k) → P k ∧ R (g m) (f n) ∧ P (g m) ∧ P (f n) :=
sorry
print foo