mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-12 17:06:14 +00:00
Code Activity

merge

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-09-20 20:41:00 -07:00
commit 618e1bee5b
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/c++/z3++.h
View file

@ -2039,6 +2039,7 @@ namespace z3 {
expr_vector unsat_core() const { Z3_ast_vector r = Z3_solver_get_unsat_core(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); } expr_vector unsat_core() const { Z3_ast_vector r = Z3_solver_get_unsat_core(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); }
expr_vector assertions() const { Z3_ast_vector r = Z3_solver_get_assertions(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); } expr_vector assertions() const { Z3_ast_vector r = Z3_solver_get_assertions(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); }
expr_vector non_units() const { Z3_ast_vector r = Z3_solver_get_non_units(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); } expr_vector non_units() const { Z3_ast_vector r = Z3_solver_get_non_units(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); }
expr_vector units() const { Z3_ast_vector r = Z3_solver_get_units(ctx(), m_solver); check_error(); return expr_vector(ctx(), r); }
expr proof() const { Z3_ast r = Z3_solver_get_proof(ctx(), m_solver); check_error(); return expr(ctx(), r); } expr proof() const { Z3_ast r = Z3_solver_get_proof(ctx(), m_solver); check_error(); return expr(ctx(), r); }
friend std::ostream & operator<<(std::ostream & out, solver const & s); friend std::ostream & operator<<(std::ostream & out, solver const & s);

5
src/api/python/z3/z3.py
View file

@ -6646,6 +6646,11 @@ class Solver(Z3PPObject):
""" """
return AstVector(Z3_solver_get_units(self.ctx.ref(), self.solver), self.ctx) return AstVector(Z3_solver_get_units(self.ctx.ref(), self.solver), self.ctx)
def non_units(self):
"""Return an AST vector containing all atomic formulas in solver state that are not units.
"""
return AstVector(Z3_solver_get_non_units(self.ctx.ref(), self.solver), self.ctx)
def statistics(self): def statistics(self):
"""Return statistics for the last `check()`. """Return statistics for the last `check()`.

8
src/solver/solver.cpp
View file

@ -262,25 +262,27 @@ expr_ref_vector solver::get_non_units(ast_manager& m) {
get_assertions(fmls); get_assertions(fmls);
family_id bfid = m.get_basic_family_id(); family_id bfid = m.get_basic_family_id();
expr_mark marked; expr_mark marked;
unsigned sz0 = fmls.size();
for (unsigned i = 0; i < fmls.size(); ++i) { for (unsigned i = 0; i < fmls.size(); ++i) {
expr* f = fmls.get(i); expr* f = fmls.get(i);
if (marked.is_marked(f)) continue; if (marked.is_marked(f)) continue;
marked.mark(f); marked.mark(f);
if (!is_app(f)) { if (!is_app(f)) {
result.push_back(f); if (i >= sz0) result.push_back(f);
continue; continue;
} }
app* _f = to_app(f); app* _f = to_app(f);
if (_f->get_family_id() == bfid) { if (_f->get_family_id() == bfid) {
// basic objects are true/false/and/or/not/=/distinct and proof objects (that are not Boolean)
if (_f->get_num_args() > 0 && m.is_bool(_f->get_arg(0))) { 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 (m.is_eq(f) || m.is_distinct(f)) {
result.push_back(f); if (i >= sz0) result.push_back(f);
} }
} }
else { else {
result.push_back(f); if (i >= sz0) result.push_back(f);
} }
} }
return result; return result;