mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-11 11:24:31 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-12-09 08:26:34 -08:00
commit d7f16d0622
5 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -456,10 +456,16 @@ namespace polysat {
++m_stats.m_num_conflicts;
SASSERT(is_conflict());
if (m_conflict.conflict_var() != null_var) {
pvar v = m_conflict.conflict_var();
// This case corresponds to a propagation of conflict_var, except it's not explicitly on the stack.
VERIFY(m_viable.resolve(m_conflict.conflict_var(), m_conflict));
VERIFY(m_viable.resolve(v, m_conflict));
// TBD: saturate resulting conflict to get better lemmas.
LOG("try-saturate");
m_conflict.try_saturate(v);
LOG("end-try-saturate");
>>>>>>> ed9c0b84f668548ee1c11f14185b08333baa6f72
}
search_iterator search_it(m_search);