mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 22:23:22 +00:00
Code Activity

disabling skip steps to avoid bogus behavior

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-12-16 05:24:05 +02:00
parent 15b64261dd
commit b1caadee49
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/smt/theory_pb.cpp
View file

@ -1124,9 +1124,15 @@ namespace smt {
while (m_num_marks > 0) { while (m_num_marks > 0) {
TRACE("pb_verbose", display(tout << "lemma ", m_lemma, true););
lbool is_sat = m_lemma.normalize(); lbool is_sat = m_lemma.normalize();
if (is_sat != l_undef) { if (is_sat != l_undef) {
IF_VERBOSE(0, display(verbose_stream() << "lemma already evaluated ", m_lemma, true);); IF_VERBOSE(0, display(verbose_stream() << "lemma already evaluated ", m_lemma, true););
TRACE("pb", display(tout << "lemma already evaluated ", m_lemma, true););
for (unsigned i = 0; i < m_lemma.size(); ++i) {
unset_mark(m_lemma.lit(i));
}
return false; return false;
} }
TRACE("pb", display(tout, m_lemma, true);); TRACE("pb", display(tout, m_lemma, true););
@ -1181,6 +1187,11 @@ namespace smt {
if (cjs) { if (cjs) {
IF_VERBOSE(1, verbose_stream() << "skipping justification for clause over: " << conseq << "\n";); IF_VERBOSE(1, verbose_stream() << "skipping justification for clause over: " << conseq << "\n";);
m_ineq_literals.push_back(conseq); m_ineq_literals.push_back(conseq);
m_lemma.m_k -= conseq_coeff;
for (unsigned i = 0; i < m_lemma.size(); ++i) {
unset_mark(m_lemma.lit(i));
}
return false;
break; break;
} }
unsigned num_lits = cls.get_num_literals(); unsigned num_lits = cls.get_num_literals();
@ -1211,15 +1222,21 @@ namespace smt {
justification& j = *js.get_justification(); justification& j = *js.get_justification();
// only process pb justifications. // only process pb justifications.
if (j.get_from_theory() != get_id()) { if (j.get_from_theory() != get_id()) {
IF_VERBOSE(1, verbose_stream() << "skipping justification for " << conseq TRACE("pb", tout << "skipping justification for " << conseq
<< " from theory " << j.get_from_theory() << "\n";); << " from theory " << j.get_from_theory() << "\n";);
m_ineq_literals.push_back(conseq); m_ineq_literals.push_back(conseq);
break; m_lemma.m_k -= conseq_coeff;
for (unsigned i = 0; i < m_lemma.size(); ++i) {
unset_mark(m_lemma.lit(i));
}
return false;
}
else {
pb_justification& pbj = dynamic_cast<pb_justification&>(j);
// weaken the lemma and resolve.
TRACE("pb", display(tout << "resolve with inequality", pbj.get_ineq(), true););
process_ineq(pbj.get_ineq(), conseq, conseq_coeff);
} }
pb_justification& pbj = dynamic_cast<pb_justification&>(j);
// weaken the lemma and resolve.
TRACE("pb", display(tout, pbj.get_ineq(), true););
process_ineq(pbj.get_ineq(), conseq, conseq_coeff);
break; break;
} }
default: default: