mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

another fix for #1101

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-23 11:34:10 -07:00
parent 77ffa9f32f
commit cd4bb5beaf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/smt/theory_lra.cpp
View file

@ -2386,16 +2386,16 @@ namespace smt {
app_ref mk_obj(theory_var v) { app_ref mk_obj(theory_var v) {
lean::var_index vi = m_theory_var2var_index[v]; lean::var_index vi = m_theory_var2var_index[v];
bool is_int = a.is_int(get_enode(v)->get_owner());
if (m_solver->is_term(vi)) { if (m_solver->is_term(vi)) {
expr_ref_vector args(m); expr_ref_vector args(m);
const lean::lar_term& term = m_solver->get_term(vi); const lean::lar_term& term = m_solver->get_term(vi);
for (auto & ti : term.m_coeffs) { for (auto & ti : term.m_coeffs) {
theory_var w = m_var_index2theory_var[ti.first]; theory_var w = m_var_index2theory_var[ti.first];
expr* o = get_enode(w)->get_owner(); expr* o = get_enode(w)->get_owner();
args.push_back(a.mk_mul(a.mk_numeral(ti.second, a.is_int(o)), o)); args.push_back(a.mk_mul(a.mk_numeral(ti.second, is_int), o));
} }
rational r = term.m_v; args.push_back(a.mk_numeral(term.m_v, is_int));
args.push_back(a.mk_numeral(r, r.is_int()));
return app_ref(a.mk_add(args.size(), args.c_ptr()), m); return app_ref(a.mk_add(args.size(), args.c_ptr()), m);
} }
else { else {
@ -2408,11 +2408,12 @@ namespace smt {
rational r = val.get_rational(); rational r = val.get_rational();
bool is_strict = val.get_infinitesimal().is_pos(); bool is_strict = val.get_infinitesimal().is_pos();
app_ref b(m); app_ref b(m);
bool is_int = a.is_int(get_enode(v)->get_owner());
if (is_strict) { if (is_strict) {
b = a.mk_le(mk_obj(v), a.mk_numeral(r, r.is_int())); b = a.mk_le(mk_obj(v), a.mk_numeral(r, is_int));
} }
else { else {
b = a.mk_ge(mk_obj(v), a.mk_numeral(r, r.is_int())); b = a.mk_ge(mk_obj(v), a.mk_numeral(r, is_int));
} }
if (!ctx().b_internalized(b)) { if (!ctx().b_internalized(b)) {
fm.insert(b->get_decl()); fm.insert(b->get_decl());