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

micro opt

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-12 12:08:54 -07:00
parent 5afef07f40
commit 4adf4d4ac2
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/sat/sat_lookahead.cpp
View file

@ -112,7 +112,6 @@ namespace sat {
} }
} }
void lookahead::inc_bstamp() { void lookahead::inc_bstamp() {
++m_bstamp_id; ++m_bstamp_id;
if (m_bstamp_id == 0) { if (m_bstamp_id == 0) {
@ -120,6 +119,7 @@ namespace sat {
m_bstamp.fill(0); m_bstamp.fill(0);
} }
} }
void lookahead::inc_istamp() { void lookahead::inc_istamp() {
++m_istamp_id; ++m_istamp_id;
if (m_istamp_id == 0) { if (m_istamp_id == 0) {
@ -1350,9 +1350,13 @@ namespace sat {
for (nary* n : m_nary[(~l).index()]) { for (nary* n : m_nary[(~l).index()]) {
if (sz-- == 0) break; if (sz-- == 0) break;
if (is_true(n->get_head())) {
continue;
}
literal l1 = null_literal; literal l1 = null_literal;
literal l2 = null_literal; literal l2 = null_literal;
bool found_true = false; bool skip_clause = false;
unsigned nonfixed = 0; unsigned nonfixed = 0;
for (literal lit : *n) { for (literal lit : *n) {
if (!is_fixed(lit)) { if (!is_fixed(lit)) {
@ -1363,14 +1367,19 @@ namespace sat {
else if (l2 == null_literal) { else if (l2 == null_literal) {
l2 = lit; l2 = lit;
} }
else if (m_search_mode == lookahead_mode::lookahead2) {
skip_clause = true;
break;
}
} }
else if (is_true(lit)) { else if (is_true(lit)) {
found_true = true; n->set_head(lit);
skip_clause = true;
break; break;
} }
} }
if (found_true) { if (skip_clause) {
// skip, the clause will be removed when propagating on 'lit' // skip, the clause
} }
else if (l1 == null_literal) { else if (l1 == null_literal) {
set_conflict(); set_conflict();
@ -1379,9 +1388,6 @@ namespace sat {
else if (l2 == null_literal) { else if (l2 == null_literal) {
propagated(l1); propagated(l1);
} }
else if (m_search_mode == lookahead_mode::lookahead2) {
continue;
}
else { else {
SASSERT(nonfixed >= 2); SASSERT(nonfixed >= 2);
SASSERT(m_search_mode == lookahead_mode::lookahead1); SASSERT(m_search_mode == lookahead_mode::lookahead1);