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

fixing card

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-01-31 18:47:30 -08:00
parent ff72e3114b
commit 7faa35ebdb
4 changed files with 78 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sat/sat_solver.cpp
View file

@ -565,7 +565,7 @@ namespace sat {
while (m_qhead < m_trail.size()) {
checkpoint();
m_cleaner.dec();
SASSERT(!m_inconsistent);
if (m_inconsistent) return false;
l = m_trail[m_qhead];
TRACE("sat_propagate", tout << "propagating: " << l << " " << m_justification[l.var()] << "\n";);
m_qhead++;
@ -1682,7 +1682,7 @@ namespace sat {
m_conflicts_since_restart++;
m_conflicts_since_gc++;
m_conflict_lvl = get_max_lvl(m_not_l, m_conflict);
m_conflict_lvl = get_max_lvl(m_not_l == literal() ? m_not_l : ~m_not_l, m_conflict);
TRACE("sat", tout << "conflict detected at level " << m_conflict_lvl << " for ";
if (m_not_l == literal()) tout << "null literal\n";
else tout << m_not_l << "\n";);
@ -1710,7 +1710,7 @@ namespace sat {
process_antecedent(m_not_l, num_marks);
}
literal consequent = m_not_l;
literal consequent = m_not_l == null_literal ? m_not_l : ~m_not_l;
justification js = m_conflict;
do {
@ -2033,7 +2033,7 @@ namespace sat {
}
}
literal consequent = m_not_l;
literal consequent = m_not_l == null_literal ? m_not_l : ~m_not_l;
justification js = m_conflict;