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

sls: fix bug where unsat remains empty after a literal is flipped. The new satisfiable subset should be checked

Browse source 
refined interface between solvers to expose fixed variables for tabu objectives
This commit is contained in:
Nikolaj Bjorner 2024-12-01 18:35:56 -08:00
parent 24c3cd38d1
commit e6feb8423a
8 changed files with 118 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/ast/sls/sls_context.cpp
View file

@ -172,6 +172,7 @@ namespace sls {
}
void context::propagate_boolean_assignment() {
start_propagation:
reinit_relevant();
for (auto p : m_plugins)
@ -180,9 +181,12 @@ namespace sls {
for (sat::literal lit : root_literals())
propagate_literal(lit);
if (m_new_constraint)
return;
if (any_of(root_literals(), [&](sat::literal lit) { return !is_true(lit); })) {
if (unsat().empty())
goto start_propagation;
return;
}
while (!m_new_constraint && m.inc() && (!m_repair_up.empty() || !m_repair_down.empty())) {
while (!m_repair_down.empty() && !m_new_constraint && m.inc()) {
@ -258,9 +262,6 @@ namespace sls {
auto p = m_plugins.get(fid, nullptr);
if (p)
p->propagate_literal(lit);
if (!is_true(lit)) {
m_new_constraint = true;
}
}
bool context::is_true(expr* e) {
@ -291,6 +292,14 @@ namespace sls {
bool context::set_value(expr * e, expr * v) {
return any_of(m_plugins, [&](auto p) { return p && p->set_value(e, v); });
}
bool context::is_fixed(expr* e, expr_ref& value) {
if (m.is_value(e)) {
value = e;
return true;
}
return any_of(m_plugins, [&](auto p) { return p && p->is_fixed(e, value); });
}
bool context::is_relevant(expr* e) {
unsigned id = e->get_id();
@ -317,6 +326,7 @@ namespace sls {
m_constraint_trail.push_back(e);
add_clause(e);
m_new_constraint = true;
verbose_stream() << "add constraint\n";
++m_stats.m_num_constraints;
}