mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

Bugfix for FP UFs.

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2015-10-08 12:45:26 +01:00
parent a2503af585
commit c787ea1a3b
2 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ast/fpa/fpa2bv_converter.h
View file

@ -68,7 +68,7 @@ public:
bool is_float(sort * s) { return m_util.is_float(s); } bool is_float(sort * s) { return m_util.is_float(s); }
bool is_float(expr * e) { return is_app(e) && m_util.is_float(to_app(e)->get_decl()->get_range()); } bool is_float(expr * e) { return is_app(e) && m_util.is_float(to_app(e)->get_decl()->get_range()); }
bool is_rm(expr * e) { return m_util.is_rm(e); } bool is_rm(expr * e) { return is_app(e) && m_util.is_rm(e); }
bool is_rm(sort * s) { return m_util.is_rm(s); } bool is_rm(sort * s) { return m_util.is_rm(s); }
bool is_float_family(func_decl * f) { return f->get_family_id() == m_util.get_family_id(); } bool is_float_family(func_decl * f) { return f->get_family_id() == m_util.get_family_id(); }

45
src/ast/fpa/fpa2bv_rewriter.h
View file

@ -79,16 +79,29 @@ struct fpa2bv_rewriter_cfg : public default_rewriter_cfg {
br_status reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) { br_status reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) {
TRACE("fpa2bv_rw", tout << "APP: " << f->get_name() << std::endl; ); TRACE("fpa2bv_rw", tout << "APP: " << f->get_name() << std::endl; );
if (num == 0 && f->get_family_id() == null_family_id && m_conv.is_float(f->get_range())) { if (f->get_family_id() == null_family_id) {
m_conv.mk_const(f, result); if (num == 0) {
return BR_DONE; if (m_conv.is_float(f->get_range()))
m_conv.mk_const(f, result);
else if (m_conv.is_rm(f->get_range()))
m_conv.mk_rm_const(f, result);
return BR_DONE;
}
else {
bool is_float_uf = m_conv.is_float(f->get_range()) || m_conv.is_rm(f->get_range());
for (unsigned i = 0; i < f->get_arity(); i++) {
sort * di = f->get_domain()[i];
is_float_uf |= m_conv.is_float(di) || m_conv.is_rm(di);
}
if (is_float_uf)
m_conv.mk_uninterpreted_function(f, num, args, result);
return BR_DONE;
}
} }
if (num == 0 && f->get_family_id() == null_family_id && m_conv.is_rm(f->get_range())) {
m_conv.mk_rm_const(f, result);
return BR_DONE;
}
if (m().is_eq(f)) { if (m().is_eq(f)) {
SASSERT(num == 2); SASSERT(num == 2);
TRACE("fpa2bv_rw", tout << "(= " << mk_ismt2_pp(args[0], m()) << " " << TRACE("fpa2bv_rw", tout << "(= " << mk_ismt2_pp(args[0], m()) << " " <<
@ -180,20 +193,6 @@ struct fpa2bv_rewriter_cfg : public default_rewriter_cfg {
} }
} }
if (f->get_family_id() != 0 && f->get_family_id() != m_conv.fu().get_family_id())
{
bool is_float_uf = m_conv.is_float(f->get_range()) || m_conv.is_rm(f->get_range());
for (unsigned i = 0; i < num; i++)
is_float_uf |= m_conv.is_float(args[i]) || m_conv.is_rm(args[i]);
if (is_float_uf)
{
m_conv.mk_uninterpreted_function(f, num, args, result);
return BR_DONE;
}
}
return BR_FAILED; return BR_FAILED;
} }