mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-08-21 12:14:28 -07:00
parent 22b5daf85e
commit 080be7a2af
13 changed files with 59 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/smt/smt_context.cpp
View file

@ -2951,7 +2951,7 @@ namespace smt {
void context::user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) {

9
src/smt/smt_context.h
View file

@ -1689,7 +1689,7 @@ namespace smt {
*/
void user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh);
@ -1700,13 +1700,6 @@ namespace smt {
return m_user_propagator->add_expr(e);
}
void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) {
if (!m_user_propagator)
throw default_exception("user propagator must be initialized");
m_user_propagator->add_propagation(sz, ids, conseq);
}
bool watches_fixed(enode* n) const;
void assign_fixed(enode* n, expr* val, unsigned sz, literal const* explain);

15
src/smt/smt_kernel.cpp
View file

@ -235,7 +235,7 @@ namespace smt {
void user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) {
@ -246,9 +246,6 @@ namespace smt {
return m_kernel.user_propagate_register(e);
}
void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) {
m_kernel.user_propagate_consequence(sz, ids, conseq);
}
};
kernel::kernel(ast_manager & m, smt_params & fp, params_ref const & p) {
@ -463,7 +460,7 @@ namespace smt {
void kernel::user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) {
@ -472,12 +469,6 @@ namespace smt {
unsigned kernel::user_propagate_register(expr* e) {
return m_imp->user_propagate_register(e);
}
void kernel::user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) {
m_imp->user_propagate_consequence(sz, ids, conseq);
}
}
};

14
src/smt/smt_kernel.h
View file

@ -26,11 +26,12 @@ Revision History:
--*/
#pragma once
#include "ast/ast.h"
#include "util/params.h"
#include "model/model.h"
#include "util/lbool.h"
#include "util/statistics.h"
#include "ast/ast.h"
#include "model/model.h"
#include "solver/solver.h"
#include "smt/smt_failure.h"
struct smt_params;
@ -289,7 +290,7 @@ namespace smt {
*/
void user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh);
@ -298,13 +299,6 @@ namespace smt {
\brief register an expression to be tracked fro user propagation.
*/
unsigned user_propagate_register(expr* e);
/**
\brief accept a user-propagation callback (issued during fixed_he).
*/
void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq);
/**

6
src/smt/smt_solver.cpp
View file

@ -210,7 +210,7 @@ namespace {
void user_propagate_init(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) override {
@ -221,10 +221,6 @@ namespace {
return m_context.user_propagate_register(e);
}
void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) override {
m_context.user_propagate_consequence(sz, ids, conseq);
}
struct scoped_minimize_core {
smt_solver& s;
expr_ref_vector m_assumptions;

4
src/smt/user_propagator.cpp
View file

@ -49,7 +49,7 @@ unsigned user_propagator::add_expr(expr* e) {
return v;
}
void user_propagator::add_propagation(unsigned sz, unsigned const* ids, expr* conseq) {
void user_propagator::propagate(unsigned sz, unsigned const* ids, expr* conseq) {
m_prop.push_back(prop_info(sz, ids, expr_ref(conseq, m)));
}
@ -63,7 +63,7 @@ theory * user_propagator::mk_fresh(context * new_ctx) {
void user_propagator::new_fixed_eh(theory_var v, expr* value, unsigned num_lits, literal const* jlits) {
force_push();
m_id2justification.setx(v, literal_vector(num_lits, jlits), literal_vector());
m_fixed_eh(m_user_context, v, value);
m_fixed_eh(m_user_context, this, v, value);
}
void user_propagator::push_scope_eh() {

9
src/smt/user_propagator.h
View file

@ -25,11 +25,12 @@ Notes:
#pragma once
#include "smt/smt_theory.h"
#include "solver/solver.h"
namespace smt {
class user_propagator : public theory {
class user_propagator : public theory, public solver::propagate_callback {
void* m_user_context;
std::function<void(void*, unsigned, expr*)> m_fixed_eh;
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)> m_fixed_eh;
std::function<void(void*)> m_push_eh;
std::function<void(void*, unsigned)> m_pop_eh;
std::function<void*(void*)> m_fresh_eh;
@ -60,7 +61,7 @@ namespace smt {
*/
void add(
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*, solver::propagate_callback*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) {
@ -73,7 +74,7 @@ namespace smt {
unsigned add_expr(expr* e);
void add_propagation(unsigned sz, unsigned const* ids, expr* conseq);
void propagate(unsigned sz, unsigned const* ids, expr* conseq) override;
void new_fixed_eh(theory_var v, expr* value, unsigned num_lits, literal const* jlits);