mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 21:33:39 +00:00
Code Activity

rewrite pb

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-22 17:47:46 -07:00
parent f9f0b2221d
commit 77b2a015a2
3 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ast/ast_pp_util.cpp
View file

@ -44,8 +44,11 @@ void ast_pp_util::display_decls(std::ostream& out) {
} }
n = coll.get_num_decls(); n = coll.get_num_decls();
for (unsigned i = 0; i < n; ++i) { for (unsigned i = 0; i < n; ++i) {
ast_smt2_pp(out, coll.get_func_decls()[i], env); func_decl* f = coll.get_func_decls()[i];
out << "\n"; if (f->get_family_id() == null_family_id) {
ast_smt2_pp(out, f, env);
out << "\n";
}
} }
} }

1
src/ast/rewriter/pb2bv_rewriter.cpp
View file

@ -504,6 +504,7 @@ struct pb2bv_rewriter::imp {
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
m_coeffs.push_back(pb.get_coeff(f, i)); m_coeffs.push_back(pb.get_coeff(f, i));
} }
CTRACE("pb", k.is_neg(), tout << expr_ref(m.mk_app(f, sz, args), m) << "\n";);
SASSERT(!k.is_neg()); SASSERT(!k.is_neg());
switch (kind) { switch (kind) {
case OP_PB_GE: case OP_PB_GE:

43
src/ast/rewriter/pb_rewriter.cpp
View file

@ -232,6 +232,7 @@ br_status pb_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * cons
} }
bool is_eq = f->get_decl_kind() == OP_PB_EQ; bool is_eq = f->get_decl_kind() == OP_PB_EQ;
br_status st = BR_DONE;
pb_ast_rewriter_util pbu(m); pb_ast_rewriter_util pbu(m);
pb_rewriter_util<pb_ast_rewriter_util> util(pbu); pb_rewriter_util<pb_ast_rewriter_util> util(pbu);
@ -249,11 +250,14 @@ br_status pb_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * cons
default: { default: {
bool all_unit = true; bool all_unit = true;
unsigned sz = vec.size(); unsigned sz = vec.size();
rational slack(0);
m_args.reset(); m_args.reset();
m_coeffs.reset(); m_coeffs.reset();
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
m_args.push_back(vec[i].first); m_args.push_back(vec[i].first);
m_coeffs.push_back(vec[i].second); m_coeffs.push_back(vec[i].second);
SASSERT(vec[i].second.is_pos());
slack += vec[i].second;
all_unit &= m_coeffs.back().is_one(); all_unit &= m_coeffs.back().is_one();
} }
if (is_eq) { if (is_eq) {
@ -271,7 +275,42 @@ br_status pb_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * cons
result = mk_and(m, sz, m_args.c_ptr()); result = mk_and(m, sz, m_args.c_ptr());
} }
else { else {
result = m_util.mk_ge(sz, m_coeffs.c_ptr(), m_args.c_ptr(), k); expr_ref_vector conj(m), disj(m);
for (unsigned i = 0; i < m_args.size(); ++i) {
rational& c = m_coeffs[i];
if (slack < c + k) {
conj.push_back(m_args[i]);
slack -= c;
k -= c;
}
else if (c >= k) {
slack -= c;
disj.push_back(m_args[i]);
}
else {
continue;
}
m_args[i] = m_args.back();
m_coeffs[i] = m_coeffs.back();
--i;
m_args.pop_back();
m_coeffs.pop_back();
}
sz = m_coeffs.size();
if (slack < k) {
conj.push_back(m.mk_false());
}
else if (k.is_pos() && sz > 0) {
conj.push_back(m_util.mk_ge(sz, m_coeffs.c_ptr(), m_args.c_ptr(), k));
}
result = mk_and(conj);
if (!disj.empty()) {
disj.push_back(result);
result = mk_or(disj);
}
if (!disj.empty() || conj.size() > 1) {
st = BR_REWRITE3;
}
} }
break; break;
} }
@ -286,7 +325,7 @@ br_status pb_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * cons
TRACE("pb_validate", TRACE("pb_validate",
validate_rewrite(f, num_args, args, result);); validate_rewrite(f, num_args, args, result););
return BR_DONE; return st;
} }