mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

partial parity fixes

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-02-11 03:35:18 -08:00
parent ba4cc27817
commit b1e6031230
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sat/sat_aig_cuts.cpp
View file

@ -632,7 +632,7 @@ namespace sat {
} }
unsigned num_comp = (1 << n.size()); unsigned num_comp = (1 << n.size());
for (unsigned i = 0; i < num_comp; ++i) { for (unsigned i = 0; i < num_comp; ++i) {
unsigned parity = 0; bool parity = false;
m_clause.reset(); m_clause.reset();
for (unsigned j = 0; j < n.size(); ++j) { for (unsigned j = 0; j < n.size(); ++j) {
literal lit = m_literals[n.offset() + j]; literal lit = m_literals[n.offset() + j];
@ -640,11 +640,11 @@ namespace sat {
lit.neg(); lit.neg();
} }
else { else {
++parity; parity ^= true;
} }
m_clause.push_back(lit); m_clause.push_back(lit);
} }
m_clause.push_back(1 == (parity % 2) ? r : ~r); m_clause.push_back(parity ? r : ~r);
on_clause(m_clause); on_clause(m_clause);
} }
return; return;

2
src/sat/sat_aig_simplifier.cpp
View file

@ -215,7 +215,9 @@ namespace sat {
// <=> // <=>
// ~head = t1 + t2 + .. // ~head = t1 + t2 + ..
literal head = ~xors[index]; literal head = ~xors[index];
TRACE("aig_simplifier", tout << xors << "\n";);
unsigned sz = xors.size() - 1; unsigned sz = xors.size() - 1;
m_lits.reset();
for (unsigned i = xors.size(); i-- > 0; ) { for (unsigned i = xors.size(); i-- > 0; ) {
if (i != index) if (i != index)
m_lits.push_back(xors[i]); m_lits.push_back(xors[i]);

1
src/sat/sat_drat.cpp
View file

@ -469,6 +469,7 @@ namespace sat {
std::string line; std::string line;
std::getline(std::cin, line); std::getline(std::cin, line);
SASSERT(false); SASSERT(false);
INVOKE_DEBUGGER();
exit(0); exit(0);
UNREACHABLE(); UNREACHABLE();
//display(std::cout); //display(std::cout);

5
src/sat/sat_xor_finder.cpp
View file

@ -61,9 +61,10 @@ namespace sat {
for (literal l : c) { for (literal l : c) {
m_var_position[l.var()] = i; m_var_position[l.var()] = i;
s.mark_visited(l.var()); s.mark_visited(l.var());
parity ^= l.sign(); parity ^= !l.sign();
mask |= (l.sign() << (i++)); mask |= (l.sign() << (i++));
} }
// parity is number of true literals in clause.
m_clauses_to_remove.reset(); m_clauses_to_remove.reset();
m_clauses_to_remove.push_back(&c); m_clauses_to_remove.push_back(&c);
m_clause.resize(c.size()); m_clause.resize(c.size());
@ -108,7 +109,7 @@ namespace sat {
lits.push_back(literal(l.var(), false)); lits.push_back(literal(l.var(), false));
s.set_external(l.var()); s.set_external(l.var());
} }
if (parity) lits[0].neg(); if (parity == (lits.size() % 2 == 0)) lits[0].neg();
m_on_xor(lits); m_on_xor(lits);
} }