mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 21:08:46 +00:00
Code Activity

fix extraction of non-units

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-09-21 21:15:28 -07:00
parent 984e74428a
commit f349d3d013
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/solver/solver.cpp
View file

@ -257,6 +257,15 @@ expr_ref_vector solver::get_units(ast_manager& m) {
return result; return result;
} }
static bool is_atom(ast_manager& m, expr* f) {
if (!is_app(f)) return true;
app* _f = to_app(f);
family_id bfid = m.get_basic_family_id();
if (_f->get_family_id() != bfid) return true;
if (_f->get_num_args() > 0 && m.is_bool(_f->get_arg(0))) return false;
return m.is_eq(f) || m.is_distinct(f);
}
expr_ref_vector solver::get_non_units(ast_manager& m) { expr_ref_vector solver::get_non_units(ast_manager& m) {
expr_ref_vector result(m), fmls(m); expr_ref_vector result(m), fmls(m);
get_assertions(fmls); get_assertions(fmls);
@ -275,13 +284,17 @@ expr_ref_vector solver::get_non_units(ast_manager& m) {
if (_f->get_family_id() == bfid) { if (_f->get_family_id() == bfid) {
// basic objects are true/false/and/or/not/=/distinct // basic objects are true/false/and/or/not/=/distinct
// and proof objects (that are not Boolean). // and proof objects (that are not Boolean).
if (_f->get_num_args() > 0 && m.is_bool(_f->get_arg(0))) { if (i < sz0 && m.is_not(f) && is_atom(m, _f->get_arg(0))) {
marked.mark(_f->get_arg(0));
}
else if (_f->get_num_args() > 0 && m.is_bool(_f->get_arg(0))) {
fmls.append(_f->get_num_args(), _f->get_args()); fmls.append(_f->get_num_args(), _f->get_args());
} }
else if (m.is_eq(f) || m.is_distinct(f)) { else if (i >= sz0 && is_atom(m, f)) {
if (i >= sz0) result.push_back(f); result.push_back(f);
} }
} }
else { else {
if (i >= sz0) result.push_back(f); if (i >= sz0) result.push_back(f);
} }