mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-03-05 05:00:23 +00:00
Code Activity

add review comments based on debugging

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-12-04 03:49:17 -08:00
parent db18c7206a
commit 066b7d2d71
3 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/math/polysat/conflict.cpp
View file

@ -68,8 +68,14 @@ namespace polysat {
, m_free_variable_elimination(s)
{}
//
// NSB review: the plugins need not be mutually exclusive
// Shouldn't saturation and superposition be allowed independently?
// If they create propagations or conflict lemmas we select the
// tightest propagation as part of backjumping.
//
bool try_resolve_value(pvar v, conflict& core) {
if (m_poly_sup.perform(v, core))
if (m_poly_sup.perform(v, core))
return true;
if (m_saturation.perform(v, core))
return true;
@ -252,6 +258,10 @@ namespace polysat {
logger().begin_conflict(header_with_var("forbidden interval lemma for v", v));
VERIFY(s.m_viable.resolve(v, *this));
}
// NSB review:
// Saturation is not invoked on forbidden interval conflicts.
// We miss propagations.
// m_resolver->try_resolve_value(v, *this);
SASSERT(!empty());
}
@ -407,6 +417,11 @@ namespace polysat {
}
logger().log(inf_resolve_value(s, v));
//
// NSB review: if try_resolve_value returns true, it adds propagations or conflict lemmas.
// the return value should not influence resolution. Indeed the code in solver.cpp
// just ignores the return value. It seems this function should not have a return value.
//
if (m_resolver->try_resolve_value(v, *this))
return true;