mirror of
https://github.com/Z3Prover/z3
synced 2025-04-06 17:44:08 +00:00
fix some warnings
This commit is contained in:
parent
abac52e1d7
commit
7bba8bc0c9
|
@ -1652,8 +1652,8 @@ namespace lp {
|
||||||
const auto& row = m_e_matrix.m_rows[ei];
|
const auto& row = m_e_matrix.m_rows[ei];
|
||||||
auto it = std::find_if (row.begin(), row.end(), [j](const auto& p) {return p.var() == j;} );
|
auto it = std::find_if (row.begin(), row.end(), [j](const auto& p) {return p.var() == j;} );
|
||||||
if (it == row.end()) return false;
|
if (it == row.end()) return false;
|
||||||
return it->coeff() == mpq(1)&& j_sign == 1 ||
|
return (it->coeff() == mpq(1) && j_sign == 1) ||
|
||||||
it->coeff() == mpq(-1) && j_sign == -1;
|
(it->coeff() == mpq(-1) && j_sign == -1);
|
||||||
}
|
}
|
||||||
// j is the variable to eliminate, it appears in row ei of m_e_matrix with
|
// j is the variable to eliminate, it appears in row ei of m_e_matrix with
|
||||||
// a coefficient equal to j_sign which is +-1
|
// a coefficient equal to j_sign which is +-1
|
||||||
|
|
|
@ -34,7 +34,6 @@ namespace lp {
|
||||||
int_solver& lia;
|
int_solver& lia;
|
||||||
lar_solver& lra;
|
lar_solver& lra;
|
||||||
lar_core_solver& lrac;
|
lar_core_solver& lrac;
|
||||||
dioph_eq m_dio;
|
|
||||||
unsigned m_number_of_calls = 0;
|
unsigned m_number_of_calls = 0;
|
||||||
lar_term m_t; // the term to return in the cut
|
lar_term m_t; // the term to return in the cut
|
||||||
bool m_upper; // cut is an upper bound
|
bool m_upper; // cut is an upper bound
|
||||||
|
@ -43,13 +42,14 @@ namespace lp {
|
||||||
hnf_cutter m_hnf_cutter;
|
hnf_cutter m_hnf_cutter;
|
||||||
unsigned m_hnf_cut_period;
|
unsigned m_hnf_cut_period;
|
||||||
unsigned m_dioph_eq_period;
|
unsigned m_dioph_eq_period;
|
||||||
|
dioph_eq m_dio;
|
||||||
int_gcd_test m_gcd;
|
int_gcd_test m_gcd;
|
||||||
|
|
||||||
bool column_is_int_inf(unsigned j) const {
|
bool column_is_int_inf(unsigned j) const {
|
||||||
return lra.column_is_int(j) && (!lia.value_is_int(j));
|
return lra.column_is_int(j) && (!lia.value_is_int(j));
|
||||||
}
|
}
|
||||||
|
|
||||||
imp(int_solver& lia): lia(lia), lra(lia.lra), lrac(lia.lrac), m_hnf_cutter(lia), m_gcd(lia), m_dio(lia) {
|
imp(int_solver& lia): lia(lia), lra(lia.lra), lrac(lia.lrac), m_hnf_cutter(lia), m_dio(lia), m_gcd(lia) {
|
||||||
m_hnf_cut_period = settings().hnf_cut_period();
|
m_hnf_cut_period = settings().hnf_cut_period();
|
||||||
m_dioph_eq_period = settings().m_dioph_eq_period;
|
m_dioph_eq_period = settings().m_dioph_eq_period;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue