mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-05 19:00:25 +00:00
Code Activity

Tidy

Browse source
This commit is contained in:
Miguel Angelo Da Terra Neves 2017-10-24 14:08:44 -07:00
parent 80041d7131
commit 8915d0a21f
1 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/sat/sat_simplifier.cpp
View file

@ -1044,8 +1044,7 @@ namespace sat {
clause_use_list::iterator it = occs.mk_iterator(); clause_use_list::iterator it = occs.mk_iterator();
while (!it.at_end()) { while (!it.at_end()) {
clause & c = it.curr(); clause & c = it.curr();
it.next(); if (!c.is_blocked()) {
if (c.is_blocked()) continue;
m_counter -= c.size(); m_counter -= c.size();
SASSERT(c.contains(l)); SASSERT(c.contains(l));
s.mark_all_but(c, l); s.mark_all_but(c, l);
@ -1055,6 +1054,8 @@ namespace sat {
} }
s.unmark_all(c); s.unmark_all(c);
} }
it.next();
}
for (clause* c : m_to_remove) for (clause* c : m_to_remove)
s.block_clause(*c); s.block_clause(*c);
} }
@ -1086,8 +1087,7 @@ namespace sat {
while (!it.at_end()) { while (!it.at_end()) {
bool tautology = false; bool tautology = false;
clause & c = it.curr(); clause & c = it.curr();
it.next(); if (!c.is_blocked()) {
if (c.is_blocked()) continue;
for (literal lit : c) { for (literal lit : c) {
if (s.is_marked(~lit) && lit != ~l) { if (s.is_marked(~lit) && lit != ~l) {
tautology = true; tautology = true;
@ -1112,6 +1112,8 @@ namespace sat {
} }
} }
} }
it.next();
}
return first; return first;
} }
@ -1360,8 +1362,7 @@ namespace sat {
clause_use_list::iterator it = neg_occs.mk_iterator(); clause_use_list::iterator it = neg_occs.mk_iterator();
while (!it.at_end()) { while (!it.at_end()) {
clause & c = it.curr(); clause & c = it.curr();
it.next(); if (!c.is_blocked()) {
if (c.is_blocked()) continue;
m_counter -= c.size(); m_counter -= c.size();
unsigned sz = c.size(); unsigned sz = c.size();
unsigned i; unsigned i;
@ -1372,6 +1373,8 @@ namespace sat {
if (i == sz) if (i == sz)
return false; return false;
} }
it.next();
}
if (s.s.m_ext) { if (s.s.m_ext) {
ext_constraint_list const& ext_list = s.m_ext_use_list.get(~l); ext_constraint_list const& ext_list = s.m_ext_use_list.get(~l);