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

Fix propagation

Browse source
This commit is contained in:
Jakob Rath 2023-12-14 14:29:46 +01:00
parent 18d966dc02
commit b8f59d15c6
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -866,12 +866,9 @@ namespace polysat {
m_free_pvars.unassign_var_eh(v); m_free_pvars.unassign_var_eh(v);
return; return;
case find_t::singleton: case find_t::singleton:
// Any propagations should have been discovered by viable::intersect. // Propagations are intended to be discovered by viable::intersect.
// The fallback solver currently does not detect propagations, because we would need to handle justifications differently. // However, changes in the slicing structure currently don't trigger a check for interval-propagated values,
// However, this case may still occur if during viable::intersect, we run into the refinement budget, // which means this call to find_viable may have had more intervals ot work with than the previous viable::intersect.
// but here, we continue refinement and actually succeed until propagation.
// ???
UNREACHABLE();
SASSERT(m_justification[v].is_propagation_by_viable()); SASSERT(m_justification[v].is_propagation_by_viable());
return; return;
case find_t::multiple: case find_t::multiple:
@ -892,8 +889,10 @@ namespace polysat {
} }
void solver::assign_propagate_by_viable(pvar v, rational const& val) { void solver::assign_propagate_by_viable(pvar v, rational const& val) {
LOG("Propagation by viable: " << assignment_pp(*this, v, val));
unsigned lvl = 0; unsigned lvl = 0;
for (sat::literal const lit : m_viable.get_propagation_reason(v)) { for (sat::literal const lit : m_viable.get_propagation_reason(v)) {
LOG(" due to " << lit_pp(*this, lit));
VERIFY(m_bvars.is_assigned(lit)); VERIFY(m_bvars.is_assigned(lit));
lvl = std::max(lvl, m_bvars.level(lit)); lvl = std::max(lvl, m_bvars.level(lit));
} }

2
src/math/polysat/viable.cpp
View file

@ -204,6 +204,8 @@ namespace polysat {
unsigned const begin = m_propagation_reason_storage.size(); unsigned const begin = m_propagation_reason_storage.size();
auto add_reason = [this](signed_constraint c) { auto add_reason = [this](signed_constraint c) {
if (c.is_always_true())
return;
s.try_assign_eval(c); s.try_assign_eval(c);
m_propagation_reason_storage.push_back(c.blit()); m_propagation_reason_storage.push_back(c.blit());
}; };