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

remove also cores as arguments to tactics

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-11-19 12:18:50 -08:00
parent 4bbece6616
commit 2f218b0bdc
90 changed files with 326 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,6 @@ class inc_sat_solver : public solver {
model_converter_ref m_mc;
model_converter_ref m_mc0;
model_converter_ref m_sat_mc;
expr_dependency_ref m_dep_core;
svector<double> m_weights;
std::string m_unknown;
// access formulas after they have been pre-processed and handled by the sat solver.
@ -82,7 +81,6 @@ public:
m_core(m),
m_map(m),
m_num_scopes(0),
m_dep_core(m),
m_unknown("no reason given"),
m_internalized(false),
m_internalized_converted(false),
@ -495,7 +493,6 @@ private:
lbool internalize_goal(goal_ref& g, dep2asm_t& dep2asm, bool is_lemma) {
m_mc.reset();
m_pc.reset();
m_dep_core.reset();
m_subgoals.reset();
init_preprocess();
SASSERT(g->models_enabled());
@ -505,7 +502,7 @@ private:
SASSERT(!g->proofs_enabled());
TRACE("sat", g->display(tout););
try {
(*m_preprocess)(g, m_subgoals, m_dep_core);
(*m_preprocess)(g, m_subgoals);
}
catch (tactic_exception & ex) {
IF_VERBOSE(0, verbose_stream() << "exception in tactic " << ex.msg() << "\n";);

9
src/sat/tactic/sat_tactic.cpp
View file

@ -39,9 +39,7 @@ class sat_tactic : public tactic {
}
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
core = 0;
goal_ref_buffer & result) {
fail_if_proof_generation("sat", g);
bool produce_models = g->models_enabled();
bool produce_core = g->unsat_core_enabled();
@ -175,12 +173,11 @@ public:
}
void operator()(goal_ref const & g,
goal_ref_buffer & result,
expr_dependency_ref & core) {
goal_ref_buffer & result) {
imp proc(g->m(), m_params);
scoped_set_imp set(this, &proc);
try {
proc(g, result, core);
proc(g, result);
proc.m_solver.collect_statistics(m_stats);
}
catch (sat::solver_exception & ex) {