mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-03 11:25:40 +00:00
Code Activity

propagate lineal monomial

Browse source
This commit is contained in:
Lev Nachmanson 2023-09-01 11:18:03 -07:00
parent 5509b468e9
commit d3258e7084
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/math/lp/monomial_bounds.cpp
View file

@ -283,7 +283,7 @@ namespace nla {
break; break;
} }
} }
lemma |= ineq(m.var(), lp::lconstraint_kind::NE, 0); lemma += ineq(m.var(), lp::lconstraint_kind::EQ, 0);
} }
else { else {
for (auto v : m) for (auto v : m)
@ -295,9 +295,9 @@ namespace nla {
lp::lar_term term; lp::lar_term term;
term.add_var(m.var()); term.add_var(m.var());
term.add_monomial(-k, w); term.add_monomial(-k, w);
lemma |= ineq(term, lp::lconstraint_kind::NE, 0); lemma += ineq(term, lp::lconstraint_kind::EQ, 0);
} else { } else {
lemma |= ineq(m.var(), lp::lconstraint_kind::NE, k); lemma += ineq(m.var(), lp::lconstraint_kind::EQ, k);
} }
} }

11
src/math/lp/nla_core.cpp
View file

@ -1057,6 +1057,17 @@ new_lemma& new_lemma::operator|=(ineq const& ineq) {
return *this; return *this;
} }
// Contrary to new_lemma::operator|=, this method does not assert that the model does not satisfy the ineq.
// If ineq holds then it is a nop.
new_lemma& new_lemma::operator+=(ineq const& ineq) {
if (c.ineq_holds(ineq)) return *this;
if (!c.explain_ineq(*this, ineq.term(), ineq.cmp(), ineq.rs())) {
current().push_back(ineq);
}
return *this;
}
new_lemma::~new_lemma() { new_lemma::~new_lemma() {
static int i = 0; static int i = 0;

1
src/math/lp/nla_types.h
View file

@ -83,6 +83,7 @@ namespace nla {
new_lemma& operator&=(const factorization& f); new_lemma& operator&=(const factorization& f);
new_lemma& operator&=(lpvar j); new_lemma& operator&=(lpvar j);
new_lemma& operator|=(ineq const& i); new_lemma& operator|=(ineq const& i);
new_lemma& operator+=(ineq const& i);
new_lemma& explain_fixed(lpvar j); new_lemma& explain_fixed(lpvar j);
new_lemma& explain_equiv(lpvar u, lpvar v); new_lemma& explain_equiv(lpvar u, lpvar v);
new_lemma& explain_var_separated_from_zero(lpvar j); new_lemma& explain_var_separated_from_zero(lpvar j);