mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-27 16:38:45 +00:00
Code Activity

merge with master

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-25 14:57:01 -07:00
commit c513f3ca09
883 changed files with 13979 additions and 16480 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/solver/tactic2solver.cpp
View file

@ -45,43 +45,41 @@ class tactic2solver : public solver_na2as {
public:
tactic2solver(ast_manager & m, tactic * t, params_ref const & p, bool produce_proofs, bool produce_models, bool produce_unsat_cores, symbol const & logic);
virtual ~tactic2solver();
~tactic2solver() override;
virtual solver* translate(ast_manager& m, params_ref const& p);
solver* translate(ast_manager& m, params_ref const& p) override;
virtual void updt_params(params_ref const & p);
virtual void collect_param_descrs(param_descrs & r);
void updt_params(params_ref const & p) override;
void collect_param_descrs(param_descrs & r) override;
virtual void set_produce_models(bool f) { m_produce_models = f; }
void set_produce_models(bool f) override { m_produce_models = f; }
virtual void assert_expr_core(expr * t);
virtual void assert_lemma(expr * t);
void assert_expr_core(expr * t) override;
ast_manager& get_manager() const override;
virtual void push_core();
virtual void pop_core(unsigned n);
virtual lbool check_sat_core(unsigned num_assumptions, expr * const * assumptions);
void push_core() override;
void pop_core(unsigned n) override;
lbool check_sat_core(unsigned num_assumptions, expr * const * assumptions) override;
void collect_statistics(statistics & st) const override;
void get_unsat_core(ptr_vector<expr> & r) override;
void get_model_core(model_ref & m) override;
proof * get_proof() override;
std::string reason_unknown() const override;
void set_reason_unknown(char const* msg) override;
void get_labels(svector<symbol> & r) override {}
void set_progress_callback(progress_callback * callback) override {}
unsigned get_num_assertions() const override;
expr * get_assertion(unsigned idx) const override;
virtual void collect_statistics(statistics & st) const;
virtual void get_unsat_core(ptr_vector<expr> & r);
virtual void get_model_core(model_ref & m);
virtual proof * get_proof();
virtual std::string reason_unknown() const;
virtual void set_reason_unknown(char const* msg);
virtual void get_labels(svector<symbol> & r) {}
virtual void set_progress_callback(progress_callback * callback) {}
virtual unsigned get_num_assertions() const;
virtual expr * get_assertion(unsigned idx) const;
virtual ast_manager& get_manager() const;
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned ) {
expr_ref_vector cube(expr_ref_vector& vars, unsigned ) override {
return expr_ref_vector(get_manager());
}
virtual model_converter_ref get_model_converter() const { return m_mc; }
model_converter_ref get_model_converter() const override { return m_mc; }
};
@ -114,15 +112,13 @@ void tactic2solver::collect_param_descrs(param_descrs & r) {
void tactic2solver::assert_expr_core(expr * t) {
m_assertions.push_back(t);
m_result = 0;
m_result = nullptr;
}
void tactic2solver::assert_lemma(expr * t) {
}
void tactic2solver::push_core() {
m_scopes.push_back(m_assertions.size());
m_result = 0;
m_result = nullptr;
}
void tactic2solver::pop_core(unsigned n) {
@ -130,11 +126,11 @@ void tactic2solver::pop_core(unsigned n) {
unsigned old_sz = m_scopes[new_lvl];
m_assertions.shrink(old_sz);
m_scopes.shrink(new_lvl);
m_result = 0;
m_result = nullptr;
}
lbool tactic2solver::check_sat_core(unsigned num_assumptions, expr * const * assumptions) {
if (m_tactic.get() == 0)
if (m_tactic.get() == nullptr)
return l_false;
ast_manager & m = m_assertions.m();
m_result = alloc(simple_check_sat_result, m);
@ -204,7 +200,7 @@ lbool tactic2solver::check_sat_core(unsigned num_assumptions, expr * const * ass
solver* tactic2solver::translate(ast_manager& m, params_ref const& p) {
tactic* t = m_tactic->translate(m);
tactic2solver* r = alloc(tactic2solver, m, t, p, m_produce_proofs, m_produce_models, m_produce_unsat_cores, m_logic);
r->m_result = 0;
r->m_result = nullptr;
if (!m_scopes.empty()) {
throw default_exception("translation of contexts is only supported at base level");
}
@ -237,7 +233,7 @@ proof * tactic2solver::get_proof() {
if (m_result.get())
return m_result->get_proof();
else
return 0;
return nullptr;
}
std::string tactic2solver::reason_unknown() const {
@ -278,9 +274,9 @@ public:
tactic2solver_factory(tactic * t):m_tactic(t) {
}
virtual ~tactic2solver_factory() {}
~tactic2solver_factory() override {}
virtual solver * operator()(ast_manager & m, params_ref const & p, bool proofs_enabled, bool models_enabled, bool unsat_core_enabled, symbol const & logic) {
solver * operator()(ast_manager & m, params_ref const & p, bool proofs_enabled, bool models_enabled, bool unsat_core_enabled, symbol const & logic) override {
return mk_tactic2solver(m, m_tactic.get(), p, proofs_enabled, models_enabled, unsat_core_enabled, logic);
}
};
@ -291,9 +287,9 @@ public:
tactic_factory2solver_factory(tactic_factory * f):m_factory(f) {
}
virtual ~tactic_factory2solver_factory() {}
~tactic_factory2solver_factory() override {}
virtual solver * operator()(ast_manager & m, params_ref const & p, bool proofs_enabled, bool models_enabled, bool unsat_core_enabled, symbol const & logic) {
solver * operator()(ast_manager & m, params_ref const & p, bool proofs_enabled, bool models_enabled, bool unsat_core_enabled, symbol const & logic) override {
tactic * t = (*m_factory)(m, p);
return mk_tactic2solver(m, t, p, proofs_enabled, models_enabled, unsat_core_enabled, logic);
}