mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 08:28:44 +00:00
Code Activity

revert effect of filtering unsupported

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2023-01-20 17:28:24 -08:00
parent 4e6d498a60
commit 806a4772bc
2 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/math/lp/factorization.cpp
View file

@ -23,7 +23,7 @@ bool const_iterator_mon::get_factors(factor& k, factor& j, rational& sign) const
std::sort(k_vars.begin(), k_vars.end()); std::sort(k_vars.begin(), k_vars.end());
std::sort(j_vars.begin(), j_vars.end()); std::sort(j_vars.begin(), j_vars.end());
if (false && m_num_failures > 10) { if (m_num_failures > 1000) {
for (bool& m : m_mask) m = true; for (bool& m : m_mask) m = true;
m_mask[0] = false; m_mask[0] = false;
m_full_factorization_returned = true; m_full_factorization_returned = true;

59
src/smt/theory_lra.cpp
View file

@ -456,6 +456,7 @@ class theory_lra::imp {
} }
else if (a.is_power(n, n1, n2)) { else if (a.is_power(n, n1, n2)) {
found_unsupported(n); found_unsupported(n);
if (!ctx().relevancy()) mk_power_axiom(n, n1, n2);
st.to_ensure_var().push_back(n1); st.to_ensure_var().push_back(n1);
st.to_ensure_var().push_back(n2); st.to_ensure_var().push_back(n2);
} }
@ -1099,6 +1100,16 @@ public:
mk_is_int_axiom(n); mk_is_int_axiom(n);
else if (m.is_ite(n)) else if (m.is_ite(n))
mk_ite_axiom(n); mk_ite_axiom(n);
else if (a.is_power(n, n1, n2))
mk_power_axiom(n, n1, n2);
}
void mk_power_axiom(expr* p, expr* x, expr* y) {
rational r;
if (a.is_extended_numeral(x, r) && r.is_unsigned() && r.is_pos()) {
expr_ref zero(a.mk_real(0), m);
mk_axiom(~mk_literal(a.mk_le(p, zero)));
}
} }
// n < 0 || rem(a, n) = mod(a, n) // n < 0 || rem(a, n) = mod(a, n)
@ -1557,23 +1568,51 @@ public:
} }
final_check_status eval_power(expr* e) { final_check_status eval_power(expr* e) {
return FC_GIVEUP;
expr* x, * y; expr* x, * y;
VERIFY(a.is_power(e, x, y)); VERIFY(a.is_power(e, x, y));
enode* n = get_enode(e);
enode* xn = get_enode(x); enode* xn = get_enode(x);
enode* yn = get_enode(y); enode* yn = get_enode(y);
if (!xn || !yn) if (!n || !xn || !yn)
return FC_GIVEUP; return FC_GIVEUP;
rational valx, valy, valn; rational valx, valy, valn;
bool vx = get_value(xn, valx); theory_var v = n->get_th_var(get_id());
bool vy = get_value(yn, valy); if (!get_value(xn, valx))
enode* n = get_enode(e); return FC_GIVEUP;
bool vn = get_value(n, valn); if (!get_value(yn, valy))
verbose_stream() << vx << " " << valx << " " << vy << " " << valy << "\n"; return FC_GIVEUP;
verbose_stream() << vn << " " << valn << "\n"; if (!get_value(n, valn))
return FC_GIVEUP;
verbose_stream() << valx << " " << valy << " " << valn << "\n";
// TBD - check that values align so return FC_DONE.
if (valn < 0 && valx > 0 && valy > 0) {
mk_axiom(mk_literal(a.mk_le(x, a.mk_numeral(rational(0), x->get_sort()))),
~mk_literal(a.mk_le(e, a.mk_numeral(rational(0), e->get_sort()))));
return FC_CONTINUE;
}
// add tangent lemmas for power: // add tangent lemmas for power:
// valx > 0 valy > 0 => n >= rational_floor(valx^valy)
// establish equality using algebraic numerals // establish equality using algebraic numerals
// appears to be useless:
if (false && !valy.is_int() && numerator(valy) == 1 && denominator(valy) > 0) {
rational d = denominator(valy);
if (!d.is_unsigned())
return FC_GIVEUP;
unsigned den = d.get_unsigned();
// e = x^{1/y}
// => e^y = x
ptr_vector<expr> es;
for (unsigned i = 0; i < den; ++i)
es.push_back(e);
expr* em = a.mk_mul(es.size(), es.data());
mk_axiom(~mk_literal(m.mk_eq(y, a.mk_real(valy))), mk_literal(m.mk_eq(em, x)));
return FC_CONTINUE;
}
return FC_GIVEUP; return FC_GIVEUP;
} }
@ -1632,7 +1671,7 @@ public:
return FC_CONTINUE; return FC_CONTINUE;
} }
for (expr* e : m_not_handled) { for (expr* e : m_not_handled) {
if (!ctx().is_relevant(e)) if (!ctx().is_relevant(e) && false)
continue; continue;
st = FC_DONE; st = FC_DONE;
switch (eval_unsupported(e)) { switch (eval_unsupported(e)) {