3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 04:48:45 +00:00

fix bug in translation of pbeq into sat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-02-03 22:19:25 -08:00
parent badb32f9ae
commit 354c16454a
5 changed files with 10 additions and 7 deletions

View file

@ -162,6 +162,9 @@ app * pb_util::mk_eq(unsigned num_args, rational const * coeffs, expr * const *
if (!m_k.is_int()) {
return m.mk_false();
}
if (num_args == 0) {
return m_k.is_zero() ? m.mk_true() : m.mk_false();
}
m_params.reset();
m_params.push_back(parameter(m_k));
for (unsigned i = 0; i < num_args; ++i) {

View file

@ -94,12 +94,7 @@ struct pb2bv_rewriter::imp {
for (unsigned i = 0; i < m_args.size(); ++i) {
cas.push_back(std::make_pair(m_coeffs[i], expr_ref(m_args[i].get(), m)));
}
//for (ca const& ca : cas) std::cout << ca.first << " ";
//std::cout << "\n";
std::sort(cas.begin(), cas.end(), compare_coeffs());
//std::cout << "post-sort\n";
//for (ca const& ca : cas) std::cout << ca.first << " ";
//std::cout << "\n";
m_coeffs.reset();
m_args.reset();
for (ca const& ca : cas) {

View file

@ -329,7 +329,7 @@ br_status pb_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * cons
tout << tmp << "\n";
tout << result << "\n";
);
TRACE("pb_validate",
validate_rewrite(f, num_args, args, result););

View file

@ -110,6 +110,8 @@ public:
virtual void set_next_arg(cmd_context & ctx, unsigned index) { m_index = index; }
virtual void execute(cmd_context & ctx) {
model_ref m;
if (ctx.ignore_check())
return;
if (!ctx.is_model_available(m) || ctx.get_check_sat_result() == 0)
throw cmd_exception("model is not available");
if (m_index > 0 && ctx.get_opt()) {

View file

@ -571,6 +571,8 @@ struct goal2sat::imp {
l.neg();
}
m_ext->add_at_least(v2, lits, lits.size() - k.get_unsigned());
if (root) {
m_result_stack.reset();
}
@ -582,7 +584,8 @@ struct goal2sat::imp {
mk_clause(~l, l2);
mk_clause(~l1, ~l2, l);
m_result_stack.shrink(m_result_stack.size() - t->get_num_args());
m_result_stack.push_back(l);
m_result_stack.push_back(sign ? ~l : l);
}
}