mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-24 03:57:51 +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

25
src/tactic/smtlogics/qfufbv_tactic.cpp
View file

@ -51,10 +51,9 @@ public:
, m_inc_use_sat(false)
{}
virtual ~qfufbv_ackr_tactic() { }
~qfufbv_ackr_tactic() override { }
virtual void operator()(goal_ref const & g,
goal_ref_buffer & result) {
void operator()(goal_ref const & g, goal_ref_buffer & result) override {
ast_manager& m(g->m());
tactic_report report("qfufbv_ackr", *g);
fail_if_unsat_core_generation("qfufbv_ackr", g);
@ -66,8 +65,8 @@ public:
const unsigned sz = g->size();
for (unsigned i = 0; i < sz; i++) flas.push_back(g->form(i));
scoped_ptr<solver> uffree_solver = setup_sat();
scoped_ptr<lackr> imp = alloc(lackr, m, m_p, m_st, flas, uffree_solver.get());
const lbool o = imp->operator()();
lackr imp(m, m_p, m_st, flas, uffree_solver.get());
const lbool o = imp.operator()();
flas.reset();
// report result
goal_ref resg(alloc(goal, *g, true));
@ -75,28 +74,28 @@ public:
if (o != l_undef) result.push_back(resg.get());
// report model
if (g->models_enabled() && (o == l_true)) {
model_ref abstr_model = imp->get_model();
g->add(mk_qfufbv_ackr_model_converter(m, imp->get_info(), abstr_model));
model_ref abstr_model = imp.get_model();
g->add(mk_qfufbv_ackr_model_converter(m, imp.get_info(), abstr_model));
}
}
void updt_params(params_ref const & _p) {
void updt_params(params_ref const & _p) override {
qfufbv_tactic_params p(_p);
m_use_sat = p.sat_backend();
m_inc_use_sat = p.inc_sat_backend();
}
virtual void collect_statistics(statistics & st) const {
void collect_statistics(statistics & st) const override {
ackermannization_params p(m_p);
if (!p.eager()) st.update("lackr-its", m_st.m_it);
st.update("ackr-constraints", m_st.m_ackrs_sz);
}
virtual void reset_statistics() { m_st.reset(); }
void reset_statistics() override { m_st.reset(); }
virtual void cleanup() { }
void cleanup() override { }
virtual tactic* translate(ast_manager& m) {
tactic* translate(ast_manager& m) override {
return alloc(qfufbv_ackr_tactic, m, m_p);
}
private:
@ -107,7 +106,7 @@ private:
bool m_inc_use_sat;
solver* setup_sat() {
solver * sat(NULL);
solver * sat(nullptr);
if (m_use_sat) {
if (m_inc_use_sat) {
sat = mk_inc_sat_solver(m_m, m_p);