mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-13 19:20:18 +00:00
Code Activity

updated sat solver for cores

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-07-29 14:38:17 -07:00
parent 0e9511b597
commit 2b1af8fd50
9 changed files with 92 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sat/sat_solver.cpp
View file

@ -699,7 +699,11 @@ namespace sat {
init_search();
init_assumptions(num_lits, lits);
propagate(false);
if (inconsistent()) return l_false;
if (inconsistent()) {
if (tracking_assumptions())
resolve_conflict();
return l_false;
}
cleanup();
if (m_config.m_max_conflicts > 0 && m_config.m_burst_search > 0) {
m_restart_threshold = m_config.m_burst_search;
@ -867,6 +871,7 @@ namespace sat {
m_assumptions.push_back(l);
mk_clause(1, &l);
}
TRACE("sat", display(tout););
}
void solver::reinit_assumptions() {
@ -1564,7 +1569,6 @@ namespace sat {
literal l = m_trail[idx];
if (is_marked(l.var()))
break;
SASSERT(idx > 0);
idx--;
}