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

fix bugs in optimization for integers

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-15 08:46:24 +02:00
parent b764c7bbee
commit ddd0bf875d
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/opt/weighted_maxsat.cpp
View file

@ -111,7 +111,7 @@ namespace smt {
} }
} }
if (m_min_cost_atom) { if (!initialized && m_min_cost_atom) {
app* var = m_min_cost_atom; app* var = m_min_cost_atom;
if (!ctx.e_internalized(var)) { if (!ctx.e_internalized(var)) {
ctx.mk_enode(var, false, true, true); ctx.mk_enode(var, false, true, true);

7
src/smt/theory_arith_aux.h
View file

@ -480,10 +480,11 @@ namespace smt {
typename vector<row_entry>::const_iterator it = r.begin_entries(); typename vector<row_entry>::const_iterator it = r.begin_entries();
typename vector<row_entry>::const_iterator end = r.end_entries(); typename vector<row_entry>::const_iterator end = r.end_entries();
for (; it != end; ++it) { for (; it != end; ++it) {
if (!it->is_dead() && !it->m_coeff.is_int()) if (!it->is_dead() && !it->m_coeff.is_int()) {
TRACE("gomory_cut", display_row(tout, r, true);); TRACE("gomory_cut", display_row(tout, r, true););
return false; return false;
} }
}
return true; return true;
} }
@ -949,6 +950,10 @@ namespace smt {
if (curr_gain.is_neg()) if (curr_gain.is_neg())
curr_gain.neg(); curr_gain.neg();
if (x_i == null_theory_var || (curr_gain < gain) || (gain.is_zero() && curr_gain.is_zero() && s < x_i)) { if (x_i == null_theory_var || (curr_gain < gain) || (gain.is_zero() && curr_gain.is_zero() && s < x_i)) {
if (is_int(s) && !curr_gain.is_int())
continue;
if (is_int(x_j) && !curr_gain.is_int())
continue;
x_i = s; x_i = s;
a_ij = coeff; a_ij = coeff;
gain = curr_gain; gain = curr_gain;