mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-15 15:25:26 +00:00
Code Activity

nicer conditions

Browse source
This commit is contained in:
Jakob Rath 2023-03-16 16:51:18 +01:00
parent a6771eb567
commit 8493ebbaba
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/math/polysat/solver.cpp
View file

@ -271,11 +271,11 @@ namespace polysat {
} }
bool solver::can_repropagate_units() { bool solver::can_repropagate_units() {
return !m_repropagate_units.empty(); return !m_repropagate_units.empty() && !is_conflict();
} }
void solver::repropagate_units() { void solver::repropagate_units() {
while (!m_repropagate_units.empty() && !is_conflict()) { while (can_repropagate_units()) {
clause& cl = *m_repropagate_units.back(); clause& cl = *m_repropagate_units.back();
m_repropagate_units.pop_back(); m_repropagate_units.pop_back();
VERIFY_EQ(cl.size(), 1); VERIFY_EQ(cl.size(), 1);
@ -300,7 +300,7 @@ namespace polysat {
} }
bool solver::can_repropagate() { bool solver::can_repropagate() {
return !m_repropagate_lits.empty(); return !m_repropagate_lits.empty() && !is_conflict();
} }
// Repropagate: // Repropagate:
@ -314,7 +314,7 @@ namespace polysat {
// TODO: for assumptions this isn't implemented yet. But if we can bool-propagate an assumption from other literals, // TODO: for assumptions this isn't implemented yet. But if we can bool-propagate an assumption from other literals,
// it means that the external dependency on the assumed literal is unnecessary and a resulting unsat core may be smaller. // it means that the external dependency on the assumed literal is unnecessary and a resulting unsat core may be smaller.
void solver::repropagate() { void solver::repropagate() {
while (!m_repropagate_lits.empty() && !is_conflict()) { while (can_repropagate() /* && !can_propagate() */) {
sat::literal lit = m_repropagate_lits.back(); sat::literal lit = m_repropagate_lits.back();
m_repropagate_lits.pop_back(); m_repropagate_lits.pop_back();
// check for missed lower boolean propagations // check for missed lower boolean propagations