mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-25 13:47:01 +00:00
Code Activity

fixing bugs in dealing with non-0 based cardinality constraints

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-02-07 20:59:28 -08:00
parent eaf845c2f4
commit 6b4aec9b74
2 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sat/card_extension.h
View file

@ -76,8 +76,8 @@ namespace sat {
}
};
ptr_vector<card>* set_tag_empty(ptr_vector<card>* c);
bool is_tag_empty(ptr_vector<card>* c);
static ptr_vector<card>* set_tag_empty(ptr_vector<card>* c);
static bool is_tag_empty(ptr_vector<card> const* c);
static ptr_vector<card>* set_tag_non_empty(ptr_vector<card>* c);
solver* m_solver;
@ -99,6 +99,7 @@ namespace sat {
tracked_uint_set m_active_var_set;
literal_vector m_lemma;
literal_vector m_literals;
literal_vector m_marked_literals;
unsigned m_num_propagations_since_pop;
solver& s() const { return *m_solver; }
@ -110,6 +111,7 @@ namespace sat {
void set_conflict(card& c, literal lit);
void clear_watch(card& c);
void reset_coeffs();
void reset_marked_literals();
inline lbool value(literal lit) const { return m_solver->value(lit); }
inline unsigned lvl(literal lit) const { return m_solver->lvl(lit); }