mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-16 19:06:17 +00:00
Code Activity

#5417

Browse source 
strict inequality (over reals) require solving for least-upper/greatest-lower bounds that may coincide with non-strict inequalities (be epsilon stronger). Instead of using the coefficient 'a' to turn the inequality into an equality, add the slack value as a constant.
This commit is contained in:
Nikolaj Bjorner 2021-07-19 13:19:03 -07:00
parent 49b94a0090
commit 188a478214
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/math/simplex/model_based_opt.cpp
View file

@ -528,6 +528,13 @@ namespace opt {
} }
} }
/**
* a1 > 0
* a1*x + r1 = value
* a2*x + r2 <= 0
* ------------------
* a1*r2 - a2*r1 <= value
*/
void model_based_opt::solve(unsigned row_src, rational const& a1, unsigned row_dst, unsigned x) { void model_based_opt::solve(unsigned row_src, rational const& a1, unsigned row_dst, unsigned x) {
SASSERT(a1 == get_coefficient(row_src, x)); SASSERT(a1 == get_coefficient(row_src, x));
SASSERT(a1.is_pos()); SASSERT(a1.is_pos());
@ -1205,10 +1212,9 @@ namespace opt {
SASSERT(a.is_pos()); SASSERT(a.is_pos());
if (ty == t_lt) { if (ty == t_lt) {
SASSERT(compute_def); SASSERT(compute_def);
m_rows[row_id1].m_coeff += a; m_rows[row_id1].m_coeff -= m_rows[row_id1].m_value;
m_rows[row_id1].m_type = t_le; m_rows[row_id1].m_type = t_le;
m_rows[row_id1].m_value += a; m_rows[row_id1].m_value = 0;
}
if (m_var2is_int[x] && !a.is_one()) { if (m_var2is_int[x] && !a.is_one()) {
row& r1 = m_rows[row_id1]; row& r1 = m_rows[row_id1];
vector<var> coeffs; vector<var> coeffs;