mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

fix #2590

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-09-27 08:36:10 -07:00
parent f29b033253
commit 292e72ce0c
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ast/rewriter/arith_rewriter.cpp
View file

@ -86,7 +86,7 @@ br_status arith_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * c
case OP_TANH: SASSERT(num_args == 1); st = mk_tanh_core(args[0], result); break; case OP_TANH: SASSERT(num_args == 1); st = mk_tanh_core(args[0], result); break;
default: st = BR_FAILED; break; default: st = BR_FAILED; break;
} }
CTRACE("arith_rewriter", st != BR_FAILED, tout << mk_pp(f, m()); CTRACE("arith_rewriter", st != BR_FAILED, tout << st << ": " << mk_pp(f, m());
for (unsigned i = 0; i < num_args; ++i) tout << mk_pp(args[i], m()) << " "; for (unsigned i = 0; i < num_args; ++i) tout << mk_pp(args[i], m()) << " ";
tout << "\n==>\n" << mk_pp(result.get(), m()) << "\n";); tout << "\n==>\n" << mk_pp(result.get(), m()) << "\n";);
return st; return st;

12
src/ast/rewriter/poly_rewriter_def.h
View file

@ -289,6 +289,18 @@ br_status poly_rewriter<Config>::mk_nflat_mul_core(unsigned num_args, expr * con
} }
} }
if (num_coeffs > 1 || (num_coeffs == 1 && !is_numeral(args[0]))) {
ptr_buffer<expr> m_args;
for (unsigned i = 0; i < num_args; i ++) {
if (!is_numeral(args[i])) {
m_args.push_back(args[i]);
}
}
result = mk_mul_app(c, mk_mul_app(m_args.size(), m_args.c_ptr()));
return BR_REWRITE2;
}
SASSERT(num_coeffs <= num_args - 2); SASSERT(num_coeffs <= num_args - 2);
if (!m_som || num_add == 0) { if (!m_som || num_add == 0) {

9
src/smt/theory_arith_nl.h
View file

@ -1217,10 +1217,8 @@ namespace smt {
m_var2num_occs.insert(VAR, occs); \ m_var2num_occs.insert(VAR, occs); \
} }
typename sbuffer<coeff_expr>::const_iterator it = p.begin(); for (coeff_expr const& kv : p) {
typename sbuffer<coeff_expr>::const_iterator end = p.end(); expr * m = kv.second;
for (; it != end; ++it) {
expr * m = it->second;
if (is_pure_monomial(m)) { if (is_pure_monomial(m)) {
unsigned num_vars = get_num_vars_in_monomial(m); unsigned num_vars = get_num_vars_in_monomial(m);
for (unsigned i = 0; i < num_vars; i++) { for (unsigned i = 0; i < num_vars; i++) {
@ -1237,6 +1235,7 @@ namespace smt {
else { else {
TRACE("non_linear", tout << mk_pp(m, get_manager()) << "\n";); TRACE("non_linear", tout << mk_pp(m, get_manager()) << "\n";);
UNREACHABLE(); UNREACHABLE();
return;
} }
} }
@ -1253,7 +1252,6 @@ namespace smt {
template<typename Ext> template<typename Ext>
expr * theory_arith<Ext>::p2expr(sbuffer<coeff_expr> & p) { expr * theory_arith<Ext>::p2expr(sbuffer<coeff_expr> & p) {
SASSERT(!p.empty()); SASSERT(!p.empty());
TRACE("p2expr_bug", display_coeff_exprs(tout, p););
ptr_buffer<expr> args; ptr_buffer<expr> args;
for (coeff_expr const& ce : p) { for (coeff_expr const& ce : p) {
rational const & c = ce.first; rational const & c = ce.first;
@ -1275,6 +1273,7 @@ namespace smt {
SASSERT(!args.empty()); SASSERT(!args.empty());
expr * r = mk_nary_add(args.size(), args.c_ptr()); expr * r = mk_nary_add(args.size(), args.c_ptr());
m_nl_new_exprs.push_back(r); m_nl_new_exprs.push_back(r);
TRACE("p2expr_bug", display_coeff_exprs(tout, p); tout << mk_pp(r, get_manager()) << "\n";);
return r; return r;
} }