mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 19:05:51 +00:00
Code Activity

streamline statistics, fix bug in updating goals

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-11-13 20:30:00 -08:00
parent ce6cfeaa68
commit 3d2bf13577
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ast/simplifiers/elim_unconstrained.cpp
View file

@ -96,6 +96,7 @@ void elim_unconstrained::eliminate() {
SASSERT(r->get_sort() == t->get_sort());
m_stats.m_num_eliminated++;
n.m_refcount = 0;
m_trail.push_back(r);
SASSERT(r);
gc(e);
@ -250,7 +251,9 @@ void elim_unconstrained::reconstruct_terms() {
}
void elim_unconstrained::assert_normalized(vector<dependent_expr>& old_fmls) {
for (unsigned i = m_qhead; i < m_fmls.size(); ++i) {
unsigned sz = m_fmls.size();
for (unsigned i = m_qhead; i < sz; ++i) {
auto [f, d] = m_fmls[i]();
node& n = get_node(f);
expr* g = n.m_term;

2
src/ast/simplifiers/elim_unconstrained.h
View file

@ -72,7 +72,7 @@ public:
void reduce() override;
void collect_statistics(statistics& st) const override { st.update("elim-unconstr", m_stats.m_num_eliminated); }
void collect_statistics(statistics& st) const override { st.update("elim-unconstrained", m_stats.m_num_eliminated); }
void reset_statistics() override { m_stats.reset(); }
};

5
src/tactic/core/elim_uncnstr_tactic.cpp
View file

@ -867,6 +867,8 @@ class elim_uncnstr_tactic : public tactic {
void run(goal_ref const & g, goal_ref_buffer & result) {
bool produce_proofs = g->proofs_enabled();
TRACE("goal", g->display(tout););
std::function<void(statistics&)> coll = [&](statistics& st) { collect_statistics(st); };
statistics_report sreport(coll);
tactic_report report("elim-uncnstr", *g);
m_vars.reset();
collect_occs p;
@ -959,7 +961,6 @@ public:
void operator()(goal_ref const & g,
goal_ref_buffer & result) override {
run(g, result);
report_tactic_progress(":num-elim-apps", m_num_elim_apps);
}
void cleanup() override {
@ -969,7 +970,7 @@ public:
}
void collect_statistics(statistics & st) const override {
st.update("eliminated applications", m_num_elim_apps);
st.update("elim-unconstrained", m_num_elim_apps);
}
void reset_statistics() override {