3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-20 10:10:21 +00:00

Further refactoring ackermannization.

This commit is contained in:
mikolas 2016-02-03 17:31:19 +00:00
parent f3240024e7
commit faa620f673
22 changed files with 6 additions and 1629 deletions

View file

@ -32,6 +32,7 @@ Notes:
#include"model_smt2_pp.h"
#include"cooperate.h"
#include"lackr.h"
#include"ackermannization_params.hpp"
#include"qfufbv_ackr_model_converter.h"
///////////////
#include"inc_sat_solver.h"
@ -87,7 +88,7 @@ public:
}
virtual void collect_statistics(statistics & st) const {
ackr_params p(m_p);
ackermannization_params p(m_p);
if (!p.eager()) st.update("lackr-its", m_st.m_it);
st.update("ackr-constraints", m_st.m_ackrs_sz);
}
@ -172,9 +173,7 @@ tactic * mk_qfufbv_tactic(ast_manager & m, params_ref const & p) {
tactic * const preamble_st = mk_qfufbv_preamble(m, p);
tactic * st = using_params(and_then(preamble_st,
cond(mk_is_qfbv_probe(),
mk_qfbv_tactic(m),
mk_smt_tactic())),
cond(mk_is_qfbv_probe(), mk_qfbv_tactic(m), mk_smt_tactic())),
main_p);
st->updt_params(p);
@ -187,4 +186,4 @@ tactic * mk_qfufbv_ackr_tactic(ast_manager & m, params_ref const & p) {
tactic * const actual_tactic = alloc(qfufbv_ackr_tactic, m, p);
return and_then(preamble_t,
cond(mk_is_qfufbv_probe(), actual_tactic, mk_smt_tactic()));
}
}