mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Code Activity

fix bug in blocked clause elimination that was enabled for external variables, fix other bugs in maxres

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-10 21:23:05 -07:00
parent 317e76a11b
commit e832bdd257
9 changed files with 233 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/opt/maxsmt.cpp
View file

@ -134,6 +134,7 @@ namespace opt {
unsigned sz = s().get_num_assertions();
for (unsigned i = 0; i < sz; ++i) {
sat_solver->assert_expr(s().get_assertion(i));
m_assertions.push_back(s().get_assertion(i));
}
m_s = sat_solver;
}
@ -232,16 +233,24 @@ namespace opt {
});
DEBUG_CODE(if (is_sat == l_true) {
m_s->push();
commit_assignment();
VERIFY(l_true == m_s->check_sat(0,0));
m_s->pop(1);
// TBD: check that all extensions are unsat too
verify_assignment();
});
});
// TBD: check that all extensions are unsat too
return is_sat;
}
void maxsmt::verify_assignment() {
m_s->push();
commit_assignment();
if (l_true != m_s->check_sat(0,0)) {
IF_VERBOSE(0, verbose_stream() << "could not verify assignment\n";);
UNREACHABLE();
}
m_s->pop(1);
}
bool maxsmt::get_assignment(unsigned idx) const {
if (m_msolver) {
return m_msolver->get_assignment(idx);