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

do not delay update for the polar case

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2024-01-11 13:39:37 -10:00
parent 2ac866a8d0
commit 2b974a0f1d
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/math/lp/gomory.cpp
View file

@ -400,8 +400,6 @@ public:
lia_move gomory::get_gomory_cuts(unsigned num_cuts) {
struct cut_result {u_dependency *dep; lar_term t; mpq k; int polarity; lpvar j;};
vector<cut_result> big_cuts;
struct polar_info {lpvar j; int polarity; u_dependency *dep;};
vector<polar_info> polar_vars;
unsigned_vector columns_for_cuts = gomory_select_int_infeasible_vars(num_cuts);
bool has_small_cut = false;
@ -437,10 +435,14 @@ public:
return lia_move::conflict;
continue;
}
if (cc.m_polarity == 1)
lra.update_column_type_and_bound(j, lp::lconstraint_kind::LE, floor(lra.get_column_value(j).x), cc.m_dep);
else if (cc.m_polarity == -1)
lra.update_column_type_and_bound(j, lp::lconstraint_kind::GE, ceil(lra.get_column_value(j).x), cc.m_dep);
cut_result cr = {cc.m_dep, lia.m_t, lia.m_k, cc.m_polarity, j};
if (abs(cr.polarity) == 1) // need to delay the update of the bounds for j in a polar case, because simplify_inequality relies on the old bounds
polar_vars.push_back( {j, cr.polarity, cc.m_dep} );
if (!is_small_cut(lia.m_t)) {
big_cuts.push_back(cr);
continue;
@ -463,17 +465,6 @@ public:
add_cut(cut);
}
// this way we create bounds for the variables in polar cases even where the terms have big numbers
for (auto const& p : polar_vars) {
if (p.polarity == 1) {
lra.update_column_type_and_bound(p.j, lp::lconstraint_kind::LE, floor(lra.get_column_value(p.j).x), p.dep);
}
else {
SASSERT(p.polarity == -1);
lra.update_column_type_and_bound(p.j, lp::lconstraint_kind::GE, ceil(lra.get_column_value(p.j).x), p.dep);
}
}
if (!_check_feasible())
return lia_move::conflict;