mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-15 18:36:16 +00:00
Code Activity

streamline pb solver interface and naming after removal of xor

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-02-28 12:32:04 -08:00
parent 13f05ae9dc
commit 026065ff71
73 changed files with 1131 additions and 1201 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/smt/smt_induction.cpp
View file

@ -113,14 +113,14 @@ bool induction_lemmas::viable_induction_sort(sort* s) {
}
bool induction_lemmas::viable_induction_parent(enode* p, enode* n) {
app* o = p->get_owner();
app* o = p->get_expr();
return
m_rec.is_defined(o) ||
m_dt.is_constructor(o);
}
bool induction_lemmas::viable_induction_children(enode* n) {
app* e = n->get_owner();
app* e = n->get_expr();
if (m.is_value(e))
return false;
if (e->get_decl()->is_skolem())
@ -136,7 +136,7 @@ bool induction_lemmas::viable_induction_children(enode* n) {
bool induction_lemmas::viable_induction_term(enode* p, enode* n) {
return
viable_induction_sort(n->get_owner()->get_sort()) &&
viable_induction_sort(n->get_expr()->get_sort()) &&
viable_induction_parent(p, n) &&
viable_induction_children(n);
}
@ -201,7 +201,7 @@ induction_lemmas::induction_positions_t induction_lemmas::induction_positions2(e
}
void induction_lemmas::initialize_levels(enode* n) {
expr_ref tmp(n->get_owner(), m);
expr_ref tmp(n->get_expr(), m);
m_depth2terms.reset();
m_depth2terms.resize(get_depth(tmp) + 1);
m_ts++;
@ -221,7 +221,7 @@ induction_lemmas::induction_combinations_t induction_lemmas::induction_combinati
if (pos.size() > 6) {
induction_positions_t r;
for (auto const& p : pos) {
if (is_uninterp_const(p.first->get_owner()))
if (is_uninterp_const(p.first->get_expr()))
r.push_back(p);
}
result.push_back(r);
@ -239,7 +239,7 @@ induction_lemmas::induction_combinations_t induction_lemmas::induction_combinati
for (auto const& pos : result) {
std::cout << "position\n";
for (auto const& p : pos) {
std::cout << mk_pp(p.first->get_owner(), m) << ":" << p.second << "\n";
std::cout << mk_pp(p.first->get_expr(), m) << ":" << p.second << "\n";
}
}
return result;
@ -252,7 +252,7 @@ bool induction_lemmas::positions_dont_overlap(induction_positions_t const& posit
auto mark = [&](expr* n) { m_marks[n->get_id()] = m_ts; };
auto is_marked = [&](expr* n) { return m_marks[n->get_id()] == m_ts; };
for (auto p : positions)
mark(p.first->get_owner());
mark(p.first->get_expr());
// no term used for induction contains a subterm also used for induction.
for (auto const& terms : m_depth2terms) {
for (app* t : terms) {
@ -456,7 +456,7 @@ void induction_lemmas::apply_induction(literal lit, induction_positions_t const
unsigned i = 0;
for (auto const& p : positions) {
expr* t = p.first->get_owner()->get_arg(p.second);
expr* t = p.first->get_expr()->get_arg(p.second);
if (term2skolem.contains(t))
continue;
if (i == sks.size()) {
@ -500,7 +500,7 @@ void induction_lemmas::apply_induction(literal lit, induction_positions_t const
expr* arg = to_app(t)->get_arg(i);
found = false;
for (auto const& p : positions) {
if (p.first->get_owner() == t && p.second == i) {
if (p.first->get_expr() == t && p.second == i) {
args.push_back(term2skolem[arg]);
found = true;
break;
@ -558,10 +558,10 @@ induction::induction(context& ctx, ast_manager& m):
// TBD: use smt_arith_value to also include state from arithmetic solver
void induction::init_values() {
for (enode* n : ctx.enodes())
if (m.is_value(n->get_owner()))
if (m.is_value(n->get_expr()))
for (enode* r : *n)
if (r != n) {
vs.set_value(r->get_owner(), n->get_owner());
vs.set_value(r->get_expr(), n->get_expr());
}
}