mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 20:05:51 +00:00
Code Activity

Re-integrate forbidden intervals

Browse source
This commit is contained in:
Jakob Rath 2021-09-08 16:51:16 +02:00
parent a0570908fb
commit 75bac21574
4 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ Author:
#include "math/polysat/log.h"
#include "math/polysat/log_helper.h"
#include "math/polysat/explain.h"
#include "math/polysat/forbidden_intervals.h"
#include "math/polysat/saturation.h"
#include "math/polysat/variable_elimination.h"
#include <algorithm>
@ -252,6 +253,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;
}
}
for (auto c : cjust_v)
insert(c);