mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 01:55:32 +00:00
Code Activity

resolve_bool should work normally also in bailout mode

Browse source
This commit is contained in:
Jakob Rath 2021-09-07 11:35:38 +02:00
parent 15c094fa32
commit eed79df481
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/math/polysat/conflict_core.cpp
View file

@ -83,7 +83,6 @@ namespace polysat {
// clause: x \/ u \/ v
// resolvent: ~y \/ ~z \/ u \/ v; as core: y, z, ~u, ~v
SASSERT(!is_bailout());
SASSERT(var != sat::null_bool_var);
DEBUG_CODE({
bool core_has_pos = std::count_if(begin(), end(), [var](auto c){ return c.blit() == sat::literal(var); }) > 0;
@ -110,6 +109,7 @@ namespace polysat {
}
clause_ref conflict_core::build_lemma() {
LOG_H3("build lemma from core");
sat::literal_vector literals;
p_dependency_ref dep = m_solver->mk_dep_ref(null_dependency);
unsigned lvl = 0;
@ -120,6 +120,7 @@ namespace polysat {
if (!c->has_bvar()) {
// temporary constraint -> keep it
cm().ensure_bvar(c.get());
LOG("new constraint: " << c);
// Insert the temporary constraint from saturation into \Gamma.
auto it = m_saturation_premises.find_iterator(c);
if (it != m_saturation_premises.end()) {

1
src/math/polysat/conflict_core.h
View file

@ -26,7 +26,6 @@ namespace polysat {
// If this is not null_var, the conflict was due to empty viable set for this variable.
// Can be treated like "v = x" for any value x.
// TODO: we could always set this to the variable we're currently focusing on.
pvar m_conflict_var = null_var;
/** True iff the conflict depends on the current variable assignment. (If so, additional constraints must be added to the final learned clause.) */

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

@ -556,17 +556,18 @@ namespace polysat {
/** Conflict resolution case where boolean literal 'lit' is on top of the stack */
void solver::resolve_bool(sat::literal lit) {
LOG_H3("resolve_bool: " << lit);
SASSERT(m_bvars.is_propagation(lit.var()));
sat::bool_var const var = lit.var();
SASSERT(m_bvars.is_propagation(var));
if (m_conflict.is_bailout()) {
NOT_IMPLEMENTED_YET();
// clause* other = m_bvars.reason(var);
// set_marks(*other);
// m_conflict.push_back(other);
}
clause* other = m_bvars.reason(var);
clause* other = m_bvars.reason(lit.var());
m_conflict.resolve(m_constraints, lit.var(), *other);
// if (m_conflict.is_bailout()) {
// for (sat::literal l : *other)
// set_marks(*m_constraints.lookup(l));
// // m_conflict.push_back(other); // ???
// }
m_conflict.resolve(m_constraints, var, *other);
}
void solver::report_unsat() {
@ -682,18 +683,17 @@ namespace polysat {
learn_lemma(v, std::move(lemma));
// TODO: check if still necessary... won't the next solver iteration do this anyway? (well, it might choose a different variable... so this "unrolls" the next loop iteration to get a stable variable order)
/*
if (is_conflict()) {
LOG_H1("Conflict during revert_decision/learn_lemma!");
return;
}
narrow(v);
if (m_justification[v].is_unassigned()) {
m_free_vars.del_var_eh(v);
decide(v);
}
*/
}
bool solver::is_decision(search_item const& item) const {
@ -887,6 +887,8 @@ namespace polysat {
if (!lemma)
return;
LOG("Lemma: " << show_deref(lemma));
for (sat::literal l : *lemma)
LOG(" Literal " << l << " is: " << m_constraints.lookup(l));
SASSERT(lemma->size() > 0);
clause* cl = m_constraints.store(std::move(lemma));
m_redundant_clauses.push_back(cl);