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

fix #6265

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-08-12 10:22:22 -04:00
parent 03385bf78d
commit b6d71fccd8
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/smt/theory_lra.cpp
View file

@ -3507,16 +3507,15 @@ public:
case lp::lp_status::OPTIMAL: { case lp::lp_status::OPTIMAL: {
init_variable_values(); init_variable_values();
TRACE("arith", display(tout << st << " v" << v << " vi: " << vi << "\n");); TRACE("arith", display(tout << st << " v" << v << " vi: " << vi << "\n"););
inf_rational val = get_value(v); auto val = value(v);
// inf_rational val(term_max.x, term_max.y);
blocker = mk_gt(v); blocker = mk_gt(v);
return inf_eps(rational::zero(), val); return val;
} }
case lp::lp_status::FEASIBLE: { case lp::lp_status::FEASIBLE: {
inf_rational val = get_value(v); auto val = value(v);
TRACE("arith", display(tout << st << " v" << v << " vi: " << vi << "\n");); TRACE("arith", display(tout << st << " v" << v << " vi: " << vi << "\n"););
blocker = mk_gt(v); blocker = mk_gt(v);
return inf_eps(rational::zero(), val); return val;
} }
default: default:
SASSERT(st == lp::lp_status::UNBOUNDED); SASSERT(st == lp::lp_status::UNBOUNDED);
@ -3533,23 +3532,19 @@ public:
rational r = val.x; rational r = val.x;
expr_ref e(m); expr_ref e(m);
if (a.is_int(obj->get_sort())) { if (a.is_int(obj->get_sort())) {
if (r.is_int()) { if (r.is_int())
r += rational::one(); r += rational::one();
} else
else {
r = ceil(r); r = ceil(r);
}
e = a.mk_numeral(r, obj->get_sort()); e = a.mk_numeral(r, obj->get_sort());
e = a.mk_ge(obj, e); e = a.mk_ge(obj, e);
} }
else { else {
e = a.mk_numeral(r, obj->get_sort()); e = a.mk_numeral(r, obj->get_sort());
if (val.y.is_neg()) { if (val.y.is_neg())
e = a.mk_ge(obj, e); e = a.mk_ge(obj, e);
} else
else {
e = a.mk_gt(obj, e); e = a.mk_gt(obj, e);
}
} }
TRACE("opt", tout << "v" << v << " " << val << " " << r << " " << e << "\n";); TRACE("opt", tout << "v" << v << " " << val << " " << r << " " << e << "\n";);
return e; return e;