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

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-09-19 17:12:32 -07:00
parent c8e8b4796f
commit dcda39e76e
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,12 +197,21 @@ class gomory::imp {
out << "(assert ( = ( +"; out << "(assert ( = ( +";
dump_row_coefficients(out) << ") 0))\n"; dump_row_coefficients(out) << ") 0))\n";
} }
void dump_declaration(std::ostream& out, unsigned v) const {
out << "(declare-const " << var_name(v) << (is_int(v) ? " Int" : " Real") << ")\n";
}
void dump_declarations(std::ostream& out) const { void dump_declarations(std::ostream& out) const {
// for a column j the var name is vj // for a column j the var name is vj
for (const auto & p : m_row) { for (const auto & p : m_row) {
out << "(declare-const " << var_name(p.var()) dump_declaration(out, p.var());
<< (is_int(p.var())? " Int" : " Real") << ")\n"; }
for (const auto& p : m_t) {
unsigned v = p.var();
if (m_int_solver.m_lar_solver->is_term(v)) {
dump_declaration(out, v);
}
} }
} }
@ -298,7 +307,7 @@ public:
lp_assert(m_int_solver.current_solution_is_inf_on_cut()); lp_assert(m_int_solver.current_solution_is_inf_on_cut());
TRACE("gomory_cut_detail", dump_cut_and_constraints_as_smt_lemma(tout);); TRACE("gomory_cut_detail", dump_cut_and_constraints_as_smt_lemma(tout););
m_int_solver.m_lar_solver->subs_term_columns(m_t, m_k); m_int_solver.m_lar_solver->subs_term_columns(m_t, m_k);
// TBD: validate result of subs_term_columns TRACE("gomory_cut_detail", dump_cut_and_constraints_as_smt_lemma(tout););
TRACE("gomory_cut", print_linear_combination_of_column_indices_only(m_t, tout << "gomory cut:"); tout << " <= " << m_k << std::endl;); TRACE("gomory_cut", print_linear_combination_of_column_indices_only(m_t, tout << "gomory cut:"); tout << " <= " << m_k << std::endl;);
return lia_move::cut; return lia_move::cut;
} }

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

@ -239,8 +239,7 @@ public:
void analyze_new_bounds_on_row_tableau( void analyze_new_bounds_on_row_tableau(
unsigned row_index, unsigned row_index,
bound_propagator & bp bound_propagator & bp);
);
void substitute_basis_var_in_terms_for_row(unsigned i); void substitute_basis_var_in_terms_for_row(unsigned i);
@ -549,7 +548,6 @@ public:
mpq v = it->second; mpq v = it->second;
t.m_coeffs.erase(it); t.m_coeffs.erase(it);
t.m_coeffs[p.second] = v; t.m_coeffs[p.second] = v;
if (lt.m_v.is_zero()) continue;
rs -= v * lt.m_v; rs -= v * lt.m_v;
} }
} }