3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-03 01:40:22 +00:00

move common routines for quantifiers

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-01-28 13:23:40 -08:00
parent 5414030875
commit e3d634807b
12 changed files with 130 additions and 120 deletions

View file

@ -18,9 +18,9 @@ Revision History:
--*/
#include "ast/ast_pp.h"
#include "ast/ast_ll_pp.h"
#include "ast/quantifier_stat.h"
#include "smt/smt_quantifier.h"
#include "smt/smt_context.h"
#include "smt/smt_quantifier_stat.h"
#include "smt/smt_model_finder.h"
#include "smt/smt_model_checker.h"
#include "smt/smt_quick_checker.h"
@ -129,8 +129,8 @@ namespace smt {
context & m_context;
smt_params & m_params;
qi_queue m_qi_queue;
obj_map<quantifier, quantifier_stat *> m_quantifier_stat;
quantifier_stat_gen m_qstat_gen;
obj_map<quantifier, q::quantifier_stat *> m_quantifier_stat;
q::quantifier_stat_gen m_qstat_gen;
ptr_vector<quantifier> m_quantifiers;
scoped_ptr<quantifier_manager_plugin> m_plugin;
unsigned m_num_instances;
@ -150,7 +150,7 @@ namespace smt {
bool has_trace_stream() const { return m().has_trace_stream(); }
std::ostream & trace_stream() { return m().trace_stream(); }
quantifier_stat * get_stat(quantifier * q) const {
q::quantifier_stat * get_stat(quantifier * q) const {
return m_quantifier_stat.find(q);
}
@ -159,7 +159,7 @@ namespace smt {
}
void add(quantifier * q, unsigned generation) {
quantifier_stat * stat = m_qstat_gen(q, generation);
q::quantifier_stat * stat = m_qstat_gen(q, generation);
m_quantifier_stat.insert(q, stat);
m_quantifiers.push_back(q);
m_plugin->add(q);
@ -168,7 +168,7 @@ namespace smt {
bool has_quantifiers() const { return !m_quantifiers.empty(); }
void display_stats(std::ostream & out, quantifier * q) {
quantifier_stat * s = get_stat(q);
q::quantifier_stat * s = get_stat(q);
unsigned num_instances = s->get_num_instances();
unsigned num_instances_simplify_true = s->get_num_instances_simplify_true();
unsigned num_instances_checker_sat = s->get_num_instances_checker_sat();
@ -460,7 +460,7 @@ namespace smt {
return m_imp->is_shared(n);
}
quantifier_stat * quantifier_manager::get_stat(quantifier * q) const {
q::quantifier_stat * quantifier_manager::get_stat(quantifier * q) const {
return m_imp->get_stat(q);
}