mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 12:07:52 +00:00
Code Activity

Revert "remove overcomplicated search_iterator"

Browse source 
This reverts commit 309473edad.
This commit is contained in:
Jakob Rath 2022-08-19 14:12:57 +02:00
parent 31ffe89480
commit 9766ad00b1
2 changed files with 78 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -624,9 +624,10 @@ namespace polysat {
}
m_conflict.begin_conflict("resolve_conflict");
for (unsigned i = m_search.size(); i-- > 0; ) {
auto& item = m_search[i];
m_search.set_resolved(i);
search_iterator search_it(m_search);
while (search_it.next()) {
auto& item = *search_it;
search_it.set_resolved();
if (item.is_assignment()) {
// Resolve over variable assignment
pvar v = item.var();
@ -721,9 +722,10 @@ namespace polysat {
*/
void solver::backtrack_fi() {
uint_set relevant_vars;
for (unsigned i = m_search.size(); i-- > 0; ) {
auto& item = m_search[i];
m_search.set_resolved(i);
search_iterator search_it(m_search);
while (search_it.next()) {
auto& item = *search_it;
search_it.set_resolved();
if (item.is_assignment()) {
// Resolve over variable assignment
pvar v = item.var();