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

make visited_helper independent of literals

Browse source 
re-introduce shorthands in sat::solver for visited and have them convert literals to unsigned.
This commit is contained in:
Nikolaj Bjorner 2022-11-03 03:54:39 -07:00
parent 070c5c624a
commit 90490cb22f
7 changed files with 53 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sat/sat_xor_finder.cpp
View file

@ -62,7 +62,7 @@ namespace sat {
unsigned mask = 0, i = 0;
for (literal l : c) {
m_var_position[l.var()] = i;
s.m_visited.mark_visited(l.var());
s.mark_visited(l.var());
parity ^= !l.sign();
mask |= (!l.sign() << (i++));
}
@ -84,7 +84,7 @@ namespace sat {
}
// loop over binary clauses in watch list
for (watched const & w : s.get_wlist(l)) {
if (w.is_binary_clause() && s.m_visited.is_visited(w.get_literal().var()) && w.get_literal().index() < l.index()) {
if (w.is_binary_clause() && s.is_visited(w.get_literal().var()) && w.get_literal().index() < l.index()) {
if (extract_xor(parity, c, ~l, w.get_literal())) {
add_xor(parity, c);
return;
@ -93,7 +93,7 @@ namespace sat {
}
l.neg();
for (watched const & w : s.get_wlist(l)) {
if (w.is_binary_clause() && s.m_visited.is_visited(w.get_literal().var()) && w.get_literal().index() < l.index()) {
if (w.is_binary_clause() && s.is_visited(w.get_literal().var()) && w.get_literal().index() < l.index()) {
if (extract_xor(parity, c, ~l, w.get_literal())) {
add_xor(parity, c);
return;
@ -144,7 +144,7 @@ namespace sat {
bool xor_finder::extract_xor(bool parity, clause& c, clause& c2) {
bool parity2 = false;
for (literal l : c2) {
if (!s.m_visited.is_visited(l.var())) return false;
if (!s.is_visited(l.var())) return false;
parity2 ^= !l.sign();
}
if (c2.size() == c.size() && parity2 != parity) {