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

Merge pull request #255 from NikolajBjorner/master

Browse source 
fix another regression and missing detection of bounds, Issue #254
This commit is contained in:
Nikolaj Bjorner 2015-10-22 08:55:13 -07:00
parent 87921f4552 ac902dad1a
commit 5e4f209292
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/smt/theory_arith_aux.h
View file

@ -1530,7 +1530,7 @@ namespace smt {
while (best_efforts < max_efforts && !ctx.get_cancel_flag()) { while (best_efforts < max_efforts && !ctx.get_cancel_flag()) {
theory_var x_j = null_theory_var; theory_var x_j = null_theory_var;
theory_var x_i = null_theory_var; theory_var x_i = null_theory_var;
unsigned has_bound = false; bool has_bound = false;
max_gain.reset(); max_gain.reset();
min_gain.reset(); min_gain.reset();
++round; ++round;
@ -1544,10 +1544,12 @@ namespace smt {
theory_var curr_x_i = null_theory_var; theory_var curr_x_i = null_theory_var;
SASSERT(is_non_base(curr_x_j)); SASSERT(is_non_base(curr_x_j));
curr_coeff = it->m_coeff; curr_coeff = it->m_coeff;
bool curr_inc = curr_coeff.is_pos() ? max : !max; bool curr_inc = curr_coeff.is_pos() ? max : !max;
if ((curr_inc && upper(curr_x_j)) || (!curr_inc && lower(curr_x_j))) {
has_bound = true;
}
if ((curr_inc && at_upper(curr_x_j)) || (!curr_inc && at_lower(curr_x_j))) { if ((curr_inc && at_upper(curr_x_j)) || (!curr_inc && at_lower(curr_x_j))) {
// variable cannot be used for max/min. // variable cannot be used for max/min.
has_bound = true;
continue; continue;
} }
bool picked_var = pick_var_to_leave(curr_x_j, curr_inc, curr_a_ij, bool picked_var = pick_var_to_leave(curr_x_j, curr_inc, curr_a_ij,
@ -1557,7 +1559,7 @@ namespace smt {
SASSERT(!picked_var || safe_gain(curr_min_gain, curr_max_gain)); SASSERT(!picked_var || safe_gain(curr_min_gain, curr_max_gain));
if (!picked_var) { // && (r.size() > 1 || !safe_gain(curr_min_gain, curr_max_gain)) if (!safe_gain(curr_min_gain, curr_max_gain)) {
TRACE("opt", tout << "no variable picked\n";); TRACE("opt", tout << "no variable picked\n";);
best_efforts++; best_efforts++;
} }