3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-11 10:18:06 +00:00
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-10-04 19:50:42 -07:00
parent 2bf0b5f33f
commit db20b2502d
11 changed files with 338 additions and 92 deletions

View file

@ -483,7 +483,6 @@ namespace sat {
void solver::set_conflict(justification c, literal not_l) {
if (m_inconsistent)
return;
TRACE("sat", tout << "conflict: " << not_l << "\n";);
m_inconsistent = true;
m_conflict = c;
m_not_l = not_l;
@ -960,7 +959,11 @@ namespace sat {
m_stopwatch.start();
m_core.reset();
TRACE("sat", display(tout););
if (m_config.m_bcd) {
bceq bc(*this);
bc();
}
}
/**
@ -1737,11 +1740,10 @@ namespace sat {
// TBD:
// apply optional clause minimization by detecting subsumed literals.
// initial experiment suggests it has no effect.
m_mus(); // ignore return value on cancelation.
m_model.reset();
m_model.append(m_mus.get_model());
m_model_is_current = true;
m_model_is_current = !m_model.empty();
}
}