mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

merge

Browse source
This commit is contained in:
Nikolaj Bjorner 2023-10-25 16:38:18 -07:00
parent 20c54048f7
commit 4434cee5df
2 changed files with 80 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/math/lp/nra_solver.cpp
View file

@ -18,6 +18,7 @@ namespace nra {
typedef nla::mon_eq mon_eq; typedef nla::mon_eq mon_eq;
typedef nla::variable_map_type variable_map_type; typedef nla::variable_map_type variable_map_type;
struct solver::imp { struct solver::imp {
lp::lar_solver& lra; lp::lar_solver& lra;
reslimit& m_limit; reslimit& m_limit;
@ -128,7 +129,7 @@ struct solver::imp {
// add polynomial definitions. // add polynomial definitions.
for (auto const& m : m_mon_set) for (auto const& m : m_mon_set)
add_monic_eq(m_nla_core.emons()[m]); add_monic_eq(m_nla_core.emons()[m]);
// add term definitions. // add term definitions.
for (unsigned i : m_term_set) for (unsigned i : m_term_set)
@ -146,30 +147,31 @@ struct solver::imp {
throw; throw;
} }
} }
#if 0
TRACE("nra", TRACE("nra",
m_nlsat->display(tout << r << "\n"); m_nlsat->display(tout << r << "\n");
display(tout); display(tout);
for (auto [j, x] : m_lp2nl) tout << "j" << j << " := x" << x << "\n"; for (auto [j, x] : m_lp2nl) tout << "j" << j << " := x" << x << "\n";);
); #endif
switch (r) { switch (r) {
case l_true: case l_true:
m_nla_core.set_use_nra_model(true); m_nla_core.set_use_nra_model(true);
lra.init_model(); lra.init_model();
for (lp::constraint_index ci : lra.constraints().indices()) for (lp::constraint_index ci : lra.constraints().indices())
if (!check_constraint(ci)) { if (!check_constraint(ci)) {
IF_VERBOSE(0, verbose_stream() << "constraint " << ci << " violated\n"; IF_VERBOSE(0, verbose_stream() << "constraint " << ci << " violated\n";
lra.constraints().display(verbose_stream())); lra.constraints().display(verbose_stream()));
UNREACHABLE(); UNREACHABLE();
return l_undef; return l_undef;
}
for (auto const& m : m_nla_core.emons()) {
if (!check_monic(m)) {
IF_VERBOSE(0, verbose_stream() << "monic " << m << " violated\n";
lra.constraints().display(verbose_stream()));
UNREACHABLE();
return l_undef;
}
} }
for (auto const& m : m_nla_core.emons()) {
if (!check_monic(m)) {
IF_VERBOSE(0, verbose_stream() << "monic " << m << " violated\n";
lra.constraints().display(verbose_stream()));
UNREACHABLE();
return l_undef;
}
}
break; break;
case l_false: { case l_false: {
lp::explanation ex; lp::explanation ex;
@ -322,22 +324,22 @@ struct solver::imp {
m_lp2nl.reset(); m_lp2nl.reset();
m_term_set.reset(); m_term_set.reset();
for (auto const& eq : eqs) for (auto const& eq : eqs)
add_eq(*eq); add_eq(*eq);
for (auto const& m : m_nla_core.emons()) for (auto const& m : m_nla_core.emons())
if (any_of(m.vars(), [&](lp::lpvar v) { return m_lp2nl.contains(v); })) if (any_of(m.vars(), [&](lp::lpvar v) { return m_lp2nl.contains(v); }))
add_monic_eq_bound(m); add_monic_eq_bound(m);
for (unsigned i : m_term_set) for (unsigned i : m_term_set)
add_term(i); add_term(i);
for (auto const& [v, w] : m_lp2nl) { for (auto const& [v, w] : m_lp2nl) {
if (lra.column_has_lower_bound(v)) if (lra.column_has_lower_bound(v))
add_lb(lra.get_lower_bound(v), w, lra.get_column_lower_bound_witness(v)); add_lb(lra.get_lower_bound(v), w, lra.get_column_lower_bound_witness(v));
if (lra.column_has_upper_bound(v)) if (lra.column_has_upper_bound(v))
add_ub(lra.get_upper_bound(v), w, lra.get_column_upper_bound_witness(v)); add_ub(lra.get_upper_bound(v), w, lra.get_column_upper_bound_witness(v));
} }
lbool r = l_undef; lbool r = l_undef;
try { try {
r = m_nlsat->check(); r = m_nlsat->check();
} }
catch (z3_exception&) { catch (z3_exception&) {
if (m_limit.is_canceled()) { if (m_limit.is_canceled()) {
@ -355,7 +357,7 @@ struct solver::imp {
for (lp::constraint_index ci : lra.constraints().indices()) for (lp::constraint_index ci : lra.constraints().indices())
if (!check_constraint(ci)) if (!check_constraint(ci))
return l_undef; return l_undef;
for (auto const& m : m_nla_core.emons()) { for (auto const& m : m_nla_core.emons())
if (!check_monic(m)) if (!check_monic(m))
return l_undef; return l_undef;
break; break;
@ -376,7 +378,6 @@ struct solver::imp {
case l_undef: case l_undef:
break; break;
} }
return r; return r;
} }
@ -389,7 +390,7 @@ struct solver::imp {
for (auto const& eq : eqs) for (auto const& eq : eqs)
add_eq(eq); add_eq(eq);
for (auto const& m : m_nla_core.emons()) for (auto const& m : m_nla_core.emons())
add_monic_eq(m); add_monic_eq(m);
for (auto const& [v, w] : m_lp2nl) { for (auto const& [v, w] : m_lp2nl) {
if (lra.column_has_lower_bound(v)) if (lra.column_has_lower_bound(v))
add_lb(lra.get_lower_bound(v), w); add_lb(lra.get_lower_bound(v), w);
@ -422,7 +423,6 @@ struct solver::imp {
verbose_stream() << "x" << w << " <= " << lra.get_upper_bound(v) << "\n"; verbose_stream() << "x" << w << " <= " << lra.get_upper_bound(v) << "\n";
}); });
return r; return r;
} }
@ -439,13 +439,12 @@ struct solver::imp {
normeq *= lc; normeq *= lc;
polynomial::manager& pm = m_nlsat->pm(); polynomial::manager& pm = m_nlsat->pm();
polynomial::polynomial_ref p(pdd2polynomial(normeq), pm); polynomial::polynomial_ref p(pdd2polynomial(normeq), pm);
bool is_even[1] = { false }; bool is_even[1] = {false};
polynomial::polynomial* ps[1] = { p }; polynomial::polynomial* ps[1] = {p};
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even); nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
m_nlsat->mk_clause(1, &lit, a); m_nlsat->mk_clause(1, &lit, a);
} }
void add_lb(lp::impq const& b, unsigned w, nlsat::assumption a = nullptr) { void add_lb(lp::impq const& b, unsigned w, nlsat::assumption a = nullptr) {
polynomial::manager& pm = m_nlsat->pm(); polynomial::manager& pm = m_nlsat->pm();
polynomial::polynomial_ref p(pm.mk_polynomial(w), pm); polynomial::polynomial_ref p(pm.mk_polynomial(w), pm);
@ -473,8 +472,8 @@ struct solver::imp {
polynomial::manager& pm = m_nlsat->pm(); polynomial::manager& pm = m_nlsat->pm();
polynomial::polynomial_ref p2(pm.mk_const(bound), pm); polynomial::polynomial_ref p2(pm.mk_const(bound), pm);
polynomial::polynomial_ref p(pm.sub(p1, p2), pm); polynomial::polynomial_ref p(pm.sub(p1, p2), pm);
polynomial::polynomial* ps[1] = { p }; polynomial::polynomial* ps[1] = {p};
bool is_even[1] = { false }; bool is_even[1] = {false};
nlsat::literal lit = m_nlsat->mk_ineq_literal(k, 1, ps, is_even); nlsat::literal lit = m_nlsat->mk_ineq_literal(k, 1, ps, is_even);
if (neg) if (neg)
lit.neg(); lit.neg();
@ -503,6 +502,8 @@ struct solver::imp {
return pm.add(lo, mp); return pm.add(lo, mp);
} }
bool is_int(lp::var_index v) { bool is_int(lp::var_index v) {
return lra.var_is_int(v); return lra.var_is_int(v);
} }
@ -539,8 +540,8 @@ struct solver::imp {
coeffs.push_back(-den); coeffs.push_back(-den);
polynomial::manager& pm = m_nlsat->pm(); polynomial::manager& pm = m_nlsat->pm();
polynomial::polynomial_ref p(pm.mk_linear(coeffs.size(), coeffs.data(), vars.data(), rational(0)), pm); polynomial::polynomial_ref p(pm.mk_linear(coeffs.size(), coeffs.data(), vars.data(), rational(0)), pm);
polynomial::polynomial* ps[1] = { p }; polynomial::polynomial* ps[1] = {p};
bool is_even[1] = { false }; bool is_even[1] = {false};
nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even); nlsat::literal lit = m_nlsat->mk_ineq_literal(nlsat::atom::kind::EQ, 1, ps, is_even);
m_nlsat->mk_clause(1, &lit, nullptr); m_nlsat->mk_clause(1, &lit, nullptr);
} }

2
src/math/lp/nra_solver.h
View file

@ -19,8 +19,6 @@ namespace lp {
namespace nra { namespace nra {
class solver { class solver {
struct imp; struct imp;
imp* m_imp; imp* m_imp;