mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity

reset caches

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-08-28 15:09:12 -07:00
parent 739b5376e3
commit b8fb744935
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -1004,6 +1004,7 @@ private:
IF_VERBOSE(0, verbose_stream() << m_params << "\n"); IF_VERBOSE(0, verbose_stream() << m_params << "\n");
IF_VERBOSE(0, if (m_mcs.back()) m_mcs.back()->display(verbose_stream() << "mc0\n")); IF_VERBOSE(0, if (m_mcs.back()) m_mcs.back()->display(verbose_stream() << "mc0\n"));
IF_VERBOSE(0, for (auto const& kv : m_map) verbose_stream() << mk_pp(kv.m_key, m) << " |-> " << kv.m_value << "\n"); IF_VERBOSE(0, for (auto const& kv : m_map) verbose_stream() << mk_pp(kv.m_key, m) << " |-> " << kv.m_value << "\n");
exit(0);
} }
else { else {
IF_VERBOSE(1, verbose_stream() << "solution verified\n"); IF_VERBOSE(1, verbose_stream() << "solution verified\n");

16
src/sat/tactic/goal2sat.cpp
View file

@ -624,6 +624,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
void process(expr * n) { void process(expr * n) {
m_result_stack.reset(); m_result_stack.reset();
TRACE("goal2sat", tout << mk_pp(n, m) << "\n";);
process(n, true); process(n, true);
CTRACE("goal2sat", !m_result_stack.empty(), tout << m_result_stack << "\n";); CTRACE("goal2sat", !m_result_stack.empty(), tout << m_result_stack << "\n";);
SASSERT(m_result_stack.empty()); SASSERT(m_result_stack.empty());
@ -650,7 +651,6 @@ struct goal2sat::imp : public sat::sat_internalizer {
} }
void operator()(goal const & g) { void operator()(goal const & g) {
m_interface_vars.reset();
collect_boolean_interface(g, m_interface_vars); collect_boolean_interface(g, m_interface_vars);
unsigned size = g.size(); unsigned size = g.size();
expr_ref f(m), d_new(m); expr_ref f(m), d_new(m);
@ -690,6 +690,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
} }
} }
#if 0
void operator()(unsigned sz, expr * const * fs) { void operator()(unsigned sz, expr * const * fs) {
m_interface_vars.reset(); m_interface_vars.reset();
collect_boolean_interface(m, sz, fs, m_interface_vars); collect_boolean_interface(m, sz, fs, m_interface_vars);
@ -697,6 +698,7 @@ struct goal2sat::imp : public sat::sat_internalizer {
for (unsigned i = 0; i < sz; i++) for (unsigned i = 0; i < sz; i++)
process(fs[i]); process(fs[i]);
} }
#endif
}; };
@ -750,7 +752,19 @@ void goal2sat::operator()(goal const & g, params_ref const & p, sat::solver_core
if (!m_imp) if (!m_imp)
m_imp = alloc(imp, g.m(), p, t, m, dep2asm, default_external); m_imp = alloc(imp, g.m(), p, t, m, dep2asm, default_external);
struct scoped_reset {
goal2sat& g;
scoped_reset(goal2sat& g):g(g) {}
~scoped_reset() {
g.m_imp->m_interface_vars.reset();
g.m_imp->m_cache.reset();
}
};
scoped_reset _reset(*this);
(*m_imp)(g); (*m_imp)(g);
m_interpreted_atoms = alloc(expr_ref_vector, g.m()); m_interpreted_atoms = alloc(expr_ref_vector, g.m());
m_interpreted_atoms->append(m_imp->m_interpreted_atoms); m_interpreted_atoms->append(m_imp->m_interpreted_atoms);
if (!t.get_extension()) { if (!t.get_extension()) {