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

update to make variables work with other theories

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-24 15:57:18 -07:00 committed by Arie Gurfinkel
parent 5eacb8122d
commit 92bac11778
2 changed files with 51 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/qe/qe_bool_plugin.cpp
View file

@ -93,10 +93,8 @@ namespace qe {
bool solve_units(conj_enum& conjs, expr* _fml) { bool solve_units(conj_enum& conjs, expr* _fml) {
expr_ref fml(_fml, m); expr_ref fml(_fml, m);
conj_enum::iterator it = conjs.begin(), end = conjs.end();
unsigned idx; unsigned idx;
for (; it != end; ++it) { for (expr * e : conjs) {
expr* e = *it;
if (!is_app(e)) { if (!is_app(e)) {
continue; continue;
} }
@ -138,13 +136,11 @@ namespace qe {
return false; return false;
} }
else if (p && !n) { else if (p && !n) {
atom_set::iterator it = m_ctx.pos_atoms().begin(), end = m_ctx.pos_atoms().end(); for (expr* y : m_ctx.pos_atoms()) {
for (; it != end; ++it) { if (x != y && contains_x(y)) return false;
if (x != *it && contains_x(*it)) return false;
} }
it = m_ctx.neg_atoms().begin(), end = m_ctx.neg_atoms().end(); for (expr* y : m_ctx.neg_atoms()) {
for (; it != end; ++it) { if (contains_x(y)) return false;
if (contains_x(*it)) return false;
} }
// only occurrences of 'x' must be in positive atoms // only occurrences of 'x' must be in positive atoms
def = m.mk_true(); def = m.mk_true();
@ -152,13 +148,11 @@ namespace qe {
return true; return true;
} }
else if (!p && n) { else if (!p && n) {
atom_set::iterator it = m_ctx.pos_atoms().begin(), end = m_ctx.pos_atoms().end(); for (expr* y : m_ctx.pos_atoms()) {
for (; it != end; ++it) { if (contains_x(y)) return false;
if (contains_x(*it)) return false;
} }
it = m_ctx.neg_atoms().begin(), end = m_ctx.neg_atoms().end(); for (expr* y : m_ctx.neg_atoms()) {
for (; it != end; ++it) { if (x != y && contains_x(y)) return false;
if (x != *it && contains_x(*it)) return false;
} }
def = m.mk_false(); def = m.mk_false();
m_replace.apply_substitution(x, def, fml); m_replace.apply_substitution(x, def, fml);

99
src/qe/qe_mbp.cpp
View file

@ -64,8 +64,8 @@ expr_ref project_plugin::pick_equality(ast_manager& m, model& model, expr* t) {
expr_ref_vector vals(m); expr_ref_vector vals(m);
obj_map<expr, expr*> val2expr; obj_map<expr, expr*> val2expr;
app* alit = to_app(t); app* alit = to_app(t);
for (unsigned i = 0; i < alit->get_num_args(); ++i) { for (expr * e1 : *alit) {
expr* e1 = alit->get_arg(i), *e2; expr *e2;
VERIFY(model.eval(e1, val)); VERIFY(model.eval(e1, val));
if (val2expr.find(val, e2)) { if (val2expr.find(val, e2)) {
return expr_ref(m.mk_eq(e1, e2), m); return expr_ref(m.mk_eq(e1, e2), m);
@ -91,13 +91,13 @@ void project_plugin::push_back(expr_ref_vector& lits, expr* e) {
class mbp::impl { class mbp::impl {
ast_manager& m; ast_manager& m;
params_ref m_params; params_ref m_params;
th_rewriter m_rw; th_rewriter m_rw;
ptr_vector<project_plugin> m_plugins; ptr_vector<project_plugin> m_plugins;
expr_mark m_visited; expr_mark m_visited;
expr_mark m_bool_visited; expr_mark m_bool_visited;
// parameters // parameters
bool m_reduce_all_selects; bool m_reduce_all_selects;
bool m_dont_sub; bool m_dont_sub;
@ -140,12 +140,9 @@ class mbp::impl {
} }
if (reduced) { if (reduced) {
unsigned j = 0; unsigned j = 0;
for (unsigned i = 0; i < vars.size(); ++i) { for (app* v : vars) {
if (!is_rem.is_marked(vars[i].get())) { if (!is_rem.is_marked(v)) {
if (i != j) { vars[j++] = v;
vars[j] = vars[i].get();
}
++j;
} }
} }
vars.shrink(j); vars.shrink(j);
@ -172,20 +169,13 @@ class mbp::impl {
void filter_variables(model& model, app_ref_vector& vars, expr_ref_vector& lits, expr_ref_vector& unused_lits) { void filter_variables(model& model, app_ref_vector& vars, expr_ref_vector& lits, expr_ref_vector& unused_lits) {
expr_mark lit_visited; expr_mark lit_visited;
project_plugin::mark_rec(lit_visited, lits); project_plugin::mark_rec(lit_visited, lits);
unsigned j = 0; unsigned j = 0;
for (unsigned i = 0; i < vars.size(); ++i) { for (app* var : vars) {
app* var = vars[i].get();
if (lit_visited.is_marked(var)) { if (lit_visited.is_marked(var)) {
if (i != j) { vars[j++] = var;
vars[j] = vars[i].get();
} }
++j;
} }
} vars.shrink(j);
if (vars.size() != j) {
vars.resize(j);
}
} }
bool extract_bools(model_evaluator& eval, expr_ref_vector& fmls, expr* fml) { bool extract_bools(model_evaluator& eval, expr_ref_vector& fmls, expr* fml) {
@ -245,33 +235,33 @@ class mbp::impl {
} }
else { else {
vars[j++] = var; vars[j++] = var;
}
} }
}
if (j == vars.size()) { if (j == vars.size()) {
return; return;
} }
vars.shrink(j); vars.shrink(j);
j = 0; j = 0;
for (unsigned i = 0; i < fmls.size(); ++i) { for (unsigned i = 0; i < fmls.size(); ++i) {
expr* fml = fmls[i].get(); expr* fml = fmls[i].get();
sub(fml, val); sub(fml, val);
m_rw(val); m_rw(val);
if (!m.is_true(val)) { if (!m.is_true(val)) {
TRACE("qe", tout << mk_pp(fml, m) << " -> " << val << "\n";); TRACE("qe", tout << mk_pp(fml, m) << " -> " << val << "\n";);
fmls[j++] = val; fmls[j++] = val;
} }
} }
fmls.shrink(j); fmls.shrink(j);
} }
void subst_vars(model_evaluator& eval, app_ref_vector const& vars, expr_ref& fml) { void subst_vars(model_evaluator& eval, app_ref_vector const& vars, expr_ref& fml) {
expr_safe_replace sub (m); expr_safe_replace sub (m);
for (app * v : vars) { for (app * v : vars) {
sub.insert(v, eval(v)); sub.insert(v, eval(v));
} }
sub(fml); sub(fml);
} }
struct index_term_finder { struct index_term_finder {
ast_manager& m; ast_manager& m;
@ -594,7 +584,7 @@ public:
model_evaluator eval(mdl, m_params); model_evaluator eval(mdl, m_params);
eval.set_model_completion(true); eval.set_model_completion(true);
app_ref_vector arith_vars (m); app_ref_vector other_vars (m);
app_ref_vector array_vars (m); app_ref_vector array_vars (m);
array_util arr_u (m); array_util arr_u (m);
arith_util ari_u (m); arith_util ari_u (m);
@ -612,11 +602,8 @@ public:
if (arr_u.is_array(v)) { if (arr_u.is_array(v)) {
array_vars.push_back (v); array_vars.push_back (v);
} }
else if (ari_u.is_int (v) || ari_u.is_real (v)) {
arith_vars.push_back (v);
}
else { else {
NOT_IMPLEMENTED_YET(); other_vars.push_back (v);
} }
} }
@ -636,46 +623,44 @@ public:
TRACE ("qe", TRACE ("qe",
tout << "extended model:\n"; tout << "extended model:\n";
model_pp (tout, mdl); model_pp (tout, mdl);
tout << "Vars: "; tout << "Vars: " << vars << "\n";
tout << vars << "\n";
); );
} }
// project reals and ints // project reals, ints and other variables.
if (!arith_vars.empty ()) { if (!other_vars.empty ()) {
TRACE ("qe", tout << "Arith vars: " << arith_vars << "\n"; TRACE ("qe", tout << "Other vars: " << other_vars << "\n";
model_pp(tout, mdl); model_pp(tout, mdl););
);
expr_ref_vector fmls(m); expr_ref_vector fmls(m);
flatten_and (fml, fmls); flatten_and (fml, fmls);
(*this)(true, arith_vars, mdl, fmls); (*this)(false, other_vars, mdl, fmls);
fml = mk_and (fmls); fml = mk_and (fmls);
TRACE ("qe", TRACE ("qe",
tout << "Projected arith vars:\n" << fml << "\n"; tout << "Projected other vars:\n" << fml << "\n";
tout << "Remaining arith vars:\n" << arith_vars << "\n";); tout << "Remaining other vars:\n" << other_vars << "\n";);
SASSERT (!m.is_false (fml)); SASSERT (!m.is_false (fml));
} }
if (!arith_vars.empty ()) { if (!other_vars.empty ()) {
project_vars (mdl, arith_vars, fml); project_vars (mdl, other_vars, fml);
} }
// substitute any remaining arith vars // substitute any remaining other vars
if (!m_dont_sub && !arith_vars.empty ()) { if (!m_dont_sub && !other_vars.empty ()) {
subst_vars (eval, arith_vars, fml); subst_vars (eval, other_vars, fml);
TRACE ("qe", tout << "After substituting remaining arith vars:\n" << fml << "\n";); TRACE ("qe", tout << "After substituting remaining other vars:\n" << fml << "\n";);
// an extra round of simplification because subst_vars is not simplifying // an extra round of simplification because subst_vars is not simplifying
m_rw(fml); m_rw(fml);
arith_vars.reset(); other_vars.reset();
} }
SASSERT(eval.is_true(fml)); SASSERT(eval.is_true(fml));
vars.reset (); vars.reset ();
vars.append(arith_vars); vars.append(other_vars);
} }
}; };
@ -688,7 +673,7 @@ mbp::mbp(ast_manager& m, params_ref const& p) {
mbp::~mbp() { mbp::~mbp() {
dealloc(m_impl); dealloc(m_impl);
} }
void mbp::updt_params(params_ref const& p) { void mbp::updt_params(params_ref const& p) {
m_impl->updt_params(p); m_impl->updt_params(p);
} }