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

introducing base namespace for user propagator

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-11-29 19:41:30 -08:00
parent c083aa82ee
commit 5857236f2f
14 changed files with 189 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/api/api_solver.cpp
View file

@ -866,7 +866,7 @@ extern "C" {
Z3_CATCH_RETURN(nullptr); Z3_CATCH_RETURN(nullptr);
} }
class api_context_obj : public solver::context_obj { class api_context_obj : public user_propagator::context_obj {
api::context* c; api::context* c;
public: public:
api_context_obj(api::context* c):c(c) {} api_context_obj(api::context* c):c(c) {}
@ -883,9 +883,9 @@ extern "C" {
Z3_TRY; Z3_TRY;
RESET_ERROR_CODE(); RESET_ERROR_CODE();
init_solver(c, s); init_solver(c, s);
solver::push_eh_t _push = push_eh; user_propagator::push_eh_t _push = push_eh;
solver::pop_eh_t _pop = pop_eh; user_propagator::pop_eh_t _pop = pop_eh;
solver::fresh_eh_t _fresh = [=](void * user_ctx, ast_manager& m, solver::context_obj*& _ctx) { user_propagator::fresh_eh_t _fresh = [=](void * user_ctx, ast_manager& m, user_propagator::context_obj*& _ctx) {
ast_context_params params; ast_context_params params;
params.set_foreign_manager(&m); params.set_foreign_manager(&m);
auto* ctx = alloc(api::context, &params, false); auto* ctx = alloc(api::context, &params, false);
@ -902,7 +902,7 @@ extern "C" {
Z3_fixed_eh fixed_eh) { Z3_fixed_eh fixed_eh) {
Z3_TRY; Z3_TRY;
RESET_ERROR_CODE(); RESET_ERROR_CODE();
solver::fixed_eh_t _fixed = (void(*)(void*,solver::propagate_callback*,unsigned,expr*))fixed_eh; user_propagator::fixed_eh_t _fixed = (void(*)(void*,user_propagator::callback*,unsigned,expr*))fixed_eh;
to_solver_ref(s)->user_propagate_register_fixed(_fixed); to_solver_ref(s)->user_propagate_register_fixed(_fixed);
Z3_CATCH; Z3_CATCH;
} }
@ -913,7 +913,7 @@ extern "C" {
Z3_final_eh final_eh) { Z3_final_eh final_eh) {
Z3_TRY; Z3_TRY;
RESET_ERROR_CODE(); RESET_ERROR_CODE();
solver::final_eh_t _final = (bool(*)(void*,solver::propagate_callback*))final_eh; user_propagator::final_eh_t _final = (bool(*)(void*,user_propagator::callback*))final_eh;
to_solver_ref(s)->user_propagate_register_final(_final); to_solver_ref(s)->user_propagate_register_final(_final);
Z3_CATCH; Z3_CATCH;
} }
@ -924,7 +924,7 @@ extern "C" {
Z3_eq_eh eq_eh) { Z3_eq_eh eq_eh) {
Z3_TRY; Z3_TRY;
RESET_ERROR_CODE(); RESET_ERROR_CODE();
solver::eq_eh_t _eq = (void(*)(void*,solver::propagate_callback*,unsigned,unsigned))eq_eh; user_propagator::eq_eh_t _eq = (void(*)(void*,user_propagator::callback*,unsigned,unsigned))eq_eh;
to_solver_ref(s)->user_propagate_register_eq(_eq); to_solver_ref(s)->user_propagate_register_eq(_eq);
Z3_CATCH; Z3_CATCH;
} }
@ -935,7 +935,7 @@ extern "C" {
Z3_eq_eh diseq_eh) { Z3_eq_eh diseq_eh) {
Z3_TRY; Z3_TRY;
RESET_ERROR_CODE(); RESET_ERROR_CODE();
solver::eq_eh_t _diseq = (void(*)(void*,solver::propagate_callback*,unsigned,unsigned))diseq_eh; user_propagator::eq_eh_t _diseq = (void(*)(void*,user_propagator::callback*,unsigned,unsigned))diseq_eh;
to_solver_ref(s)->user_propagate_register_diseq(_diseq); to_solver_ref(s)->user_propagate_register_diseq(_diseq);
Z3_CATCH; Z3_CATCH;
} }
@ -952,7 +952,7 @@ extern "C" {
Z3_TRY; Z3_TRY;
LOG_Z3_solver_propagate_consequence(c, s, num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, conseq); LOG_Z3_solver_propagate_consequence(c, s, num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, conseq);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
reinterpret_cast<solver::propagate_callback*>(s)->propagate_cb(num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, to_expr(conseq)); reinterpret_cast<user_propagator::callback*>(s)->propagate_cb(num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, to_expr(conseq));
Z3_CATCH; Z3_CATCH;
} }

18
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -661,25 +661,25 @@ public:
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) override { user_propagator::fresh_eh_t& fresh_eh) override {
ensure_euf()->user_propagate_init(ctx, push_eh, pop_eh, fresh_eh); ensure_euf()->user_propagate_init(ctx, push_eh, pop_eh, fresh_eh);
} }
void user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh) override { void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) override {
ensure_euf()->user_propagate_register_fixed(fixed_eh); ensure_euf()->user_propagate_register_fixed(fixed_eh);
} }
void user_propagate_register_final(solver::final_eh_t& final_eh) override { void user_propagate_register_final(user_propagator::final_eh_t& final_eh) override {
ensure_euf()->user_propagate_register_final(final_eh); ensure_euf()->user_propagate_register_final(final_eh);
} }
void user_propagate_register_eq(solver::eq_eh_t& eq_eh) override { void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) override {
ensure_euf()->user_propagate_register_eq(eq_eh); ensure_euf()->user_propagate_register_eq(eq_eh);
} }
void user_propagate_register_diseq(solver::eq_eh_t& diseq_eh) override { void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) override {
ensure_euf()->user_propagate_register_diseq(diseq_eh); ensure_euf()->user_propagate_register_diseq(diseq_eh);
} }
@ -959,11 +959,11 @@ private:
extract_asm2dep(asm2dep); extract_asm2dep(asm2dep);
sat::literal_vector const& core = m_solver.get_core(); sat::literal_vector const& core = m_solver.get_core();
TRACE("sat", TRACE("sat",
for (auto kv : m_dep2asm) { for (auto const& kv : m_dep2asm) {
tout << mk_pp(kv.m_key, m) << " |-> " << sat::literal(kv.m_value) << "\n"; tout << mk_pp(kv.m_key, m) << " |-> " << sat::literal(kv.m_value) << "\n";
} }
tout << "asm2fml: "; tout << "asm2fml: ";
for (auto kv : asm2fml) { for (auto const& kv : asm2fml) {
tout << mk_pp(kv.m_key, m) << " |-> " << mk_pp(kv.m_value, m) << "\n"; tout << mk_pp(kv.m_key, m) << " |-> " << mk_pp(kv.m_value, m) << "\n";
} }
tout << "core: "; for (auto c : core) tout << c << " "; tout << "\n"; tout << "core: "; for (auto c : core) tout << c << " "; tout << "\n";

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

@ -295,7 +295,7 @@ namespace euf {
return; return;
bool sign = l.sign(); bool sign = l.sign();
m_egraph.set_value(n, sign ? l_false : l_true); m_egraph.set_value(n, sign ? l_false : l_true);
for (auto th : enode_th_vars(n)) for (auto const& th : enode_th_vars(n))
m_id2solver[th.get_id()]->asserted(l); m_id2solver[th.get_id()]->asserted(l);
size_t* c = to_ptr(l); size_t* c = to_ptr(l);
@ -519,8 +519,7 @@ namespace euf {
void solver::push() { void solver::push() {
si.push(); si.push();
scope s; scope s(m_var_trail.size());
s.m_var_lim = m_var_trail.size();
m_scopes.push_back(s); m_scopes.push_back(s);
m_trail.push_scope(); m_trail.push_scope();
for (auto* e : m_solvers) for (auto* e : m_solvers)
@ -994,9 +993,9 @@ namespace euf {
void solver::user_propagate_init( void solver::user_propagate_init(
void* ctx, void* ctx,
::solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
::solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
::solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_user_propagator = alloc(user_solver::solver, *this); m_user_propagator = alloc(user_solver::solver, *this);
m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh); m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh);
for (unsigned i = m_scopes.size(); i-- > 0; ) for (unsigned i = m_scopes.size(); i-- > 0; )

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

@ -72,6 +72,7 @@ namespace euf {
}; };
struct scope { struct scope {
unsigned m_var_lim; unsigned m_var_lim;
scope(unsigned l) : m_var_lim(l) {}
}; };
@ -400,27 +401,27 @@ namespace euf {
// user propagator // user propagator
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
::solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
::solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
::solver::fresh_eh_t& fresh_eh); user_propagator::fresh_eh_t& fresh_eh);
bool watches_fixed(enode* n) const; bool watches_fixed(enode* n) const;
void assign_fixed(enode* n, expr* val, unsigned sz, literal const* explain); void assign_fixed(enode* n, expr* val, unsigned sz, literal const* explain);
void assign_fixed(enode* n, expr* val, literal_vector const& explain) { assign_fixed(n, val, explain.size(), explain.data()); } void assign_fixed(enode* n, expr* val, literal_vector const& explain) { assign_fixed(n, val, explain.size(), explain.data()); }
void assign_fixed(enode* n, expr* val, literal explain) { assign_fixed(n, val, 1, &explain); } void assign_fixed(enode* n, expr* val, literal explain) { assign_fixed(n, val, 1, &explain); }
void user_propagate_register_final(::solver::final_eh_t& final_eh) { void user_propagate_register_final(user_propagator::final_eh_t& final_eh) {
check_for_user_propagator(); check_for_user_propagator();
m_user_propagator->register_final(final_eh); m_user_propagator->register_final(final_eh);
} }
void user_propagate_register_fixed(::solver::fixed_eh_t& fixed_eh) { void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) {
check_for_user_propagator(); check_for_user_propagator();
m_user_propagator->register_fixed(fixed_eh); m_user_propagator->register_fixed(fixed_eh);
} }
void user_propagate_register_eq(::solver::eq_eh_t& eq_eh) { void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) {
check_for_user_propagator(); check_for_user_propagator();
m_user_propagator->register_eq(eq_eh); m_user_propagator->register_eq(eq_eh);
} }
void user_propagate_register_diseq(::solver::eq_eh_t& diseq_eh) { void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) {
check_for_user_propagator(); check_for_user_propagator();
m_user_propagator->register_diseq(diseq_eh); m_user_propagator->register_diseq(diseq_eh);
} }

35
src/sat/smt/user_solver.h
View file

@ -21,11 +21,12 @@ Author:
#include "sat/smt/sat_th.h" #include "sat/smt/sat_th.h"
#include "solver/solver.h" #include "solver/solver.h"
#include "tactic/user_propagator_base.h"
namespace user_solver { namespace user_solver {
class solver : public euf::th_euf_solver, public ::solver::propagate_callback { class solver : public euf::th_euf_solver, public user_propagator::callback {
struct prop_info { struct prop_info {
unsigned_vector m_ids; unsigned_vector m_ids;
@ -47,15 +48,15 @@ namespace user_solver {
}; };
void* m_user_context; void* m_user_context;
::solver::push_eh_t m_push_eh; user_propagator::push_eh_t m_push_eh;
::solver::pop_eh_t m_pop_eh; user_propagator::pop_eh_t m_pop_eh;
::solver::fresh_eh_t m_fresh_eh; user_propagator::fresh_eh_t m_fresh_eh;
::solver::final_eh_t m_final_eh; user_propagator::final_eh_t m_final_eh;
::solver::fixed_eh_t m_fixed_eh; user_propagator::fixed_eh_t m_fixed_eh;
::solver::eq_eh_t m_eq_eh; user_propagator::eq_eh_t m_eq_eh;
::solver::eq_eh_t m_diseq_eh; user_propagator::eq_eh_t m_diseq_eh;
::solver::context_obj* m_api_context { nullptr }; user_propagator::context_obj* m_api_context = nullptr;
unsigned m_qhead { 0 }; unsigned m_qhead = 0;
vector<prop_info> m_prop; vector<prop_info> m_prop;
unsigned_vector m_prop_lim; unsigned_vector m_prop_lim;
vector<sat::literal_vector> m_id2justification; vector<sat::literal_vector> m_id2justification;
@ -91,9 +92,9 @@ namespace user_solver {
*/ */
void add( void add(
void* ctx, void* ctx,
::solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
::solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
::solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_user_context = ctx; m_user_context = ctx;
m_push_eh = push_eh; m_push_eh = push_eh;
m_pop_eh = pop_eh; m_pop_eh = pop_eh;
@ -102,10 +103,10 @@ namespace user_solver {
unsigned add_expr(expr* e); unsigned add_expr(expr* e);
void register_final(::solver::final_eh_t& final_eh) { m_final_eh = final_eh; } void register_final(user_propagator::final_eh_t& final_eh) { m_final_eh = final_eh; }
void register_fixed(::solver::fixed_eh_t& fixed_eh) { m_fixed_eh = fixed_eh; } void register_fixed(user_propagator::fixed_eh_t& fixed_eh) { m_fixed_eh = fixed_eh; }
void register_eq(::solver::eq_eh_t& eq_eh) { m_eq_eh = eq_eh; } void register_eq(user_propagator::eq_eh_t& eq_eh) { m_eq_eh = eq_eh; }
void register_diseq(::solver::eq_eh_t& diseq_eh) { m_diseq_eh = diseq_eh; } void register_diseq(user_propagator::eq_eh_t& diseq_eh) { m_diseq_eh = diseq_eh; }
bool has_fixed() const { return (bool)m_fixed_eh; } bool has_fixed() const { return (bool)m_fixed_eh; }

14
src/smt/smt_context.cpp
View file

@ -198,7 +198,7 @@ namespace smt {
return; return;
ast_translation tr(src_ctx.m, m, false); ast_translation tr(src_ctx.m, m, false);
auto* p = get_theory(m.mk_family_id("user_propagator")); auto* p = get_theory(m.mk_family_id("user_propagator"));
m_user_propagator = reinterpret_cast<user_propagator*>(p); m_user_propagator = reinterpret_cast<theory_user_propagator*>(p);
SASSERT(m_user_propagator); SASSERT(m_user_propagator);
for (unsigned i = 0; i < src_ctx.m_user_propagator->get_num_vars(); ++i) { for (unsigned i = 0; i < src_ctx.m_user_propagator->get_num_vars(); ++i) {
app* e = src_ctx.m_user_propagator->get_expr(i); app* e = src_ctx.m_user_propagator->get_expr(i);
@ -2886,11 +2886,11 @@ namespace smt {
void context::user_propagate_init( void context::user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
setup_context(false); setup_context(false);
m_user_propagator = alloc(user_propagator, *this); m_user_propagator = alloc(theory_user_propagator, *this);
m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh); m_user_propagator->add(ctx, push_eh, pop_eh, fresh_eh);
for (unsigned i = m_scopes.size(); i-- > 0; ) for (unsigned i = m_scopes.size(); i-- > 0; )
m_user_propagator->push_scope_eh(); m_user_propagator->push_scope_eh();
@ -3552,7 +3552,7 @@ namespace smt {
parallel p(*this); parallel p(*this);
return p(asms); return p(asms);
} }
lbool r; lbool r = l_undef;
do { do {
pop_to_base_lvl(); pop_to_base_lvl();
expr_ref_vector asms(m, num_assumptions, assumptions); expr_ref_vector asms(m, num_assumptions, assumptions);
@ -3573,7 +3573,7 @@ namespace smt {
if (!check_preamble(true)) return l_undef; if (!check_preamble(true)) return l_undef;
TRACE("before_search", display(tout);); TRACE("before_search", display(tout););
setup_context(false); setup_context(false);
lbool r; lbool r = l_undef;
do { do {
pop_to_base_lvl(); pop_to_base_lvl();
expr_ref_vector asms(cube); expr_ref_vector asms(cube);

16
src/smt/smt_context.h
View file

@ -88,7 +88,7 @@ namespace smt {
scoped_ptr<quantifier_manager> m_qmanager; scoped_ptr<quantifier_manager> m_qmanager;
scoped_ptr<model_generator> m_model_generator; scoped_ptr<model_generator> m_model_generator;
scoped_ptr<relevancy_propagator> m_relevancy_propagator; scoped_ptr<relevancy_propagator> m_relevancy_propagator;
user_propagator* m_user_propagator; theory_user_propagator* m_user_propagator;
random_gen m_random; random_gen m_random;
bool m_flushing; // (debug support) true when flushing bool m_flushing; // (debug support) true when flushing
mutable unsigned m_lemma_id; mutable unsigned m_lemma_id;
@ -1695,29 +1695,29 @@ namespace smt {
*/ */
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh); user_propagator::fresh_eh_t& fresh_eh);
void user_propagate_register_final(solver::final_eh_t& final_eh) { void user_propagate_register_final(user_propagator::final_eh_t& final_eh) {
if (!m_user_propagator) if (!m_user_propagator)
throw default_exception("user propagator must be initialized"); throw default_exception("user propagator must be initialized");
m_user_propagator->register_final(final_eh); m_user_propagator->register_final(final_eh);
} }
void user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh) { void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) {
if (!m_user_propagator) if (!m_user_propagator)
throw default_exception("user propagator must be initialized"); throw default_exception("user propagator must be initialized");
m_user_propagator->register_fixed(fixed_eh); m_user_propagator->register_fixed(fixed_eh);
} }
void user_propagate_register_eq(solver::eq_eh_t& eq_eh) { void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) {
if (!m_user_propagator) if (!m_user_propagator)
throw default_exception("user propagator must be initialized"); throw default_exception("user propagator must be initialized");
m_user_propagator->register_eq(eq_eh); m_user_propagator->register_eq(eq_eh);
} }
void user_propagate_register_diseq(solver::eq_eh_t& diseq_eh) { void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) {
if (!m_user_propagator) if (!m_user_propagator)
throw default_exception("user propagator must be initialized"); throw default_exception("user propagator must be initialized");
m_user_propagator->register_diseq(diseq_eh); m_user_propagator->register_diseq(diseq_eh);

28
src/smt/smt_kernel.cpp
View file

@ -223,25 +223,25 @@ namespace smt {
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_kernel.user_propagate_init(ctx, push_eh, pop_eh, fresh_eh); m_kernel.user_propagate_init(ctx, push_eh, pop_eh, fresh_eh);
} }
void user_propagate_register_final(solver::final_eh_t& final_eh) { void user_propagate_register_final(user_propagator::final_eh_t& final_eh) {
m_kernel.user_propagate_register_final(final_eh); m_kernel.user_propagate_register_final(final_eh);
} }
void user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh) { void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) {
m_kernel.user_propagate_register_fixed(fixed_eh); m_kernel.user_propagate_register_fixed(fixed_eh);
} }
void user_propagate_register_eq(solver::eq_eh_t& eq_eh) { void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) {
m_kernel.user_propagate_register_eq(eq_eh); m_kernel.user_propagate_register_eq(eq_eh);
} }
void user_propagate_register_diseq(solver::eq_eh_t& diseq_eh) { void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) {
m_kernel.user_propagate_register_diseq(diseq_eh); m_kernel.user_propagate_register_diseq(diseq_eh);
} }
@ -451,25 +451,25 @@ namespace smt {
void kernel::user_propagate_init( void kernel::user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_imp->user_propagate_init(ctx, push_eh, pop_eh, fresh_eh); m_imp->user_propagate_init(ctx, push_eh, pop_eh, fresh_eh);
} }
void kernel::user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh) { void kernel::user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) {
m_imp->user_propagate_register_fixed(fixed_eh); m_imp->user_propagate_register_fixed(fixed_eh);
} }
void kernel::user_propagate_register_final(solver::final_eh_t& final_eh) { void kernel::user_propagate_register_final(user_propagator::final_eh_t& final_eh) {
m_imp->user_propagate_register_final(final_eh); m_imp->user_propagate_register_final(final_eh);
} }
void kernel::user_propagate_register_eq(solver::eq_eh_t& eq_eh) { void kernel::user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) {
m_imp->user_propagate_register_eq(eq_eh); m_imp->user_propagate_register_eq(eq_eh);
} }
void kernel::user_propagate_register_diseq(solver::eq_eh_t& diseq_eh) { void kernel::user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) {
m_imp->user_propagate_register_diseq(diseq_eh); m_imp->user_propagate_register_diseq(diseq_eh);
} }

14
src/smt/smt_kernel.h
View file

@ -289,17 +289,17 @@ namespace smt {
*/ */
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh); user_propagator::fresh_eh_t& fresh_eh);
void user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh); void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh);
void user_propagate_register_final(solver::final_eh_t& final_eh); void user_propagate_register_final(user_propagator::final_eh_t& final_eh);
void user_propagate_register_eq(solver::eq_eh_t& eq_eh); void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh);
void user_propagate_register_diseq(solver::eq_eh_t& diseq_eh); void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh);
/** /**

14
src/smt/smt_solver.cpp
View file

@ -215,25 +215,25 @@ namespace {
void user_propagate_init( void user_propagate_init(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) override { user_propagator::fresh_eh_t& fresh_eh) override {
m_context.user_propagate_init(ctx, push_eh, pop_eh, fresh_eh); m_context.user_propagate_init(ctx, push_eh, pop_eh, fresh_eh);
} }
void user_propagate_register_fixed(solver::fixed_eh_t& fixed_eh) override { void user_propagate_register_fixed(user_propagator::fixed_eh_t& fixed_eh) override {
m_context.user_propagate_register_fixed(fixed_eh); m_context.user_propagate_register_fixed(fixed_eh);
} }
void user_propagate_register_final(solver::final_eh_t& final_eh) override { void user_propagate_register_final(user_propagator::final_eh_t& final_eh) override {
m_context.user_propagate_register_final(final_eh); m_context.user_propagate_register_final(final_eh);
} }
void user_propagate_register_eq(solver::eq_eh_t& eq_eh) override { void user_propagate_register_eq(user_propagator::eq_eh_t& eq_eh) override {
m_context.user_propagate_register_eq(eq_eh); m_context.user_propagate_register_eq(eq_eh);
} }
void user_propagate_register_diseq(solver::eq_eh_t& diseq_eh) override { void user_propagate_register_diseq(user_propagator::eq_eh_t& diseq_eh) override {
m_context.user_propagate_register_diseq(diseq_eh); m_context.user_propagate_register_diseq(diseq_eh);
} }

32
src/smt/user_propagator.cpp
View file

@ -22,15 +22,15 @@ Author:
using namespace smt; using namespace smt;
user_propagator::user_propagator(context& ctx): theory_user_propagator::theory_user_propagator(context& ctx):
theory(ctx, ctx.get_manager().mk_family_id("user_propagator")) theory(ctx, ctx.get_manager().mk_family_id("user_propagator"))
{} {}
user_propagator::~user_propagator() { theory_user_propagator::~theory_user_propagator() {
dealloc(m_api_context); dealloc(m_api_context);
} }
void user_propagator::force_push() { void theory_user_propagator::force_push() {
for (; m_num_scopes > 0; --m_num_scopes) { for (; m_num_scopes > 0; --m_num_scopes) {
theory::push_scope_eh(); theory::push_scope_eh();
m_push_eh(m_user_context); m_push_eh(m_user_context);
@ -38,7 +38,7 @@ void user_propagator::force_push() {
} }
} }
unsigned user_propagator::add_expr(expr* e) { unsigned theory_user_propagator::add_expr(expr* e) {
force_push(); force_push();
enode* n = ensure_enode(e); enode* n = ensure_enode(e);
if (is_attached_to_var(n)) if (is_attached_to_var(n))
@ -48,7 +48,7 @@ unsigned user_propagator::add_expr(expr* e) {
return v; return v;
} }
void user_propagator::propagate_cb( void theory_user_propagator::propagate_cb(
unsigned num_fixed, unsigned const* fixed_ids, unsigned num_fixed, unsigned const* fixed_ids,
unsigned num_eqs, unsigned const* eq_lhs, unsigned const* eq_rhs, unsigned num_eqs, unsigned const* eq_lhs, unsigned const* eq_rhs,
expr* conseq) { expr* conseq) {
@ -59,8 +59,8 @@ void user_propagator::propagate_cb(
m_prop.push_back(prop_info(num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, expr_ref(conseq, m))); m_prop.push_back(prop_info(num_fixed, fixed_ids, num_eqs, eq_lhs, eq_rhs, expr_ref(conseq, m)));
} }
theory * user_propagator::mk_fresh(context * new_ctx) { theory * theory_user_propagator::mk_fresh(context * new_ctx) {
auto* th = alloc(user_propagator, *new_ctx); auto* th = alloc(theory_user_propagator, *new_ctx);
void* ctx = m_fresh_eh(m_user_context, new_ctx->get_manager(), th->m_api_context); void* ctx = m_fresh_eh(m_user_context, new_ctx->get_manager(), th->m_api_context);
th->add(ctx, m_push_eh, m_pop_eh, m_fresh_eh); th->add(ctx, m_push_eh, m_pop_eh, m_fresh_eh);
if ((bool)m_fixed_eh) th->register_fixed(m_fixed_eh); if ((bool)m_fixed_eh) th->register_fixed(m_fixed_eh);
@ -70,7 +70,7 @@ theory * user_propagator::mk_fresh(context * new_ctx) {
return th; return th;
} }
final_check_status user_propagator::final_check_eh() { final_check_status theory_user_propagator::final_check_eh() {
if (!(bool)m_final_eh) if (!(bool)m_final_eh)
return FC_DONE; return FC_DONE;
force_push(); force_push();
@ -81,7 +81,7 @@ final_check_status user_propagator::final_check_eh() {
return done ? FC_DONE : FC_CONTINUE; return done ? FC_DONE : FC_CONTINUE;
} }
void user_propagator::new_fixed_eh(theory_var v, expr* value, unsigned num_lits, literal const* jlits) { void theory_user_propagator::new_fixed_eh(theory_var v, expr* value, unsigned num_lits, literal const* jlits) {
if (!m_fixed_eh) if (!m_fixed_eh)
return; return;
force_push(); force_push();
@ -93,11 +93,11 @@ void user_propagator::new_fixed_eh(theory_var v, expr* value, unsigned num_lits,
m_fixed_eh(m_user_context, this, v, value); m_fixed_eh(m_user_context, this, v, value);
} }
void user_propagator::push_scope_eh() { void theory_user_propagator::push_scope_eh() {
++m_num_scopes; ++m_num_scopes;
} }
void user_propagator::pop_scope_eh(unsigned num_scopes) { void theory_user_propagator::pop_scope_eh(unsigned num_scopes) {
unsigned n = std::min(num_scopes, m_num_scopes); unsigned n = std::min(num_scopes, m_num_scopes);
m_num_scopes -= n; m_num_scopes -= n;
num_scopes -= n; num_scopes -= n;
@ -110,11 +110,11 @@ void user_propagator::pop_scope_eh(unsigned num_scopes) {
m_prop_lim.shrink(old_sz); m_prop_lim.shrink(old_sz);
} }
bool user_propagator::can_propagate() { bool theory_user_propagator::can_propagate() {
return m_qhead < m_prop.size(); return m_qhead < m_prop.size();
} }
void user_propagator::propagate() { void theory_user_propagator::propagate() {
TRACE("user_propagate", tout << "propagating queue head: " << m_qhead << " prop queue: " << m_prop.size() << "\n"); TRACE("user_propagate", tout << "propagating queue head: " << m_qhead << " prop queue: " << m_prop.size() << "\n");
if (m_qhead == m_prop.size()) if (m_qhead == m_prop.size())
return; return;
@ -130,8 +130,8 @@ void user_propagator::propagate() {
for (auto const& p : prop.m_eqs) for (auto const& p : prop.m_eqs)
m_eqs.push_back(enode_pair(get_enode(p.first), get_enode(p.second))); m_eqs.push_back(enode_pair(get_enode(p.first), get_enode(p.second)));
DEBUG_CODE(for (auto const& p : m_eqs) VERIFY(p.first->get_root() == p.second->get_root());); DEBUG_CODE(for (auto const& p : m_eqs) VERIFY(p.first->get_root() == p.second->get_root()););
DEBUG_CODE(for (unsigned id : prop.m_ids) VERIFY(m_fixed.contains(id));); DEBUG_CODE(for (unsigned id : prop.m_ids) VERIFY(m_fixed.contains(id)););
DEBUG_CODE(for (literal lit : m_lits) VERIFY(ctx.get_assignment(lit) == l_true);); DEBUG_CODE(for (literal lit : m_lits) VERIFY(ctx.get_assignment(lit) == l_true););
TRACE("user_propagate", tout << "propagating: " << prop.m_conseq << "\n"); TRACE("user_propagate", tout << "propagating: " << prop.m_conseq << "\n");
@ -155,7 +155,7 @@ void user_propagator::propagate() {
m_qhead = qhead; m_qhead = qhead;
} }
void user_propagator::collect_statistics(::statistics & st) const { void theory_user_propagator::collect_statistics(::statistics & st) const {
st.update("user-propagations", m_stats.m_num_propagations); st.update("user-propagations", m_stats.m_num_propagations);
st.update("user-watched", get_num_vars()); st.update("user-watched", get_num_vars());
} }

36
src/smt/user_propagator.h
View file

@ -27,7 +27,7 @@ Notes:
#include "solver/solver.h" #include "solver/solver.h"
namespace smt { namespace smt {
class user_propagator : public theory, public solver::propagate_callback { class theory_user_propagator : public theory, public user_propagator::callback {
struct prop_info { struct prop_info {
unsigned_vector m_ids; unsigned_vector m_ids;
@ -49,14 +49,14 @@ namespace smt {
}; };
void* m_user_context = nullptr; void* m_user_context = nullptr;
solver::push_eh_t m_push_eh; user_propagator::push_eh_t m_push_eh;
solver::pop_eh_t m_pop_eh; user_propagator::pop_eh_t m_pop_eh;
solver::fresh_eh_t m_fresh_eh; user_propagator::fresh_eh_t m_fresh_eh;
solver::final_eh_t m_final_eh; user_propagator::final_eh_t m_final_eh;
solver::fixed_eh_t m_fixed_eh; user_propagator::fixed_eh_t m_fixed_eh;
solver::eq_eh_t m_eq_eh; user_propagator::eq_eh_t m_eq_eh;
solver::eq_eh_t m_diseq_eh; user_propagator::eq_eh_t m_diseq_eh;
solver::context_obj* m_api_context = nullptr; user_propagator::context_obj* m_api_context = nullptr;
unsigned m_qhead = 0; unsigned m_qhead = 0;
uint_set m_fixed; uint_set m_fixed;
vector<prop_info> m_prop; vector<prop_info> m_prop;
@ -70,18 +70,18 @@ namespace smt {
void force_push(); void force_push();
public: public:
user_propagator(context& ctx); theory_user_propagator(context& ctx);
~user_propagator() override; ~theory_user_propagator() override;
/* /*
* \brief initial setup for user propagator. * \brief initial setup for user propagator.
*/ */
void add( void add(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, user_propagator::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, user_propagator::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) { user_propagator::fresh_eh_t& fresh_eh) {
m_user_context = ctx; m_user_context = ctx;
m_push_eh = push_eh; m_push_eh = push_eh;
m_pop_eh = pop_eh; m_pop_eh = pop_eh;
@ -90,10 +90,10 @@ namespace smt {
unsigned add_expr(expr* e); unsigned add_expr(expr* e);
void register_final(solver::final_eh_t& final_eh) { m_final_eh = final_eh; } void register_final(user_propagator::final_eh_t& final_eh) { m_final_eh = final_eh; }
void register_fixed(solver::fixed_eh_t& fixed_eh) { m_fixed_eh = fixed_eh; } void register_fixed(user_propagator::fixed_eh_t& fixed_eh) { m_fixed_eh = fixed_eh; }
void register_eq(solver::eq_eh_t& eq_eh) { m_eq_eh = eq_eh; } void register_eq(user_propagator::eq_eh_t& eq_eh) { m_eq_eh = eq_eh; }
void register_diseq(solver::eq_eh_t& diseq_eh) { m_diseq_eh = diseq_eh; } void register_diseq(user_propagator::eq_eh_t& diseq_eh) { m_diseq_eh = diseq_eh; }
bool has_fixed() const { return (bool)m_fixed_eh; } bool has_fixed() const { return (bool)m_fixed_eh; }

49
src/solver/solver.h
View file

@ -18,6 +18,7 @@ Notes:
--*/ --*/
#pragma once #pragma once
#include "tactic/user_propagator_base.h"
#include "solver/check_sat_result.h" #include "solver/check_sat_result.h"
#include "solver/progress_callback.h" #include "solver/progress_callback.h"
#include "util/params.h" #include "util/params.h"
@ -47,7 +48,7 @@ solver* mk_smt2_solver(ast_manager& m, params_ref const& p);
- statistics - statistics
- results based on check_sat_result API - results based on check_sat_result API
*/ */
class solver : public check_sat_result { class solver : public check_sat_result, public user_propagator::base{
params_ref m_params; params_ref m_params;
symbol m_cancel_backup_file; symbol m_cancel_backup_file;
public: public:
@ -239,52 +240,6 @@ public:
virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) = 0; virtual expr_ref_vector cube(expr_ref_vector& vars, unsigned backtrack_level) = 0;
class propagate_callback {
public:
virtual ~propagate_callback() = default;
virtual void propagate_cb(unsigned num_fixed, unsigned const* fixed_ids, unsigned num_eqs, unsigned const* eq_lhs, unsigned const* eq_rhs, expr* conseq) = 0;
};
class context_obj {
public:
virtual ~context_obj() {}
};
typedef std::function<void(void*, solver::propagate_callback*)> final_eh_t;
typedef std::function<void(void*, solver::propagate_callback*, unsigned, expr*)> fixed_eh_t;
typedef std::function<void(void*, solver::propagate_callback*, unsigned, unsigned)> eq_eh_t;
typedef std::function<void*(void*, ast_manager&, solver::context_obj*&)> fresh_eh_t;
typedef std::function<void(void*)> push_eh_t;
typedef std::function<void(void*,unsigned)> pop_eh_t;
virtual void user_propagate_init(
void* ctx,
push_eh_t& push_eh,
pop_eh_t& pop_eh,
fresh_eh_t& fresh_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_fixed(fixed_eh_t& fixed_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_final(final_eh_t& final_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_eq(eq_eh_t& eq_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_diseq(eq_eh_t& diseq_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual unsigned user_propagate_register(expr* e) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
/** /**
\brief Display the content of this solver. \brief Display the content of this solver.
*/ */

61
src/tactic/user_propagator_base.h Normal file
View file

@ -0,0 +1,61 @@
#pragma once
#include "ast/ast.h"
namespace user_propagator {
class callback {
public:
virtual ~callback() = default;
virtual void propagate_cb(unsigned num_fixed, unsigned const* fixed_ids, unsigned num_eqs, unsigned const* eq_lhs, unsigned const* eq_rhs, expr* conseq) = 0;
};
class context_obj {
public:
virtual ~context_obj() {}
};
typedef std::function<void(void*, callback*)> final_eh_t;
typedef std::function<void(void*, callback*, unsigned, expr*)> fixed_eh_t;
typedef std::function<void(void*, callback*, unsigned, unsigned)> eq_eh_t;
typedef std::function<void*(void*, ast_manager&, context_obj*&)> fresh_eh_t;
typedef std::function<void(void*)> push_eh_t;
typedef std::function<void(void*,unsigned)> pop_eh_t;
class base {
public:
virtual void user_propagate_init(
void* ctx,
push_eh_t& push_eh,
pop_eh_t& pop_eh,
fresh_eh_t& fresh_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_fixed(fixed_eh_t& fixed_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_final(final_eh_t& final_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_eq(eq_eh_t& eq_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual void user_propagate_register_diseq(eq_eh_t& diseq_eh) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
virtual unsigned user_propagate_register(expr* e) {
throw default_exception("user-propagators are only supported on the SMT solver");
}
};
}