mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-03 21:09:11 +00:00
Code Activity

fix #2585

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-09-25 18:57:45 -07:00
parent 2a1f05e7e8
commit 3dcfbb8347
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -478,7 +478,7 @@ br_status arith_rewriter::mk_le_ge_eq_core(expr * arg1, expr * arg2, op_kind kin
return BR_REWRITE_FULL; return BR_REWRITE_FULL;
case EQ: case EQ:
result = m().mk_ite(is_zero, m().mk_eq(div0, arg2), m().mk_eq(e1, mul2)); result = m().mk_ite(is_zero, m().mk_eq(div0, arg2), m().mk_eq(e1, mul2));
return BR_REWRITE2; return BR_REWRITE_FULL;
} }
} }
if ((m_arith_lhs || m_arith_ineq_lhs) && is_numeral(arg2, a2) && is_neg_poly(arg1, new_arg1)) { if ((m_arith_lhs || m_arith_ineq_lhs) && is_numeral(arg2, a2) && is_neg_poly(arg1, new_arg1)) {

8
src/smt/theory_arith_nl.h
View file

@ -811,15 +811,13 @@ namespace smt {
bool theory_arith<Ext>::is_monomial_linear(expr * m) const { bool theory_arith<Ext>::is_monomial_linear(expr * m) const {
SASSERT(is_pure_monomial(m)); SASSERT(is_pure_monomial(m));
unsigned num_nl_vars = 0; unsigned num_nl_vars = 0;
for (unsigned i = 0; i < to_app(m)->get_num_args(); i++) { for (expr* arg : *to_app(m)) {
expr * arg = to_app(m)->get_arg(i);
theory_var _var = expr2var(arg); theory_var _var = expr2var(arg);
if (!is_fixed(_var)) { if (!is_fixed(_var)) {
num_nl_vars++; num_nl_vars++;
} }
else { else if (lower_bound(_var).is_zero()) {
if (lower_bound(_var).is_zero()) return true;
return true;
} }
} }
return num_nl_vars <= 1; return num_nl_vars <= 1;