mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

Eliminated the dependency of the macro-finder on the simplifier.

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2017-08-24 20:34:11 +01:00
parent ed8c11ff76
commit 8310b24c52
8 changed files with 168 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/smt/smt_model_finder.cpp
View file

@ -1873,12 +1873,12 @@ namespace smt {
fill the structure quantifier_info.
*/
class quantifier_analyzer {
model_finder& m_mf;
model_finder & m_mf;
ast_manager & m_manager;
macro_util m_mutil;
array_util m_array_util;
arith_util m_arith_util;
bv_util m_bv_util;
arith_util & m_arith_util;
bv_util & m_bv_util;
quantifier_info * m_info;
@ -1897,14 +1897,12 @@ namespace smt {
m_info->insert_qinfo(qi);
}
arith_simplifier_plugin * get_arith_simp() const { return m_mutil.get_arith_simp(); }
bv_simplifier_plugin * get_bv_simp() const { return m_mutil.get_bv_simp(); }
bool is_var_plus_ground(expr * n, bool & inv, var * & v, expr_ref & t) const {
return get_arith_simp()->is_var_plus_ground(n, inv, v, t) || get_bv_simp()->is_var_plus_ground(n, inv, v, t);
return m_mutil.get_arith_rw().is_var_plus_ground(n, inv, v, t) ||
m_mutil.get_bv_rw().is_var_plus_ground(n, inv, v, t);
}
bool is_var_plus_ground(expr * n, var * & v, expr_ref & t) {
bool is_var_plus_ground(expr * n, var * & v, expr_ref & t) const {
bool inv;
TRACE("is_var_plus_ground", tout << mk_pp(n, m_manager) << "\n";
tout << "is_var_plus_ground: " << is_var_plus_ground(n, inv, v, t) << "\n";
@ -1917,10 +1915,11 @@ namespace smt {
}
bool is_zero(expr * n) const {
if (get_bv_simp()->is_bv(n))
return get_bv_simp()->is_zero_safe(n);
else
return get_arith_simp()->is_zero_safe(n);
if (m_bv_util.is_bv(n))
return m_bv_util.is_zero(n);
else {
return m_arith_util.is_zero(n);
}
}
bool is_times_minus_one(expr * n, expr * & arg) const {
@ -1939,7 +1938,7 @@ namespace smt {
return m_bv_util.is_bv_sle(n);
}
expr * mk_one(sort * s) {
expr * mk_one(sort * s) const {
return m_bv_util.is_bv_sort(s) ? m_bv_util.mk_numeral(rational(1), s) : m_arith_util.mk_numeral(rational(1), s);
}
@ -1951,7 +1950,7 @@ namespace smt {
m_mutil.mk_add(t1, t2, r);
}
bool is_var_and_ground(expr * lhs, expr * rhs, var * & v, expr_ref & t, bool & inv) const {
bool is_var_and_ground(expr * lhs, expr * rhs, var * & v, expr_ref & t, bool & inv) {
inv = false; // true if invert the sign
TRACE("is_var_and_ground", tout << "is_var_and_ground: " << mk_ismt2_pp(lhs, m_manager) << " " << mk_ismt2_pp(rhs, m_manager) << "\n";);
if (is_var(lhs) && is_ground(rhs)) {
@ -1986,12 +1985,12 @@ namespace smt {
return false;
}
bool is_var_and_ground(expr * lhs, expr * rhs, var * & v, expr_ref & t) const {
bool is_var_and_ground(expr * lhs, expr * rhs, var * & v, expr_ref & t) {
bool inv;
return is_var_and_ground(lhs, rhs, v, t, inv);
}
bool is_x_eq_t_atom(expr * n, var * & v, expr_ref & t) const {
bool is_x_eq_t_atom(expr * n, var * & v, expr_ref & t) {
if (!is_app(n))
return false;
if (m_manager.is_eq(n))
@ -2382,10 +2381,10 @@ namespace smt {
quantifier_analyzer(model_finder& mf, ast_manager & m, simplifier & s):
m_mf(mf),
m_manager(m),
m_mutil(m, s),
m_mutil(m),
m_array_util(m),
m_arith_util(m),
m_bv_util(m),
m_arith_util(m_mutil.get_arith_util()),
m_bv_util(m_mutil.get_bv_util()),
m_info(0) {
}