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

fix and enable learning

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2013-11-19 20:47:16 -08:00
parent 696db3a6a4
commit 33895d522b
6 changed files with 91 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/ast/pb_decl_plugin.cpp
View file

@ -21,7 +21,8 @@ Revision History:
pb_decl_plugin::pb_decl_plugin():
m_at_most_sym("at-most"),
m_pble_sym("pble")
m_pble_sym("pble"),
m_pbge_sym("pbge")
{}
func_decl * pb_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, parameter const * parameters,
@ -53,6 +54,18 @@ func_decl * pb_decl_plugin::mk_func_decl(decl_kind k, unsigned num_parameters, p
func_decl_info info(m_family_id, OP_PB_LE, num_parameters, parameters);
return m.mk_func_decl(m_pble_sym, arity, domain, m.mk_bool_sort(), info);
}
case OP_PB_GE: {
if (num_parameters != 1 + arity || !parameters[0].is_int()) {
m.raise_exception("function 'pbge' expects arity+1 integer parameters");
}
for (unsigned i = 1; i < num_parameters; ++i) {
if (!parameters[i].is_int()) {
m.raise_exception("function 'pbge' expects arity+1 integer parameters");
}
}
func_decl_info info(m_family_id, OP_PB_GE, num_parameters, parameters);
return m.mk_func_decl(m_pbge_sym, arity, domain, m.mk_bool_sort(), info);
}
default:
UNREACHABLE();
return 0;
@ -63,15 +76,10 @@ void pb_decl_plugin::get_op_names(svector<builtin_name> & op_names, symbol const
if (logic == symbol::null) {
op_names.push_back(builtin_name(m_at_most_sym.bare_str(), OP_AT_MOST_K));
op_names.push_back(builtin_name(m_pble_sym.bare_str(), OP_PB_LE));
op_names.push_back(builtin_name(m_pbge_sym.bare_str(), OP_PB_GE));
}
}
app * pb_util::mk_at_most_k(unsigned num_args, expr * const * args, unsigned k) {
parameter param(k);
return m.mk_app(m_fid, OP_AT_MOST_K, 1, &param, num_args, args, m.mk_bool_sort());
}
app * pb_util::mk_le(unsigned num_args, int const * coeffs, expr * const * args, int k) {
vector<parameter> params;
params.push_back(parameter(k));
@ -81,6 +89,23 @@ app * pb_util::mk_le(unsigned num_args, int const * coeffs, expr * const * args,
return m.mk_app(m_fid, OP_PB_LE, params.size(), params.c_ptr(), num_args, args, m.mk_bool_sort());
}
app * pb_util::mk_ge(unsigned num_args, int const * coeffs, expr * const * args, int k) {
vector<parameter> params;
params.push_back(parameter(k));
for (unsigned i = 0; i < num_args; ++i) {
params.push_back(parameter(coeffs[i]));
}
return m.mk_app(m_fid, OP_PB_GE, params.size(), params.c_ptr(), num_args, args, m.mk_bool_sort());
}
app * pb_util::mk_at_most_k(unsigned num_args, expr * const * args, unsigned k) {
parameter param(k);
return m.mk_app(m_fid, OP_AT_MOST_K, 1, &param, num_args, args, m.mk_bool_sort());
}
bool pb_util::is_at_most_k(app *a) const {
return is_app_of(a, m_fid, OP_AT_MOST_K);
@ -97,7 +122,7 @@ bool pb_util::is_at_most_k(app *a, unsigned& k) const {
}
int pb_util::get_k(app *a) const {
SASSERT(is_at_most_k(a) || is_le(a));
SASSERT(is_at_most_k(a) || is_le(a) || is_ge(a));
return a->get_decl()->get_parameter(0).get_int();
}
@ -116,11 +141,25 @@ bool pb_util::is_le(app* a, int& k) const {
}
}
int pb_util::get_le_coeff(app* a, unsigned index) {
bool pb_util::is_ge(app *a) const {
return is_app_of(a, m_fid, OP_PB_GE);
}
bool pb_util::is_ge(app* a, int& k) const {
if (is_ge(a)) {
k = get_k(a);
return true;
}
else {
return false;
}
}
int pb_util::get_coeff(app* a, unsigned index) {
if (is_at_most_k(a)) {
return 1;
}
SASSERT(is_le(a));
SASSERT(is_le(a) || is_ge(a));
SASSERT(1 + index < a->get_decl()->get_num_parameters());
return a->get_decl()->get_parameter(index + 1).get_int();
}

10
src/ast/pb_decl_plugin.h
View file

@ -32,6 +32,7 @@ hence:
enum pb_op_kind {
OP_AT_MOST_K, // at most K Booleans are true.
OP_PB_LE, // pseudo-Boolean <= (generalizes at_most_k)
OP_PB_GE, // pseudo-Boolean >=
LAST_PB_OP
};
@ -39,8 +40,10 @@ enum pb_op_kind {
class pb_decl_plugin : public decl_plugin {
symbol m_at_most_sym;
symbol m_pble_sym;
symbol m_pbge_sym;
func_decl * mk_at_most(unsigned arity, unsigned k);
func_decl * mk_le(unsigned arity, int const* coeffs, int k);
func_decl * mk_ge(unsigned arity, int const* coeffs, int k);
public:
pb_decl_plugin();
virtual ~pb_decl_plugin() {}
@ -74,14 +77,19 @@ public:
family_id get_family_id() const { return m_fid; }
app * mk_at_most_k(unsigned num_args, expr * const * args, unsigned k);
app * mk_le(unsigned num_args, int const * coeffs, expr * const * args, int k);
app * mk_ge(unsigned num_args, int const * coeffs, expr * const * args, int k);
bool is_at_most_k(app *a) const;
bool is_at_most_k(app *a, unsigned& k) const;
int get_k(app *a) const;
bool is_le(app *a) const;
bool is_le(app* a, int& k) const;
int get_le_coeff(app* a, unsigned index);
bool is_ge(app* a) const;
bool is_ge(app* a, int& k) const;
int get_coeff(app* a, unsigned index);
};
#endif /* _PB_DECL_PLUGIN_H_ */