mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-13 09:26:15 +00:00
Code Activity

tweaking card2bv conversion

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-09-07 18:30:45 -07:00
parent d9c61464d0
commit f7e1ad5277
2 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/tactic/arith/card2bv_tactic.cpp
View file

@ -59,6 +59,14 @@ namespace pb {
return BR_DONE; return BR_DONE;
} }
else if (f->get_family_id() == pb.get_family_id()) { else if (f->get_family_id() == pb.get_family_id()) {
if (is_or(f)) {
result = m.mk_or(sz, args);
return BR_DONE;
}
if (is_and(f)) {
result = m.mk_and(sz, args);
return BR_DONE;
}
br_status st = mk_shannon(f, sz, args, result); br_status st = mk_shannon(f, sz, args, result);
if (st == BR_FAILED) { if (st == BR_FAILED) {
return mk_bv(f, sz, args, result); return mk_bv(f, sz, args, result);
@ -95,7 +103,7 @@ namespace pb {
if (au.is_int(args[i]) && au.is_numeral(args[i], val1)) if (au.is_int(args[i]) && au.is_numeral(args[i], val1))
q = bv.mk_numeral(val1, bits); q = bv.mk_numeral(val1, bits);
else else
q = m.mk_ite(to_app(args[i])->get_arg(0), bv.mk_numeral(1, bits), bv.mk_numeral(0, bits)); q = mk_ite(to_app(args[i])->get_arg(0), bv.mk_numeral(1, bits), bv.mk_numeral(0, bits));
result = (i == 0) ? q : bv.mk_bv_add(result.get(), q); result = (i == 0) ? q : bv.mk_bv_add(result.get(), q);
} }
return BR_DONE; return BR_DONE;
@ -107,14 +115,33 @@ namespace pb {
return BR_FAILED; return BR_FAILED;
} }
bool card2bv_rewriter::is_or(func_decl* f) {
switch (f->get_decl_kind()) {
case OP_AT_MOST_K:
case OP_PB_LE:
return false;
case OP_AT_LEAST_K:
case OP_PB_GE:
return pb.get_k(f).is_one();
case OP_PB_EQ:
return false;
default:
UNREACHABLE();
return false;
}
}
bool card2bv_rewriter::is_and(func_decl* f) {
return false;
}
br_status card2bv_rewriter::mk_bv(func_decl * f, unsigned sz, expr * const* args, expr_ref & result) { br_status card2bv_rewriter::mk_bv(func_decl * f, unsigned sz, expr * const* args, expr_ref & result) {
expr_ref zero(m), a(m), b(m); expr_ref zero(m), a(m), b(m);
expr_ref_vector es(m); expr_ref_vector es(m);
unsigned bw = get_num_bits(f); unsigned bw = get_num_bits(f);
zero = bv.mk_numeral(rational(0), bw); zero = bv.mk_numeral(rational(0), bw);
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
es.push_back(m.mk_ite(args[i], bv.mk_numeral(pb.get_coeff(f, i), bw), zero)); es.push_back(mk_ite(args[i], bv.mk_numeral(pb.get_coeff(f, i), bw), zero));
} }
switch (es.size()) { switch (es.size()) {
case 0: a = zero; break; case 0: a = zero; break;
@ -182,9 +209,6 @@ namespace pb {
br_status card2bv_rewriter::mk_shannon( br_status card2bv_rewriter::mk_shannon(
func_decl * f, unsigned sz, expr * const* args, expr_ref & result) { func_decl * f, unsigned sz, expr * const* args, expr_ref & result) {
return BR_FAILED;
// disabled for now.
unsigned max_clauses = sz*10; unsigned max_clauses = sz*10;
vector<argc_t> argcs; vector<argc_t> argcs;
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
@ -316,6 +340,9 @@ namespace pb {
} }
expr* card2bv_rewriter::mk_ite(expr* c, expr* hi, expr* lo) { expr* card2bv_rewriter::mk_ite(expr* c, expr* hi, expr* lo) {
while (m.is_not(c, c)) {
std::swap(hi, lo);
}
if (hi == lo) return hi; if (hi == lo) return hi;
if (m.is_true(hi) && m.is_false(lo)) return c; if (m.is_true(hi) && m.is_false(lo)) return c;
if (m.is_false(hi) && m.is_true(lo)) return negate(c); if (m.is_false(hi) && m.is_true(lo)) return negate(c);

3
src/tactic/arith/card2bv_tactic.h
View file

@ -39,6 +39,9 @@ namespace pb {
br_status mk_shannon(func_decl * f, unsigned sz, expr * const* args, expr_ref & result); br_status mk_shannon(func_decl * f, unsigned sz, expr * const* args, expr_ref & result);
expr* negate(expr* e); expr* negate(expr* e);
expr* mk_ite(expr* c, expr* hi, expr* lo); expr* mk_ite(expr* c, expr* hi, expr* lo);
bool is_or(func_decl* f);
bool is_and(func_decl* f);
public: public:
card2bv_rewriter(ast_manager& m); card2bv_rewriter(ast_manager& m);
br_status mk_app_core(func_decl * f, unsigned sz, expr * const* args, expr_ref & result); br_status mk_app_core(func_decl * f, unsigned sz, expr * const* args, expr_ref & result);