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

debugging real/int interaction

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2012-10-10 19:07:06 -07:00
parent 2b0e1f7c2b
commit 56b977b418
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pdr_farkas_learner.cpp
View file

@ -60,6 +60,11 @@ namespace pdr {
return a.mk_add(e1, e2); return a.mk_add(e1, e2);
} }
app* mk_mul(expr* e1, expr* e2) {
mk_coerce(e1, e2);
return a.mk_mul(e1, e2);
}
app* mk_le(expr* e1, expr* e2) { app* mk_le(expr* e1, expr* e2) {
mk_coerce(e1, e2); mk_coerce(e1, e2);
return a.mk_le(e1, e2); return a.mk_le(e1, e2);
@ -86,7 +91,7 @@ namespace pdr {
tmp = e; tmp = e;
} }
else { else {
tmp = a.mk_mul(a.mk_numeral(c, a.is_int(e)), e); tmp = mk_mul(a.mk_numeral(c, c.is_int() && a.is_int(e)), e);
} }
res = mk_add(res, tmp); res = mk_add(res, tmp);
} }

4
lib/theory_arith_core.h
View file

@ -479,8 +479,8 @@ namespace smt {
return; return;
} }
expr* to_r = m_util.mk_to_real(n); expr* to_r = m_util.mk_to_real(n);
expr* lo = m_util.mk_le(to_r, x); expr_ref lo(m_util.mk_le(to_r, x), m);
expr* hi = m_util.mk_lt(x, m_util.mk_add(to_r, m_util.mk_numeral(rational(1), false))); expr_ref hi(m_util.mk_lt(x, m_util.mk_add(to_r, m_util.mk_numeral(rational(1), false))), m);
mk_axiom(m.mk_false(), lo); mk_axiom(m.mk_false(), lo);
mk_axiom(m.mk_false(), hi); mk_axiom(m.mk_false(), hi);
} }