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

Rename revert_decision -> revert_pvar, and enable it.

Browse source 
Also rename resolve_with_assignment to resolve_evaluated
This commit is contained in:
Jakob Rath 2022-12-08 16:12:41 +01:00
parent 676aa81c5a
commit 5ad961029d
4 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -770,7 +770,7 @@ namespace polysat {
continue;
}
if (j.is_decision()) {
// NSB TODO - disabled m_conflict.revert_decision(v);
m_conflict.revert_pvar(v);
revert_decision(v);
return;
}
@ -806,7 +806,7 @@ namespace polysat {
// do we really want to resolve these eagerly?
m_conflict.resolve_bool(lit, *m_bvars.reason(lit));
else
m_conflict.resolve_with_assignment(lit);
m_conflict.resolve_evaluated(lit);
}
}
LOG("End of resolve_conflict loop");
@ -929,6 +929,11 @@ namespace polysat {
default:
UNREACHABLE();
}
if (is_conflict()) {
// TODO: the remainder of the narrow_queue as well as the lemmas are forgotten.
// should we just insert them into the new conflict to carry them along?
return;
}
}
for (clause* lemma : lemmas) {
@ -943,7 +948,6 @@ namespace polysat {
// TODO: we could also insert the remaining lemmas into the conflict and keep them for later.
return;
}
SASSERT(!is_conflict());
}
if (best_score.branching_factor() > 1) {