mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-14 14:55:25 +00:00
Code Activity

more merges with qsat

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-03-19 12:41:41 -07:00
parent 76d637626a
commit d614fedde2
7 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/smt/smt_kernel.h
View file

@ -122,6 +122,10 @@ namespace smt {
*/
lbool check(unsigned num_assumptions = 0, expr * const * assumptions = 0);
lbool check(expr_ref_vector const& asms) { return check(asms.size(), asms.c_ptr()); }
lbool check(app_ref_vector const& asms) { return check(asms.size(), (expr* const*)asms.c_ptr()); }
/**
\brief Return the model associated with the last check command.
*/

5
src/smt/smt_theory.h
View file

@ -315,10 +315,7 @@ namespace smt {
return m_var2enode_lim[m_var2enode_lim.size() - num_scopes];
}
virtual void display(std::ostream & out) const {
out << "Theory " << static_cast<int>(get_id()) << typeid(*this).name() << " does not have a display method\n";
display_var2enode(out);
}
virtual void display(std::ostream & out) const = 0;
virtual void display_var2enode(std::ostream & out) const;

1
src/smt/theory_dummy.h
View file

@ -43,6 +43,7 @@ namespace smt {
virtual bool build_models() const {
return false;
}
virtual void display(std::ostream& out) const {}
public:
theory_dummy(family_id fid, char const * name);

1
src/smt/theory_seq_empty.h
View file

@ -122,6 +122,7 @@ namespace smt {
virtual void new_diseq_eh(theory_var, theory_var) {}
virtual theory* mk_fresh(context* new_ctx) { return alloc(theory_seq_empty, new_ctx->get_manager()); }
virtual char const * get_name() const { return "seq-empty"; }
virtual void display(std::ostream& out) const {}
public:
theory_seq_empty(ast_manager& m):theory(m.mk_family_id("seq")), m_used(false) {}
virtual void init_model(model_generator & mg) {

1
src/smt/theory_wmaxsat.h
View file

@ -94,6 +94,7 @@ namespace smt {
virtual bool internalize_term(app * term) { return false; }
virtual void new_eq_eh(theory_var v1, theory_var v2) { }
virtual void new_diseq_eh(theory_var v1, theory_var v2) { }
virtual void display(std::ostream& out) const {}
virtual void collect_statistics(::statistics & st) const {
st.update("wmaxsat num blocks", m_stats.m_num_blocks);