mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

fix #3643

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-01 00:19:05 -07:00
parent e9bc8e2433
commit 9d759a187e
1 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/sat/ba_solver.cpp
View file

@ -2048,40 +2048,30 @@ namespace sat {
return lit; return lit;
} }
ba_solver::constraint* ba_solver::add_xr(literal_vector const& _lits, bool learned) { ba_solver::constraint* ba_solver::add_xr(literal_vector const& _lits, bool learned) {
struct parity {
bool sign; bool lit;
parity(): sign(false), lit(false) {}
// {false, false}, p => {false, true}
// {false, false}, !p => {true, true}
// {false, true}, p => {true, false}
// {false, true}, !p => {true, false}
void add(literal l) {
sign = lit == (sign == l.sign());
lit = !lit;
}
};
literal_vector lits; literal_vector lits;
u_map<parity> var2parity; u_map<bool> var2sign;
bool sign = false, odd = false;
for (literal lit : _lits) { for (literal lit : _lits) {
var2parity.insert_if_not_there2(lit.var(), parity())->get_data().m_value.add(lit); if (var2sign.find(lit.var(), sign)) {
var2sign.erase(lit.var());
odd ^= (sign ^ lit.sign());
}
else {
var2sign.insert(lit.var(), lit.sign());
}
} }
bool polarity = false; for (auto const& kv : var2sign) {
for (auto const& kv : var2parity) { lits.push_back(literal(kv.m_key, kv.m_value));
bool lit = kv.m_value.lit;
bool sign = kv.m_value.sign;
if (lit)
lits.push_back(literal(kv.m_key, sign));
else
polarity = polarity ^ sign;
} }
if (polarity && !lits.empty()) { if (odd && !lits.empty()) {
lits[0].neg(); lits[0].neg();
} }
switch (lits.size()) { switch (lits.size()) {
case 0: case 0:
if (polarity) if (!odd)
s().set_conflict(justification(0)); s().set_conflict(justification(0));
return nullptr; return nullptr;
case 1: case 1: