mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 05:13:39 +00:00
Code Activity

revert mixed integer/real handling pending fix to equality propagation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-01-12 12:11:27 -08:00
parent f8971362c8
commit e2d54940b4
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/model/func_interp.cpp
View file

@ -169,6 +169,7 @@ void func_interp::insert_new_entry(expr * const * args, expr * r) {
for (unsigned i = 0; i < m_arity; i++) { for (unsigned i = 0; i < m_arity; i++) {
tout << mk_ismt2_pp(args[i], m_manager) << "\n"; tout << mk_ismt2_pp(args[i], m_manager) << "\n";
} }
tout << "Old: " << mk_ismt2_pp(get_entry(args)->get_result(), m_manager) << "\n";
); );
SASSERT(get_entry(args) == 0); SASSERT(get_entry(args) == 0);
func_entry * new_entry = func_entry::mk(m_manager, m_arity, args, r); func_entry * new_entry = func_entry::mk(m_manager, m_arity, args, r);

4
src/smt/theory_arith_core.h
View file

@ -66,6 +66,9 @@ namespace smt {
template<typename Ext> template<typename Ext>
bool theory_arith<Ext>::is_int_expr(expr* e) { bool theory_arith<Ext>::is_int_expr(expr* e) {
return m_util.is_int(e);
#if 0
Disable refined integer until equality propagation is fixed.
if (m_util.is_int(e)) return true; if (m_util.is_int(e)) return true;
if (is_uninterp(e)) return false; if (is_uninterp(e)) return false;
m_todo.reset(); m_todo.reset();
@ -93,6 +96,7 @@ namespace smt {
} }
} }
return true; return true;
#endif
} }

1
src/smt/theory_arith_eq.h
View file

@ -329,6 +329,7 @@ namespace smt {
if (is_equal(x, y)) if (is_equal(x, y))
return; return;
if (get_manager().get_sort(var2expr(x)) != get_manager().get_sort(var2expr(y))) { if (get_manager().get_sort(var2expr(x)) != get_manager().get_sort(var2expr(y))) {
TRACE("arith", tout << mk_pp(var2expr(x), get_manager()) << " = " << mk_pp(var2expr(y), get_manager()) << "\n";);
return; return;
} }
context & ctx = get_context(); context & ctx = get_context();