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

fix translation to pdd

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-01-05 20:58:35 -08:00
parent 030da1f8ac
commit c473cd78d8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_aig_simplifier.cpp
View file

@ -80,7 +80,6 @@ namespace sat {
clause_vector clauses(s.clauses()); clause_vector clauses(s.clauses());
af(clauses); af(clauses);
literal_vector _xors;
std::function<void (literal_vector const&)> on_xor = std::function<void (literal_vector const&)> on_xor =
[&,this](literal_vector const& xors) { [&,this](literal_vector const& xors) {
SASSERT(xors.size() > 1); SASSERT(xors.size() > 1);

5
src/sat/sat_anf_simplifier.cpp
View file

@ -374,7 +374,7 @@ namespace sat {
auto& m = ps.get_manager(); auto& m = ps.get_manager();
auto v = lit2pdd(b.first); auto v = lit2pdd(b.first);
auto w = lit2pdd(b.second); auto w = lit2pdd(b.second);
dd::pdd p = v | w; dd::pdd p = (v | w) + 1;
ps.add(p); ps.add(p);
TRACE("anf_simplifier", tout << "bin: " << b.first << " " << b.second << " : " << p << "\n";); TRACE("anf_simplifier", tout << "bin: " << b.first << " " << b.second << " : " << p << "\n";);
} }
@ -384,13 +384,14 @@ namespace sat {
auto& m = ps.get_manager(); auto& m = ps.get_manager();
dd::pdd p = m.zero(); dd::pdd p = m.zero();
for (literal l : c) p |= lit2pdd(l); for (literal l : c) p |= lit2pdd(l);
p = p + 1;
ps.add(p); ps.add(p);
TRACE("anf_simplifier", tout << "clause: " << c << " : " << p << "\n";); TRACE("anf_simplifier", tout << "clause: " << c << " : " << p << "\n";);
} }
void anf_simplifier::add_xor(literal_vector const& x, pdd_solver& ps) { void anf_simplifier::add_xor(literal_vector const& x, pdd_solver& ps) {
auto& m = ps.get_manager(); auto& m = ps.get_manager();
dd::pdd p = m.zero(); dd::pdd p = m.one();
for (literal l : x) p ^= lit2pdd(l); for (literal l : x) p ^= lit2pdd(l);
ps.add(p); ps.add(p);
TRACE("anf_simplifier", tout << "xor: " << x << " : " << p << "\n";); TRACE("anf_simplifier", tout << "xor: " << x << " : " << p << "\n";);