mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

separate out file for objectives

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-07 18:09:44 -08:00
parent 759d80dfe3
commit 401fced400
10 changed files with 199 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/smt/theory_card.cpp
View file

@ -66,10 +66,13 @@ namespace smt {
SASSERT(m_util.is_at_most_k(atom));
unsigned k = m_util.get_k(atom);
if (ctx.b_internalized(atom)) {
return false;
}
m_stats.m_num_predicates++;
TRACE("card", tout << "internalize: " << mk_pp(atom, m) << "\n";);
SASSERT(!ctx.b_internalized(atom));
@ -210,7 +213,10 @@ namespace smt {
m_cards_trail.push_back(abv);
}
void theory_card::collect_statistics(::statistics& st) const {
st.update("pb axioms", m_stats.m_num_axioms);
st.update("pb predicates", m_stats.m_num_predicates);
}
void theory_card::reset_eh() {
@ -229,6 +235,7 @@ namespace smt {
m_cards_lim.reset();
m_watch_trail.reset();
m_watch_lim.reset();
m_stats.reset();
}
void theory_card::update_min_max(bool_var v, bool is_true, card* c) {
@ -470,8 +477,16 @@ namespace smt {
}
void theory_card::add_clause(literal_vector const& lits) {
m_stats.m_num_axioms++;
context& ctx = get_context();
TRACE("card", ctx.display_literals_verbose(tout, lits.size(), lits.c_ptr()); tout << "\n";);
ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
justification* js = 0;
ctx.mk_clause(lits.size(), lits.c_ptr(), js, CLS_AUX_LEMMA, 0);
IF_VERBOSE(0,
for (unsigned i = 0; i < lits.size(); ++i) {
verbose_stream() << lits[i] << " ";
}
verbose_stream() << "\n";);
// ctx.mk_th_axiom(get_id(), lits.size(), lits.c_ptr());
}
}

9
src/smt/theory_card.h
View file

@ -28,6 +28,13 @@ namespace smt {
typedef svector<std::pair<bool_var, int> > arg_t;
struct stats {
unsigned m_num_axioms;
unsigned m_num_predicates;
void reset() { memset(this, 0, sizeof(*this)); }
stats() { reset(); }
};
struct card {
int m_k;
bool_var m_bv;
@ -49,6 +56,7 @@ namespace smt {
unsigned_vector m_watch_lim;
literal_vector m_literals;
card_util m_util;
stats m_stats;
void add_watch(bool_var bv, card* c);
void add_card(card* c);
@ -84,6 +92,7 @@ namespace smt {
virtual void init_search_eh();
virtual void push_scope_eh();
virtual void pop_scope_eh(unsigned num_scopes);
virtual void collect_statistics(::statistics & st) const;
};
};