mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-05 10:50:24 +00:00
Code Activity

updated cardinality

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-01-19 17:55:15 -08:00
parent 238e85867a
commit e17c130422
3 changed files with 70 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/smt/theory_pb.h
View file

@ -291,7 +291,6 @@ namespace smt {
unsigned m_conflict_frequency;
bool m_learn_complements;
bool m_enable_compilation;
bool m_enable_simplex;
rational m_max_compiled_coeff;
// internalize_atom:
@ -336,8 +335,6 @@ namespace smt {
// simplex:
literal set_explain(literal_vector& explains, unsigned var, literal expl);
bool update_bound(bool_var v, literal explain, bool is_lower, mpq_inf const& bound);
bool check_feasible();
std::ostream& display(std::ostream& out, ineq const& c, bool values = false) const;
@ -366,7 +363,7 @@ namespace smt {
// Conflict resolution, cutting plane derivation.
//
unsigned m_num_marks;
unsigned_vector m_resolved;
literal_vector m_resolved;
unsigned m_conflict_lvl;
// Conflict PB constraints
@ -375,6 +372,7 @@ namespace smt {
int m_bound;
literal_vector m_antecedents;
uint_set m_seen;
unsigned_vector m_seen_trail;
void normalize_active_coeffs();
void inc_coeff(literal l, int offset);