mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 21:03:39 +00:00
Code Activity

remove/update comment

Browse source
This commit is contained in:
Jakob Rath 2022-09-23 16:02:13 +02:00
parent 4312611bd6
commit 8ed6938cbe
1 changed files with 19 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,21 @@ TODO:
namespace polysat { namespace polysat {
class conflict_resolver {
inf_saturate m_saturate;
public:
conflict_resolver(solver& s)
: m_saturate(s)
{}
bool try_resolve_value(pvar v, conflict& core) {
if (m_saturate.perform(v, core))
return true;
return false;
}
};
class header_with_var : public displayable { class header_with_var : public displayable {
char const* m_text; char const* m_text;
pvar m_var; pvar m_var;
@ -99,23 +114,6 @@ namespace polysat {
} }
}; };
class conflict_resolver {
inf_saturate m_saturate;
public:
conflict_resolver(solver& s)
: m_saturate(s)
{}
bool try_resolve_value(pvar v, conflict& core) {
if (m_saturate.perform(v, core))
return true;
return false;
}
};
conflict::conflict(solver& s) : s(s) { conflict::conflict(solver& s) : s(s) {
// TODO: m_log_conflicts is always false even if "polysat.log_conflicts=true" is given on the command line // TODO: m_log_conflicts is always false even if "polysat.log_conflicts=true" is given on the command line
if (true || s.get_config().m_log_conflicts) if (true || s.get_config().m_log_conflicts)
@ -209,20 +207,6 @@ namespace polysat {
void conflict::init(signed_constraint c) { void conflict::init(signed_constraint c) {
SASSERT(empty()); SASSERT(empty());
m_level = s.m_level; m_level = s.m_level;
/*
// NOTE: c.is_always_false() may happen e.g. if we add an always false constraint in the input
if (c.is_always_false()) {
SASSERT(c.bvalue(s) == l_true);
SASSERT(s.m_bvars.is_assumption(c.blit()));
SASSERT(s.at_base_level());
// TODO: this kind of constraint should be handled when it is being added to the solver.
return;
}
if (c.bvalue(s) == l_false && s.at_base_level()) {
// We have opposite literals in the input.
return;
}
*/
set_impl(c); set_impl(c);
logger().begin_conflict(); logger().begin_conflict();
} }
@ -235,20 +219,10 @@ namespace polysat {
void conflict::set_impl(signed_constraint c) { void conflict::set_impl(signed_constraint c) {
if (c.bvalue(s) == l_false) { if (c.bvalue(s) == l_false) {
// boolean conflict // boolean conflict
SASSERT(false); // fail here to force check when we encounter this case // This case should not happen:
// TODO: if we set() and then log() it will be confusing if this branch is hit. // - opposite input literals are handled separately
// ideally the boolean resolution would be done separately afterwards // - other boolean conflicts will discover violated clause during boolean propagation
auto* cl = s.m_bvars.reason(c.blit()); VERIFY(false); // fail here to force check when we encounter this case
#if 0
if (cl)
set(*cl); // why the whole clause? or do we want the boolean resolution?
else
insert(c);
#else
insert(c);
if (cl)
resolve_bool(c.blit(), *cl);
#endif
} else { } else {
// conflict due to assignment // conflict due to assignment
SASSERT(c.bvalue(s) == l_true); SASSERT(c.bvalue(s) == l_true);
@ -260,9 +234,6 @@ namespace polysat {
} }
void conflict::init(clause const& cl) { void conflict::init(clause const& cl) {
// if (!empty())
// return;
// LOG("Conflict: " << cl);
SASSERT(empty()); SASSERT(empty());
m_level = s.m_level; m_level = s.m_level;
for (auto lit : cl) { for (auto lit : cl) {