mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 17:45:32 +00:00
Code Activity

fix #1675, regression in core processing in maxres

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-06-19 23:23:19 -07:00
parent 26e9321517
commit 335d672bf1
43 changed files with 246 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/solver/mus.cpp
View file

@ -332,8 +332,7 @@ struct mus::imp {
m_solver.get_model(mdl);
rational w;
for (unsigned i = 0; i < m_soft.size(); ++i) {
mdl->eval(m_soft[i].get(), tmp);
if (!m.is_true(tmp)) {
if (!mdl->is_true(m_soft.get(i))) {
w += m_weights[i];
}
}

3
src/solver/solver.cpp
View file

@ -44,7 +44,7 @@ std::ostream& solver::display(std::ostream & out, unsigned n, expr* const* assum
ast_pp_util visitor(get_manager());
model_converter_ref mc = get_model_converter();
if (mc.get()) {
mc->collect(visitor);
mc->set_env(&visitor);
}
visitor.collect(fmls);
visitor.collect(n, assumptions);
@ -52,6 +52,7 @@ std::ostream& solver::display(std::ostream & out, unsigned n, expr* const* assum
visitor.display_asserts(out, fmls, true);
if (mc.get()) {
mc->display(out);
mc->set_env(nullptr);
}
return out;
}