mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

resetting SLS engine between calls, moved statistics collection to engine

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-04-19 16:52:57 -07:00
parent ff154a09b3
commit b300041075
5 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tactic/sls/sls_engine.cpp
View file

@ -68,6 +68,20 @@ void sls_engine::updt_params(params_ref const & _p) {
m_plateau_limit = p.plateau_limit();
}
void sls_engine::collect_statistics(statistics& st) const {
double seconds = m_stats.m_stopwatch.get_current_seconds();
st.update("sls restarts", m_stats.m_restarts);
st.update("sls full evals", m_stats.m_full_evals);
st.update("sls incr evals", m_stats.m_incr_evals);
st.update("sls incr evals/sec", m_stats.m_incr_evals / seconds);
st.update("sls FLIP moves", m_stats.m_flips);
st.update("sls INC moves", m_stats.m_incs);
st.update("sls DEC moves", m_stats.m_decs);
st.update("sls INV moves", m_stats.m_invs);
st.update("sls moves", m_stats.m_moves);
st.update("sls moves/sec", m_stats.m_moves / seconds);
}
void sls_engine::checkpoint() {
if (m_cancel)
throw tactic_exception(TACTIC_CANCELED_MSG);

4
src/tactic/sls/sls_engine.h
View file

@ -27,6 +27,7 @@ Notes:
#include"sls_compilation_settings.h"
#include"sls_tracker.h"
#include"sls_evaluator.h"
#include"statistics.h"
class sls_engine {
public:
@ -96,7 +97,8 @@ public:
void assert_expr(expr * e) { m_assertions.push_back(e); }
stats const & get_stats(void) { return m_stats; }
// stats const & get_stats(void) { return m_stats; }
void collect_statistics(statistics & st) const;
void reset_statistics(void) { m_stats.reset(); }
bool full_eval(model & mdl);

13
src/tactic/sls/sls_tactic.cpp
View file

@ -93,18 +93,7 @@ public:
}
virtual void collect_statistics(statistics & st) const {
sls_engine::stats const & stats = m_engine->get_stats();
double seconds = stats.m_stopwatch.get_current_seconds();
st.update("sls restarts", stats.m_restarts);
st.update("sls full evals", stats.m_full_evals);
st.update("sls incr evals", stats.m_incr_evals);
st.update("sls incr evals/sec", stats.m_incr_evals / seconds);
st.update("sls FLIP moves", stats.m_flips);
st.update("sls INC moves", stats.m_incs);
st.update("sls DEC moves", stats.m_decs);
st.update("sls INV moves", stats.m_invs);
st.update("sls moves", stats.m_moves);
st.update("sls moves/sec", stats.m_moves / seconds);
m_engine->collect_statistics(st);
}
virtual void reset_statistics() {