mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

address ubuntu warning and add shortcuts for maxsat

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-10-03 16:22:13 -07:00
parent 186afe7d10
commit e3f0aff318
6 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,9 @@ namespace pb {
result = m.mk_and(sz, args);
return BR_DONE;
}
if (is_atmost1(f, sz, args, result)) {
return BR_DONE;
}
br_status st = mk_shannon(f, sz, args, result);
if (st == BR_FAILED) {
mk_bv(f, sz, args, result);
@ -165,6 +168,43 @@ namespace pb {
return BR_FAILED;
}
expr_ref card2bv_rewriter::mk_atmost1(unsigned sz, expr * const* args) {
expr_ref f1(m), f2(m), f3(m), result(m);
f1 = bv.mk_bv(sz, args);
f2 = bv.mk_bv_sub(f1, bv.mk_numeral(rational(1), sz));
f3 = m.mk_app(bv.get_fid(), OP_BAND, f1, f2);
result = m.mk_eq(f3, bv.mk_numeral(rational(0), sz));
return result;
}
bool card2bv_rewriter::is_atmost1(func_decl* f, unsigned sz, expr * const* args, expr_ref& result) {
switch (f->get_decl_kind()) {
case OP_AT_MOST_K:
case OP_PB_LE:
if (pb.get_k(f).is_one() && pb.has_unit_coefficients(f)) {
result = mk_atmost1(sz, args);
return true;
}
return false;
case OP_AT_LEAST_K:
case OP_PB_GE:
if (pb.get_k(f) == rational(sz-1) && pb.has_unit_coefficients(f)) {
expr_ref_vector nargs(m);
for (unsigned i = 0; i < sz; ++i) {
nargs.push_back(mk_not(args[i]));
}
result = mk_atmost1(nargs.size(), nargs.c_ptr());
return true;
}
return false;
case OP_PB_EQ:
return false;
default:
UNREACHABLE();
return false;
}
}
bool card2bv_rewriter::is_or(func_decl* f) {
switch (f->get_decl_kind()) {
case OP_AT_MOST_K:

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

@ -52,6 +52,8 @@ namespace pb {
expr* mk_ite(expr* c, expr* hi, expr* lo);
bool is_or(func_decl* f);
bool is_and(func_decl* f);
bool is_atmost1(func_decl* f, unsigned sz, expr * const* args, expr_ref& result);
expr_ref mk_atmost1(unsigned sz, expr * const* args);
public:
card2bv_rewriter(ast_manager& m);

1
src/tactic/bv/bv_bound_chk_tactic.cpp
View file

@ -71,7 +71,6 @@ struct bv_bound_chk_rewriter_cfg : public default_rewriter_cfg {
result_pr = 0;
const family_id fid = f->get_family_id();
if (fid != m_b_rw.get_fid()) return BR_FAILED;
const decl_kind k = f->get_decl_kind();
bv_bounds bvb(m());
const br_status rv = bvb.rewrite(m_bv_ineq_consistency_test_max, f, num, args, result);
if (rv != BR_FAILED && (m_m.is_false(result) || m_m.is_true(result))) m_stats.m_unsats++;