mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-26 13:06:05 +00:00
Code Activity

Remove conflict_kind

Browse source
This commit is contained in:
Jakob Rath 2022-11-17 12:24:10 +01:00
parent 00e8c53f9a
commit 38a43bd087
3 changed files with 9 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/math/polysat/conflict.h
View file

@ -79,17 +79,6 @@ namespace polysat {
class conflict_iterator;
class conflict_resolver;
enum class conflict_kind_t {
// standard conflict resolution
ok,
// conflict contains the final lemma;
// backtrack to and revert the last relevant decision
// NOTE: this is currently used for the forbidden intervals lemmas.
// we should find a way to use resolve_value with these lemmas,
// to properly eliminate value propagations. (see todo notes above)
backtrack,
};
class conflict {
solver& s;
scoped_ptr<inference_logger> m_logger;
@ -98,7 +87,6 @@ namespace polysat {
// current conflict core consists of m_literals and m_vars
indexed_uint_set m_literals; // set of boolean literals in the conflict
uint_set m_vars; // variable assignments used as premises, shorthand for literals (x := v)
uint_set m_relevant_vars; // tracked for cone of influence but not directly involved in conflict resolution
unsigned_vector m_var_occurrences; // for each variable, the number of constraints in m_literals that contain it
uint_set m_vars_occurring; // set of variables that occur in at least one of the constraints in m_literals
@ -114,8 +102,6 @@ namespace polysat {
// e.g., because one of the watched variables is unassigned but irrelevant (e.g., x is irrelevant in x*y if y := 0).
sat::literal_vector m_narrow_queue;
conflict_kind_t m_kind = conflict_kind_t::ok;
// Level at which the conflict was discovered
unsigned m_level = UINT_MAX;
@ -141,10 +127,6 @@ namespace polysat {
unsigned level() const { return m_level; }
conflict_kind_t kind() const { return m_kind; }
bool is_backtracking() const { return m_kind == conflict_kind_t::backtrack; }
void set_backtrack();
bool is_relevant_pvar(pvar v) const;
bool is_relevant(sat::literal lit) const;