mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-23 19:47: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_lut_finder.cpp
View file

@ -70,7 +70,7 @@ namespace sat {
for (literal l : m_clause) {
m_vars.push_back(l.var());
m_var_position[l.var()] = i;
s.m_visited.mark_visited(l.var());
s.mark_visited(l.var());
mask |= (l.sign() << (i++));
}
m_clauses_to_remove.reset();
@ -91,7 +91,7 @@ namespace sat {
// TBD: replace by BIG
// 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_lut(~l, w.get_literal())) {
add_lut();
return;
@ -100,7 +100,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_lut(~l, w.get_literal())) {
add_lut();
return;
@ -144,7 +144,7 @@ namespace sat {
bool lut_finder::extract_lut(clause& c2) {
for (literal l : c2) {
if (!s.m_visited.is_visited(l.var()))
if (!s.is_visited(l.var()))
return false;
}
if (c2.size() == m_vars.size()) {