mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

fix #1782

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-08-02 10:08:16 -07:00
parent 39333273a5
commit fed977b492
6 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/ba_solver.cpp
View file

@ -1976,6 +1976,7 @@ namespace sat {
for (unsigned i = 0; !found && i < c.k(); ++i) {
found = c[i] == l;
}
CTRACE("ba",!found, s().display(tout << l << ":" << c << "\n"););
SASSERT(found););
// IF_VERBOSE(0, if (_debug_conflict) verbose_stream() << "ante " << l << " " << c << "\n");

13
src/sat/sat_solver.cpp
View file

@ -1552,12 +1552,15 @@ namespace sat {
void solver::reinit_assumptions() {
if (tracking_assumptions() && at_base_lvl() && !inconsistent()) {
TRACE("sat", tout << m_assumptions << "\n";);
if (!propagate(false)) return;
push();
for (unsigned i = 0; !inconsistent() && i < m_user_scope_literals.size(); ++i) {
assign(~m_user_scope_literals[i], justification());
for (literal lit : m_user_scope_literals) {
if (inconsistent()) break;
assign(~lit, justification());
}
for (unsigned i = 0; !inconsistent() && i < m_assumptions.size(); ++i) {
assign(m_assumptions[i], justification());
for (literal lit : m_assumptions) {
if (inconsistent()) break;
assign(lit, justification());
}
TRACE("sat",
for (literal a : m_assumptions) {
@ -2934,7 +2937,7 @@ namespace sat {
break;
}
case justification::EXT_JUSTIFICATION: {
fill_ext_antecedents(m_lemma[i], js);
fill_ext_antecedents(~m_lemma[i], js);
for (literal l : m_ext_antecedents) {
update_lrb_reasoned(l);
}