mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-16 16:27:11 +00:00
Code Activity

fix bug in sat-simplifier decreasing heap values of variables that are not in the heap

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-01-25 16:21:51 -08:00
parent 60783e5696
commit 4782e19086
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/sat/sat_simplifier.cpp
View file

@ -896,7 +896,7 @@ namespace sat {
unsigned idx = l.index(); unsigned idx = l.index();
if (m_queue.contains(idx)) if (m_queue.contains(idx))
m_queue.decreased(idx); m_queue.decreased(idx);
else else
m_queue.insert(idx); m_queue.insert(idx);
} }
literal next() { SASSERT(!empty()); return to_literal(m_queue.erase_min()); } literal next() { SASSERT(!empty()); return to_literal(m_queue.erase_min()); }
@ -918,16 +918,19 @@ namespace sat {
} }
void insert(literal l) { void insert(literal l) {
bool_var v = l.var();
if (s.is_external(v) || s.was_eliminated(v))
return;
m_queue.insert(l); m_queue.insert(l);
} }
bool process_var(bool_var v) {
return !s.is_external(v) && !s.was_eliminated(v);
}
void operator()(unsigned num_vars) { void operator()(unsigned num_vars) {
for (bool_var v = 0; v < num_vars; v++) { for (bool_var v = 0; v < num_vars; v++) {
insert(literal(v, false)); if (process_var(v)) {
insert(literal(v, true)); insert(literal(v, false));
insert(literal(v, true));
}
} }
while (!m_queue.empty()) { while (!m_queue.empty()) {
s.checkpoint(); s.checkpoint();
@ -941,9 +944,9 @@ namespace sat {
void process(literal l) { void process(literal l) {
TRACE("blocked_clause", tout << "processing: " << l << "\n";); TRACE("blocked_clause", tout << "processing: " << l << "\n";);
model_converter::entry * new_entry = 0; model_converter::entry * new_entry = 0;
if (s.is_external(l.var()) || s.was_eliminated(l.var())) if (!process_var(l.var())) {
return; return;
}
{ {
m_to_remove.reset(); m_to_remove.reset();
{ {
@ -963,8 +966,10 @@ namespace sat {
mc.insert(*new_entry, c); mc.insert(*new_entry, c);
unsigned sz = c.size(); unsigned sz = c.size();
for (unsigned i = 0; i < sz; i++) { for (unsigned i = 0; i < sz; i++) {
if (c[i] != l) literal lit = c[i];
m_queue.decreased(~c[i]); if (lit != l && process_var(lit.var())) {
m_queue.decreased(~lit);
}
} }
} }
s.unmark_all(c); s.unmark_all(c);