mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

re-organize proof and model converters to be associated with goals instead of external

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-18 16:33:54 -08:00
parent 00f5308a0e
commit 4bbece6616
118 changed files with 617 additions and 1070 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/muz/base/dl_util.cpp
View file

@ -380,26 +380,29 @@ namespace datalog {
public:
skip_model_converter() {}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
return alloc(skip_model_converter);
}
virtual void display(std::ostream & out) { }
void operator()(model_ref&) override {}
void display(std::ostream & out) override { }
};
model_converter* mk_skip_model_converter() { return alloc(skip_model_converter); }
class skip_proof_converter : public proof_converter {
virtual void operator()(ast_manager & m, unsigned num_source, proof * const * source, proof_ref & result) {
proof_ref operator()(ast_manager & m, unsigned num_source, proof * const * source) override {
SASSERT(num_source == 1);
result = source[0];
return proof_ref(source[0], m);
}
virtual proof_converter * translate(ast_translation & translator) {
proof_converter * translate(ast_translation & translator) override {
return alloc(skip_proof_converter);
}
virtual void display(std::ostream & out) { out << "(skip-proof-converter)\n"; }
void display(std::ostream & out) override { out << "(skip-proof-converter)\n"; }
};
proof_converter* mk_skip_proof_converter() { return alloc(skip_proof_converter); }

10
src/muz/fp/horn_tactic.cpp
View file

@ -178,10 +178,9 @@ class horn_tactic : public tactic {
void operator()(goal_ref const & g,
goal_ref_buffer & result,
model_converter_ref & mc,
expr_dependency_ref & core) {
SASSERT(g->is_well_sorted());
mc = 0; core = 0;
core = 0;
tactic_report report("horn", *g);
bool produce_proofs = g->proofs_enabled();
@ -230,11 +229,12 @@ class horn_tactic : public tactic {
queries.push_back(q);
generic_model_converter* mc1 = alloc(generic_model_converter, m);
mc1->hide(q);
mc = mc1;
g->add(mc1);
}
SASSERT(queries.size() == 1);
q = queries[0].get();
proof_converter_ref pc = g->pc();
model_converter_ref mc;
if (m_is_simplify) {
simplify(q, g, result, mc, pc);
}
@ -242,6 +242,7 @@ class horn_tactic : public tactic {
verify(q, g, result, mc, pc);
}
g->set(pc.get());
g->set(mc.get());
}
void verify(expr* q,
@ -386,9 +387,8 @@ public:
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result,
model_converter_ref & mc,
expr_dependency_ref & core) {
(*m_imp)(in, result, mc, core);
(*m_imp)(in, result, core);
}
virtual void collect_statistics(statistics & st) const {

5
src/muz/pdr/pdr_context.cpp
View file

@ -202,10 +202,9 @@ namespace pdr {
void pred_transformer::simplify_formulas(tactic& tac, expr_ref_vector& v) {
goal_ref g(alloc(goal, m, false, false, false));
for (unsigned j = 0; j < v.size(); ++j) g->assert_expr(v[j].get());
model_converter_ref mc;
expr_dependency_ref core(m);
goal_ref_buffer result;
tac(g, result, mc, core);
tac(g, result, core);
SASSERT(result.size() == 1);
goal* r = result[0];
v.reset();
@ -390,7 +389,7 @@ namespace pdr {
md->register_decl(m_head, fi);
}
model_converter_ref mc = ctx.get_model_converter();
apply(mc, md, 0);
apply(mc, md);
if (p_orig->get_arity() == 0) {
result = md->get_const_interp(p_orig);
}

3
src/muz/pdr/pdr_farkas_learner.cpp
View file

@ -520,11 +520,10 @@ namespace pdr {
g->assert_expr(lemmas[i].get());
}
expr_ref tmp(m);
model_converter_ref mc;
expr_dependency_ref core(m);
goal_ref_buffer result;
tactic_ref simplifier = mk_arith_bounds_tactic(m);
(*simplifier)(g, result, mc, core);
(*simplifier)(g, result, core);
lemmas.reset();
SASSERT(result.size() == 1);
goal* r = result[0];

2
src/muz/pdr/pdr_manager.cpp
View file

@ -107,7 +107,7 @@ namespace pdr {
}
}
TRACE("pdr", model_smt2_pp(tout, m, *md, 0););
apply(const_cast<model_converter_ref&>(m_mc), md, 0);
apply(const_cast<model_converter_ref&>(m_mc), md);
}
expr_ref inductive_property::to_expr() const {

7
src/muz/spacer/spacer_context.cpp
View file

@ -528,7 +528,7 @@ expr_ref pred_transformer::get_cover_delta(func_decl* p_orig, int level)
md->register_decl(m_head, fi);
}
model_converter_ref mc = ctx.get_model_converter();
apply(mc, md, 0);
apply(mc, md);
if (p_orig->get_arity() == 0) {
result = md->get_const_interp(p_orig);
} else {
@ -1367,7 +1367,6 @@ void pred_transformer::frames::simplify_formulas ()
// normalize level
unsigned level = i < m_size ? i : infty_level ();
model_converter_ref mc;
expr_dependency_ref core(m);
goal_ref_buffer result;
@ -1394,7 +1393,7 @@ void pred_transformer::frames::simplify_formulas ()
}
// more than one lemma at current level. simplify.
(*simplifier)(g, result, mc, core);
(*simplifier)(g, result, core);
SASSERT(result.size () == 1);
goal *r = result[0];
@ -2062,8 +2061,8 @@ bool context::validate()
expr_ref_vector refs(m);
expr_ref tmp(m);
model_ref model;
vector<relation_info> rs;
model_converter_ref mc;
vector<relation_info> rs;
get_level_property(m_inductive_lvl, refs, rs);
inductive_property ex(m, mc, rs);
ex.to_model(model);

3
src/muz/spacer/spacer_legacy_frames.cpp
View file

@ -46,10 +46,9 @@ void pred_transformer::legacy_frames::simplify_formulas(tactic& tac,
ast_manager &m = m_pt.get_ast_manager();
goal_ref g(alloc(goal, m, false, false, false));
for (unsigned j = 0; j < v.size(); ++j) { g->assert_expr(v[j].get()); }
model_converter_ref mc;
expr_dependency_ref core(m);
goal_ref_buffer result;
tac(g, result, mc, core);
tac(g, result, core);
SASSERT(result.size() == 1);
goal* r = result[0];
v.reset();

2
src/muz/spacer/spacer_manager.cpp
View file

@ -113,7 +113,7 @@ void inductive_property::to_model(model_ref& md) const
}
}
TRACE("spacer", model_smt2_pp(tout, m, *md, 0););
apply(const_cast<model_converter_ref&>(m_mc), md, 0);
apply(const_cast<model_converter_ref&>(m_mc), md);
}
expr_ref inductive_property::to_expr() const

6
src/muz/spacer/spacer_util.cpp
View file

@ -929,11 +929,10 @@ void simplify_bounds_old(expr_ref_vector& cube) {
}
expr_ref tmp(m);
model_converter_ref mc;
expr_dependency_ref core(m);
goal_ref_buffer result;
tactic_ref simplifier = mk_arith_bounds_tactic(m);
(*simplifier)(g, result, mc, core);
(*simplifier)(g, result, core);
SASSERT(result.size() == 1);
goal* r = result[0];
@ -954,14 +953,13 @@ void simplify_bounds_new (expr_ref_vector &cube) {
g->assert_expr(cube.get(i));
}
model_converter_ref mc;
expr_dependency_ref dep(m);
goal_ref_buffer goals;
tactic_ref prop_values = mk_propagate_values_tactic(m);
tactic_ref prop_bounds = mk_propagate_ineqs_tactic(m);
tactic_ref t = and_then(prop_values.get(), prop_bounds.get());
(*t)(g, goals, mc, dep);
(*t)(g, goals, dep);
SASSERT(goals.size() == 1);
g = goals[0];

2
src/muz/tab/tab_context.cpp
View file

@ -1602,7 +1602,7 @@ namespace datalog {
pc.invert();
prs.push_back(m.mk_asserted(root));
pc(m, 1, prs.c_ptr(), pr);
pr = pc(m, 1, prs.c_ptr());
return pr;
}

15
src/muz/transforms/dl_mk_slice.cpp
View file

@ -271,20 +271,21 @@ namespace datalog {
m_renaming.insert(orig_rule, unsigned_vector(sz, renaming));
}
virtual void operator()(ast_manager& m, unsigned num_source, proof * const * source, proof_ref & result) {
proof_ref operator()(ast_manager& m, unsigned num_source, proof * const * source) override {
SASSERT(num_source == 1);
result = source[0];
proof_ref result(source[0], m);
init_form2rule();
translate_proof(result);
return result;
}
virtual proof_converter * translate(ast_translation & translator) {
proof_converter * translate(ast_translation & translator) override {
UNREACHABLE();
// this would require implementing translation for the dl_context.
return 0;
}
virtual void display(std::ostream& out) { out << "(slice-proof-converter)\n"; }
void display(std::ostream& out) override { out << "(slice-proof-converter)\n"; }
};
class mk_slice::slice_model_converter : public model_converter {
@ -307,7 +308,7 @@ namespace datalog {
m_sliceable.insert(f, bv);
}
virtual void operator()(model_ref & md) {
void operator()(model_ref & md) override {
if (m_slice2old.empty()) {
return;
}
@ -393,12 +394,12 @@ namespace datalog {
TRACE("dl", model_smt2_pp(tout, m, *md, 0); );
}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
UNREACHABLE();
return 0;
}
virtual void display(std::ostream& out) { out << "(slice-model-converter)\n"; }
void display(std::ostream& out) override { out << "(slice-model-converter)\n"; }
};