mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 22:59:02 +00:00
Code Activity

fix build of test

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-01-21 11:47:37 -06:00
parent 683eed0c1e
commit 045448e5b2
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/algebraic.cpp
View file

@ -397,7 +397,7 @@ static void tst_isolate_roots(polynomial_ref const & p, anum_manager & am,
std::cout << "x1 -> "; am.display_root(std::cout, v1); std::cout << "\n";
std::cout << "x2 -> "; am.display_root(std::cout, v2); std::cout << "\n";
scoped_anum_vector roots(am);
svector<polynomial::sign> signs;
svector<::sign> signs;
am.isolate_roots(p, x2v, roots, signs);
ENSURE(roots.size() + 1 == signs.size());
std::cout << "roots:\n";

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

@ -277,7 +277,7 @@ public:
bool some_int_columns = false;
mpq m_f = fractional_part(get_value(m_inf_col));
TRACE("gomory_cut_detail", tout << "m_f: " << m_f << ", ";
tout << "1 - m_f: " << 1 - m_f << ", get_value(m_inf_col).x - m_f = " << get_value(m_inf_col).x - m_f;);
tout << "1 - m_f: " << 1 - m_f << ", get_value(m_inf_col).x - m_f = " << get_value(m_inf_col).x - m_f << "\n";);
lp_assert(m_f.is_pos() && (get_value(m_inf_col).x - m_f).is_int());
mpq one_min_m_f = 1 - m_f;
@ -285,7 +285,7 @@ public:
unsigned j = p.var();
if (j == m_inf_col) {
lp_assert(p.coeff() == one_of_type<mpq>());
TRACE("gomory_cut_detail", tout << "seeing basic var";);
TRACE("gomory_cut_detail", tout << "seeing basic var\n";);
continue;
}
@ -295,11 +295,17 @@ public:
} else {
if (p.coeff().is_int()) {
// m_fj will be zero and no monomial will be added
if (at_lower(j)) {
m_ex.push_justification(column_lower_bound_constraint(j));
}
if (at_upper(j)) {
m_ex.push_justification(column_upper_bound_constraint(j));
}
continue;
}
some_int_columns = true;
m_fj = fractional_part(-p.coeff());
m_one_minus_fj = 1 - m_fj;
m_one_minus_fj = 1 - m_fj;
int_case_in_gomory_cut(j);
}
}