mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

#5454

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-08-11 20:31:53 -07:00
parent fea14245a0
commit b016465ad2
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_extension.h
View file

@ -120,7 +120,7 @@ namespace sat {
virtual bool check_model(model const& m) const { return true; } virtual bool check_model(model const& m) const { return true; }
virtual void gc_vars(unsigned num_vars) {} virtual void gc_vars(unsigned num_vars) {}
virtual bool should_research(sat::literal_vector const& core) { return false;} virtual bool should_research(sat::literal_vector const& core) { return false;}
virtual void add_assumptions() {} virtual void add_assumptions(literal_set& ext_assumptions) {}
virtual bool tracking_assumptions() { return false; } virtual bool tracking_assumptions() { return false; }
virtual bool enable_self_propagate() const { return false; } virtual bool enable_self_propagate() const { return false; }

4
src/sat/sat_solver.cpp
View file

@ -1895,9 +1895,7 @@ namespace sat {
m_ext_assumption_set.reset(); m_ext_assumption_set.reset();
unsigned trail_size = m_trail.size(); unsigned trail_size = m_trail.size();
if (!inconsistent()) if (!inconsistent())
m_ext->add_assumptions(); m_ext->add_assumptions(m_ext_assumption_set);
for (unsigned i = trail_size; i < m_trail.size(); ++i)
m_ext_assumption_set.insert(m_trail[i]);
} }
} }

4
src/sat/smt/euf_solver.cpp
View file

@ -699,9 +699,9 @@ namespace euf {
return result; return result;
} }
void solver::add_assumptions() { void solver::add_assumptions(sat::literal_set& assumptions) {
for (auto* e : m_solvers) for (auto* e : m_solvers)
e->add_assumptions(); e->add_assumptions(assumptions);
} }
bool solver::tracking_assumptions() { bool solver::tracking_assumptions() {

2
src/sat/smt/euf_solver.h
View file

@ -276,7 +276,7 @@ namespace euf {
bool propagated(literal l, ext_constraint_idx idx) override; bool propagated(literal l, ext_constraint_idx idx) override;
bool unit_propagate() override; bool unit_propagate() override;
bool should_research(sat::literal_vector const& core) override; bool should_research(sat::literal_vector const& core) override;
void add_assumptions() override; void add_assumptions(sat::literal_set& assumptions) override;
bool tracking_assumptions() override; bool tracking_assumptions() override;
void propagate(literal lit, ext_justification_idx idx); void propagate(literal lit, ext_justification_idx idx);

13
src/sat/smt/recfun_solver.cpp
View file

@ -279,13 +279,18 @@ namespace recfun {
return true; return true;
} }
void solver::add_assumptions() { void solver::add_assumptions(sat::literal_set& assumptions) {
if (u().has_defs() || m_disabled_guards.empty()) { if (u().has_defs() || m_disabled_guards.empty()) {
app_ref dlimit = m_util.mk_num_rounds_pred(m_num_rounds); app_ref dlimit = m_util.mk_num_rounds_pred(m_num_rounds);
TRACEFN("add_theory_assumption " << dlimit); TRACEFN("add_theory_assumption " << dlimit);
s().assign_scoped(mk_literal(dlimit)); sat::literal assumption = mk_literal(dlimit);
for (auto g : m_disabled_guards) assumptions.insert(assumption);
s().assign_scoped(~mk_literal(g)); s().assign_scoped(assumption);
for (auto g : m_disabled_guards) {
assumption = ~mk_literal(g);
assumptions.insert(assumption);
s().assign_scoped(assumption);
}
} }
} }

2
src/sat/smt/recfun_solver.h
View file

@ -108,7 +108,7 @@ namespace recfun {
bool is_shared(euf::theory_var v) const override { return true; } bool is_shared(euf::theory_var v) const override { return true; }
void init_search() override {} void init_search() override {}
bool should_research(sat::literal_vector const& core) override; bool should_research(sat::literal_vector const& core) override;
void add_assumptions() override; void add_assumptions(sat::literal_set& assumptions) override;
bool tracking_assumptions() override { return true; } bool tracking_assumptions() override { return true; }
}; };
} }