mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-25 07:13:41 +00:00
Code Activity

updates to mbp

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-21 16:53:33 -07:00 • committed by Arie Gurfinkel
parent 7642106e73
commit 692a701516
2 changed files with 53 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd_context/extra_cmds/dbg_cmds.cpp
View file

@ -369,7 +369,7 @@ public:
void set_next_arg(cmd_context & ctx, unsigned num, expr * const * ts) override { void set_next_arg(cmd_context & ctx, unsigned num, expr * const * ts) override {
m_vars.append(num, ts); m_vars.append(num, ts);
} }
void prepare(cmd_context & ctx) override { m_fml = nullptr; } void prepare(cmd_context & ctx) override { m_fml = nullptr; m_vars.reset(); }
void execute(cmd_context & ctx) override { void execute(cmd_context & ctx) override {
ast_manager& m = ctx.m(); ast_manager& m = ctx.m();
app_ref_vector vars(m); app_ref_vector vars(m);

40
src/qe/qe_arrays.cpp
View file

@ -631,13 +631,13 @@ namespace qe {
m_v = arr_vars.get (i); m_v = arr_vars.get (i);
if (!m_arr_u.is_array (m_v)) { if (!m_arr_u.is_array (m_v)) {
TRACE ("qe", TRACE ("qe",
tout << "not an array variable: " << m_v << "\n"; tout << "not an array variable: " << mk_pp (m_v, m) << "\n";
); );
aux_vars.push_back (m_v); aux_vars.push_back (m_v);
continue; continue;
} }
TRACE ("qe", TRACE ("qe",
tout << "projecting equalities on variable: " << m_v << "\n"; tout << "projecting equalities on variable: " << mk_pp (m_v, m) << "\n";
); );
if (project (fml)) { if (project (fml)) {
@ -653,8 +653,8 @@ namespace qe {
); );
} }
else { else {
IF_VERBOSE(2, verbose_stream() << "can't project:" << m_v << "\n";); IF_VERBOSE(2, verbose_stream() << "can't project:" << mk_pp(m_v, m) << "\n";);
TRACE ("qe", tout << "Failed to project: " << m_v << "\n";); TRACE ("qe", tout << "Failed to project: " << mk_pp (m_v, m) << "\n";);
arr_vars[j++] = m_v; arr_vars[j++] = m_v;
} }
} }
@ -1216,6 +1216,38 @@ namespace qe {
} }
} }
bool solve_eq(model& model, app_ref_vector& vars, expr_ref_vector& lits) {
// find an equality to solve for.
expr* s, *t;
for (unsigned i = 0; i < lits.size(); ++i) {
if (m.is_eq(lits[i].get(), s, t)) {
vector<indices> idxs;
expr_ref save(m), back(m);
save = lits[i].get();
back = lits.back();
lits[i] = back;
lits.pop_back();
unsigned sz = lits.size();
if (contains_x(s) && !contains_x(t) && is_app(s)) {
if (solve(model, to_app(s), t, idxs, vars, lits)) {
return true;
}
}
else if (contains_x(t) && !contains_x(s) && is_app(t)) {
if (solve(model, to_app(t), s, idxs, vars, lits)) {
return true;
}
}
// put back the equality literal.
lits.resize(sz);
lits.push_back(back);
lits[i] = save;
}
// TBD: not distinct?
}
return false;
}
bool solve(model& model, app* s, expr* t, vector<indices>& idxs, app_ref_vector& vars, expr_ref_vector& lits) { bool solve(model& model, app* s, expr* t, vector<indices>& idxs, app_ref_vector& vars, expr_ref_vector& lits) {
SASSERT(contains_x(s)); SASSERT(contains_x(s));
SASSERT(!contains_x(t)); SASSERT(!contains_x(t));