mirror of
https://github.com/Z3Prover/z3
synced 2025-06-06 22:23:22 +00:00
fix in gomory cut
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
4917475f9e
commit
29b9dfe326
1 changed files with 4 additions and 1 deletions
|
@ -45,7 +45,8 @@ class create_cut {
|
||||||
const impq & get_value(unsigned j) const { return lia.get_value(j); }
|
const impq & get_value(unsigned j) const { return lia.get_value(j); }
|
||||||
bool is_int(unsigned j) const { return lia.column_is_int(j) || (lia.is_fixed(j) &&
|
bool is_int(unsigned j) const { return lia.column_is_int(j) || (lia.is_fixed(j) &&
|
||||||
lia.lra.column_lower_bound(j).is_int()); }
|
lia.lra.column_lower_bound(j).is_int()); }
|
||||||
bool is_real(unsigned j) const { return !is_int(j); }
|
bool is_real(unsigned j) const { return lia.is_real(j) && (! (lia.is_fixed(j) &&
|
||||||
|
lia.lra.column_lower_bound(j).is_int())); }
|
||||||
bool at_lower(unsigned j) const { return lia.at_lower(j); }
|
bool at_lower(unsigned j) const { return lia.at_lower(j); }
|
||||||
bool at_upper(unsigned j) const { return lia.at_upper(j); }
|
bool at_upper(unsigned j) const { return lia.at_upper(j); }
|
||||||
const impq & lower_bound(unsigned j) const { return lia.lower_bound(j); }
|
const impq & lower_bound(unsigned j) const { return lia.lower_bound(j); }
|
||||||
|
@ -54,6 +55,8 @@ 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",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue