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

persisting check_predicate_proc to gain sme efficiency

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-23 21:08:14 -07:00
parent 54c959783d
commit d67a73820d
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/muz/base/hnf.cpp
View file

@ -58,6 +58,19 @@ Notes:
#include"for_each_expr.h" #include"for_each_expr.h"
class hnf::imp { class hnf::imp {
class contains_predicate_proc {
imp const& m;
public:
struct found {};
contains_predicate_proc(imp const& m): m(m) {}
void operator()(var * n) {}
void operator()(quantifier * n) {}
void operator()(app* n) {
if (m.is_predicate(n)) throw found();
}
};
ast_manager& m; ast_manager& m;
bool m_produce_proofs; bool m_produce_proofs;
volatile bool m_cancel; volatile bool m_cancel;
@ -73,6 +86,7 @@ class hnf::imp {
func_decl_ref_vector m_fresh_predicates; func_decl_ref_vector m_fresh_predicates;
expr_ref_vector m_body; expr_ref_vector m_body;
proof_ref_vector m_defs; proof_ref_vector m_defs;
contains_predicate_proc m_proc;
public: public:
@ -87,7 +101,8 @@ public:
m_qh(m), m_qh(m),
m_fresh_predicates(m), m_fresh_predicates(m),
m_body(m), m_body(m),
m_defs(m) { m_defs(m),
m_proc(*this) {
} }
void operator()(expr * n, void operator()(expr * n,
@ -166,22 +181,9 @@ private:
return m.is_bool(f->get_range()) && f->get_family_id() == null_family_id; return m.is_bool(f->get_range()) && f->get_family_id() == null_family_id;
} }
class contains_predicate_proc { bool contains_predicate(expr* fml) {
imp const& m;
public:
struct found {};
contains_predicate_proc(imp const& m): m(m) {}
void operator()(var * n) {}
void operator()(quantifier * n) {}
void operator()(app* n) {
if (m.is_predicate(n)) throw found();
}
};
bool contains_predicate(expr* fml) const {
contains_predicate_proc proc(*this);
try { try {
quick_for_each_expr(proc, fml); quick_for_each_expr(m_proc, fml);
} }
catch (contains_predicate_proc::found) { catch (contains_predicate_proc::found) {
return true; return true;