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:
parent
406696f0a3
commit
01af25ca02
6 changed files with 3 additions and 24 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue