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

re-enable saturation engine

This commit is contained in:
Jakob Rath 2021-09-08 16:55:34 +02:00
parent 75bac21574
commit 6766c1c349

View file

@ -30,8 +30,7 @@ namespace polysat {
for (auto* engine : ex_engines)
engine->set_solver(s);
ve_engines.push_back(alloc(ve_reduction));
// ve_engines.push_back(alloc(ve_forbidden_intervals));
// inf_engines.push_back(alloc(inf_polynomial_superposition));
inf_engines.push_back(alloc(inf_saturate));
for (auto* engine : inf_engines)
engine->set_solver(s);
}
@ -253,15 +252,15 @@ namespace polysat {
m_solver->assign_core(v, m_solver->m_value[v], justification::propagation(m_solver->m_level));
}
*/
if (conflict_var() == v) {
clause_builder lemma(s());
forbidden_intervals fi;
if (fi.perform(s(), v, *this, lemma)) {
set_bailout();
m_bailout_lemma = std::move(lemma);
return true;
}
}
if (conflict_var() == v) {
clause_builder lemma(s());
forbidden_intervals fi;
if (fi.perform(s(), v, *this, lemma)) {
set_bailout();
m_bailout_lemma = std::move(lemma);
return true;
}
}
for (auto c : cjust_v)
insert(c);