3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-03-05 13:10:23 +00:00

Remove backjump state from conflict

This commit is contained in:
Jakob Rath 2022-11-14 14:33:19 +01:00
parent 406696f0a3
commit 01af25ca02
6 changed files with 3 additions and 24 deletions

View file

@ -187,10 +187,6 @@ namespace polysat {
m_kind = conflict_kind_t::backtrack;
}
void conflict::set_backjump() {
SASSERT(m_kind == conflict_kind_t::ok);
m_kind = conflict_kind_t::backjump;
}
bool conflict::is_relevant_pvar(pvar v) const {
switch (m_kind) {
@ -200,9 +196,6 @@ namespace polysat {
return true;
case conflict_kind_t::backtrack:
return pvar_occurs_in_constraints(v) || m_relevant_vars.contains(v);
case conflict_kind_t::backjump:
UNREACHABLE(); // we don't follow the regular loop when backjumping
return false;
}
UNREACHABLE();
return false;
@ -412,9 +405,6 @@ namespace polysat {
SASSERT(contains(lit));
SASSERT(!contains(~lit));
if (is_backjumping())
return;
unsigned const lvl = s.m_bvars.level(lit);
signed_constraint c = s.lit2cnstr(lit);