mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

add right side to struct ineq in nla_solver

Browse source 
Signed-off-by: Lev <levnach@hotmail.com>
This commit is contained in:
Lev 2018-09-25 16:37:14 -07:00 committed by Lev Nachmanson
parent de56ead538
commit 85cd566e1f
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/util/lp/nla_solver.cpp
View file

@ -331,7 +331,7 @@ struct solver::imp {
t.add_coeff_var(rational(1), a.var()); t.add_coeff_var(rational(1), a.var());
t.add_coeff_var(rational(- sign), b.var()); t.add_coeff_var(rational(- sign), b.var());
TRACE("nla_solver", print_explanation_and_lemma(tout);); TRACE("nla_solver", print_explanation_and_lemma(tout););
ineq in(lp::lconstraint_kind::NE, t); ineq in(lp::lconstraint_kind::NE, t, rational::zero());
m_lemma->push_back(in); m_lemma->push_back(in);
} }
@ -516,8 +516,7 @@ struct solver::imp {
lp::lar_term t; lp::lar_term t;
t.add_coeff_var(rational(1), m_monomials[i_mon].var()); t.add_coeff_var(rational(1), m_monomials[i_mon].var());
SASSERT(false); // figure out the change!!!!!! SASSERT(false); // figure out the change!!!!!!
// t.m_v = -rs; ineq in(kind, t, rs);
ineq in(kind, t);
m_lemma->push_back(in); m_lemma->push_back(in);
TRACE("nla_solver", print_explanation_and_lemma(tout);); TRACE("nla_solver", print_explanation_and_lemma(tout););
return true; return true;
@ -543,7 +542,7 @@ struct solver::imp {
ineq ineq_j_is_equal_to_zero(lpvar j) const { ineq ineq_j_is_equal_to_zero(lpvar j) const {
lp::lar_term t; lp::lar_term t;
t.add_coeff_var(rational(1), j); t.add_coeff_var(rational(1), j);
ineq i(lp::lconstraint_kind::EQ, t); ineq i(lp::lconstraint_kind::EQ, t, rational::zero());
return i; return i;
} }
@ -763,7 +762,7 @@ struct solver::imp {
lp::lar_term t; lp::lar_term t;
t.add_coeff_var(rational(1), m.var()); t.add_coeff_var(rational(1), m.var());
t.add_coeff_var(rational(- sign), j); t.add_coeff_var(rational(- sign), j);
ineq in(lp::lconstraint_kind::EQ, t); ineq in(lp::lconstraint_kind::EQ, t, rational::zero());
m_lemma->push_back(in); m_lemma->push_back(in);
TRACE("nla_solver", print_explanation_and_lemma(tout);); TRACE("nla_solver", print_explanation_and_lemma(tout););
} }
@ -838,18 +837,18 @@ struct solver::imp {
// the first literal // the first literal
lp::lar_term t; lp::lar_term t;
t.add_coeff_var(rational(j_sign), j); t.add_coeff_var(rational(j_sign), j);
m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t, rational::zero()));
t.clear(); t.clear();
// the second literal // the second literal
t.add_coeff_var(rational(mon_sign), m.var()); t.add_coeff_var(rational(mon_sign), m.var());
m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t, rational::zero()));
t.clear(); t.clear();
// the third literal // the third literal
t.add_coeff_var(rational(mon_sign), m.var()); t.add_coeff_var(rational(mon_sign), m.var());
t.add_coeff_var(- rational(j_sign), j); t.add_coeff_var(- rational(j_sign), j);
m_lemma->push_back(ineq(lp::lconstraint_kind::GE, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::GE, t, rational::zero()));
} }
bool large_lemma_for_proportion_case(const mon_eq& m, const unsigned_vector & mask, bool large_lemma_for_proportion_case(const mon_eq& m, const unsigned_vector & mask,
@ -911,16 +910,16 @@ struct solver::imp {
lp::lar_term t; lp::lar_term t;
// the first literal // the first literal
t.add_coeff_var(rational(j_sign), j); t.add_coeff_var(rational(j_sign), j);
m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t, rational::zero()));
//the second literal //the second literal
t.clear(); t.clear();
t.add_coeff_var(rational(mon_sign), m.var()); t.add_coeff_var(rational(mon_sign), m.var());
m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::LT, t, rational::zero()));
// the third literal // the third literal
t.clear(); t.clear();
t.add_coeff_var(rational(j_sign), j); t.add_coeff_var(rational(j_sign), j);
t.add_coeff_var(- rational(mon_sign), m.var()); t.add_coeff_var(- rational(mon_sign), m.var());
m_lemma->push_back(ineq(lp::lconstraint_kind::GE, t)); m_lemma->push_back(ineq(lp::lconstraint_kind::GE, t, rational::zero()));
} }
bool large_basic_lemma_for_mon_proportionality(unsigned i_mon, const unsigned_vector& large) { bool large_basic_lemma_for_mon_proportionality(unsigned i_mon, const unsigned_vector& large) {

3
src/util/lp/nla_solver.h
View file

@ -28,7 +28,8 @@ namespace nla {
struct ineq { struct ineq {
lp::lconstraint_kind m_cmp; lp::lconstraint_kind m_cmp;
lp::lar_term m_term; lp::lar_term m_term;
ineq(lp::lconstraint_kind cmp, const lp::lar_term& term) : m_cmp(cmp), m_term(term) {} rational m_rs;
ineq(lp::lconstraint_kind cmp, const lp::lar_term& term, const rational& rs) : m_cmp(cmp), m_term(term), m_rs(rs) {}
}; };
typedef vector<ineq> lemma; typedef vector<ineq> lemma;