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

fix #2623

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-10-09 15:22:31 -07:00
parent 6b7c0ce334
commit 26c34c9193
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/api/api_solver.h
View file

@ -40,7 +40,8 @@ struct Z3_solver_ref : public api::object {
params_ref m_params;
symbol m_logic;
scoped_ptr<solver2smt2_pp> m_pp;
Z3_solver_ref(api::context& c, solver_factory * f): api::object(c), m_solver_factory(f), m_solver(nullptr), m_logic(symbol::null) {}
Z3_solver_ref(api::context& c, solver_factory * f):
api::object(c), m_solver_factory(f), m_solver(nullptr), m_logic(symbol::null) {}
~Z3_solver_ref() override {}
void assert_expr(expr* e);

17
src/smt/theory_arith_nl.h
View file

@ -1232,6 +1232,10 @@ namespace smt {
else if (ctx.e_internalized(m)) {
ADD_OCC(m);
}
else if (!ctx.e_internalized(m)) {
ctx.internalize(m, false);
ADD_OCC(m);
}
else {
TRACE("non_linear", tout << mk_pp(m, get_manager()) << "\n";);
UNREACHABLE();
@ -1484,14 +1488,15 @@ namespace smt {
r.push_back(coeff_expr(kv.first, f));
}
}
expr * s = cross_nested(e, nullptr);
if (!r.empty()) {
expr * q = horner(r, var);
// TODO: improve here
s = m_util.mk_add(q, s);
s = m_util.mk_add(q, s);
}
expr * result = s;
expr * result = s;
if (d != 0) {
expr * xd = power(var, d);
result = m_util.mk_mul(xd, s);
@ -1694,11 +1699,9 @@ namespace smt {
TRACE("non_linear", tout << "check problematic row:\n"; display_row(tout, r); display_row(tout, r, false););
sbuffer<coeff_expr> p;
typename vector<row_entry>::const_iterator it = r.begin_entries();
typename vector<row_entry>::const_iterator end = r.end_entries();
for (; it != end; ++it) {
if (!it->is_dead())
p.push_back(coeff_expr(it->m_coeff.to_rational() * c, var2expr(it->m_var)));
for (row_entry const& re : r) {
if (!re.is_dead())
p.push_back(coeff_expr(re.m_coeff.to_rational() * c, var2expr(re.m_var)));
}
SASSERT(!p.empty());
CTRACE("cross_nested_bug", !c.is_one(), tout << "c: " << c << "\n"; display_row(tout, r); tout << "---> p (coeffs, exprs):\n"; display_coeff_exprs(tout, p););

1
src/util/cancel_eh.h
View file

@ -39,6 +39,7 @@ public:
}
}
bool canceled() const { return m_canceled; }
void reset() { m_canceled = false; }
};
#endif