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

keep the coefficients of 'at lower' variables positive, and the rest negative for Gomory cuts

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2018-09-19 10:17:27 -07:00
parent ac878698b9
commit a99ebed907
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,14 +55,14 @@ class gomory::imp {
mpq new_a; mpq new_a;
mpq one_minus_fj = 1 - fj; mpq one_minus_fj = 1 - fj;
if (at_lower(j)) { if (at_lower(j)) {
new_a = fj < one_minus_f0? fj / one_minus_f0 : (- one_minus_fj / f0); new_a = fj < one_minus_f0? fj / one_minus_f0 : one_minus_fj / f0;
m_k.addmul(new_a, lower_bound(j).x); m_k.addmul(new_a, lower_bound(j).x);
m_ex.push_justification(column_lower_bound_constraint(j), new_a); m_ex.push_justification(column_lower_bound_constraint(j), new_a);
} }
else { else {
lp_assert(at_upper(j)); lp_assert(at_upper(j));
// the upper terms are inverted: therefore we have the minus // the upper terms are inverted: therefore we have the minus
new_a = fj < f0? (- fj / f0 ) : (one_minus_fj / one_minus_f0); new_a = - (fj < f0? fj / f0 : one_minus_fj / one_minus_f0);
m_k.addmul(new_a, upper_bound(j).x); m_k.addmul(new_a, upper_bound(j).x);
m_ex.push_justification(column_upper_bound_constraint(j), new_a); m_ex.push_justification(column_upper_bound_constraint(j), new_a);
} }