mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

bug fix in shift_var

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-02-14 16:59:31 -08:00
parent 99b71a9f9e
commit b5276e93bb
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/math/lp/int_solver.cpp
View file

@ -513,15 +513,25 @@ bool int_solver::shift_var(unsigned j, unsigned range) {
} }
SASSERT(!inf_l && !inf_u); SASSERT(!inf_l && !inf_u);
mpq r = floor((u - l) / m); // The shift has to be a multiple of m: let us look for s, such that the shift is m*s.
if (r < mpq(range)) range = static_cast<unsigned>(r.get_uint64()); // We have new_val = x+m*s <= u, so m*s <= u-x and, finally, s <= floor((u- x)/m) = a
// the interval contains at least range multiples of m. // The symmetric reasoning gives us s >= ceil((l-x)/m) = b
// the number of multiples to the left of the value of j is floor((get_value(j) - l.x)/m) // We randomly pick s in the segment [b, a]
// shift either left or right of the current value by available multiples. mpq a = floor((u - x) / m);
impq shift = impq(random() % (range + 1)) - impq(floor((x - l) / m)); mpq b = ceil((l - x) / m);
impq new_val = x + m * shift; mpq r = a - b;
if (!r.is_pos())
return false;
TRACE("int_solver", tout << "a = " << a << ", b = " << b << ", r = " << r<< ", m = " << m << "\n";);
if (r < mpq(range))
range = static_cast<unsigned>(r.get_uint64());
mpq s = b + mpq(random() % (range + 1));
impq new_val = x + m * impq(s);
TRACE("int_solver", tout << "new_val = " << new_val << "\n";);
SASSERT(l <= new_val && new_val <= u); SASSERT(l <= new_val && new_val <= u);
set_value_for_nbasic_column_ignore_old_values(j, new_val); return true; set_value_for_nbasic_column_ignore_old_values(j, new_val);
return true;
} }
bool int_solver::non_basic_columns_are_at_bounds() const { bool int_solver::non_basic_columns_are_at_bounds() const {