mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

fix in gomory: revert some changes

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-03-04 20:53:34 -08:00
parent b8d7af59f4
commit 0ee541204f
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,8 +54,6 @@ class create_cut {
constraint_index column_upper_bound_constraint(unsigned j) const { return lia.column_upper_bound_constraint(j); } constraint_index column_upper_bound_constraint(unsigned j) const { return lia.column_upper_bound_constraint(j); }
bool column_is_fixed(unsigned j) const { return lia.lra.column_is_fixed(j); } bool column_is_fixed(unsigned j) const { return lia.lra.column_is_fixed(j); }
void int_case_in_gomory_cut(unsigned j) { void int_case_in_gomory_cut(unsigned j) {
lp_assert(is_int(j) && m_fj.is_pos()); lp_assert(is_int(j) && m_fj.is_pos());
TRACE("gomory_cut_detail", TRACE("gomory_cut_detail",
@ -73,7 +71,7 @@ class create_cut {
} }
else { else {
lp_assert(at_upper(j)); lp_assert(at_upper(j));
// here we have the expression new_a*(xj - ub), so new_a*lb(j) is added to m_k // here we have the expression new_a*(xj - ub), so new_a*ub(j) is added to m_k
new_a = - (m_fj <= m_f ? m_fj / m_f : ((1 - m_fj) / m_one_minus_f)); new_a = - (m_fj <= m_f ? m_fj / m_f : ((1 - m_fj) / m_one_minus_f));
lp_assert(new_a.is_neg()); lp_assert(new_a.is_neg());
m_k.addmul(new_a, upper_bound(j).x); m_k.addmul(new_a, upper_bound(j).x);