mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3 into nsb/master

Browse source
This commit is contained in:
Nikolaj Bjorner 2015-11-06 17:29:53 -08:00
commit 3d993a4ee1
15 changed files with 246 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/smt/smt_context.cpp
View file

@ -285,7 +285,9 @@ namespace smt {
}
void context::assign_core(literal l, b_justification j, bool decision) {
TRACE("assign_core", tout << "assigning: " << l << " "; display_literal(tout, l); tout << "\n";);
TRACE("assign_core", tout << (decision?"decision: ":"propagating: ") << l << " ";
display_literal(tout, l); tout << " level: " << m_scope_lvl << "\n";
display(tout, j););
SASSERT(l.var() < static_cast<int>(m_b_internalized_stack.size()));
m_assigned_literals.push_back(l);
m_assignment[l.index()] = l_true;
@ -1722,7 +1724,7 @@ namespace smt {
}
bool context::propagate() {
TRACE("propagate", tout << "propagating...\n";);
TRACE("propagate", tout << "propagating... " << m_qhead << ":" << m_assigned_literals.size() << "\n";);
while (true) {
if (inconsistent())
return false;