mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity

rename a function

Browse source 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
This commit is contained in:
Lev Nachmanson 2017-07-17 16:41:02 -07:00
parent 729644a2b6
commit 94b3fee6ac
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/util/lp/int_solver.cpp
View file

@ -336,6 +336,7 @@ lia_move int_solver::proceed_with_gomory_cut(lar_term& t, mpq& k, explanation& e
lia_move int_solver::check(lar_term& t, mpq& k, explanation& ex) { lia_move int_solver::check(lar_term& t, mpq& k, explanation& ex) {
if (m_iter_on_gomory_row != nullptr) { if (m_iter_on_gomory_row != nullptr) {
auto ret = proceed_with_gomory_cut(t, k, ex); auto ret = proceed_with_gomory_cut(t, k, ex);
TRACE("gomory_cut", tout << "term t = "; m_lar_solver->print_term_as_indices(t, tout););
if (ret != lia_move::continue_with_check) if (ret != lia_move::continue_with_check)
return ret; return ret;
} }

7
src/util/lp/lar_solver.cpp
View file

@ -1192,6 +1192,13 @@ void lar_solver::print_term(lar_term const& term, std::ostream & out) const {
print_linear_combination_of_column_indices(term.coeffs_as_vector(), out); print_linear_combination_of_column_indices(term.coeffs_as_vector(), out);
} }
void lar_solver::print_term_as_indices(lar_term const& term, std::ostream & out) const {
if (!numeric_traits<mpq>::is_zero(term.m_v)) {
out << term.m_v << " + ";
}
print_linear_combination_of_column_indices_only(term.coeffs_as_vector(), out);
}
mpq lar_solver::get_left_side_val(const lar_base_constraint & cns, const std::unordered_map<var_index, mpq> & var_map) const { mpq lar_solver::get_left_side_val(const lar_base_constraint & cns, const std::unordered_map<var_index, mpq> & var_map) const {
mpq ret = cns.get_free_coeff_of_left_side(); mpq ret = cns.get_free_coeff_of_left_side();
for (auto & it : cns.get_left_side_coefficients()) { for (auto & it : cns.get_left_side_coefficients()) {

4
src/util/lp/lar_solver.h
View file

@ -381,12 +381,14 @@ public:
void print_constraints(std::ostream& out) const ; void print_constraints(std::ostream& out) const ;
void print_terms(std::ostream& out) const ; void print_terms(std::ostream& out) const;
void print_left_side_of_constraint(const lar_base_constraint * c, std::ostream & out) const; void print_left_side_of_constraint(const lar_base_constraint * c, std::ostream & out) const;
void print_term(lar_term const& term, std::ostream & out) const; void print_term(lar_term const& term, std::ostream & out) const;
void print_term_as_indices(lar_term const& term, std::ostream & out) const;
mpq get_left_side_val(const lar_base_constraint & cns, const std::unordered_map<var_index, mpq> & var_map) const; mpq get_left_side_val(const lar_base_constraint & cns, const std::unordered_map<var_index, mpq> & var_map) const;
void print_constraint(const lar_base_constraint * c, std::ostream & out) const; void print_constraint(const lar_base_constraint * c, std::ostream & out) const;