mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

consolidate model.compact and model_compress #2704

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-11-15 11:06:59 -08:00
parent 1a9dfc5e80
commit cb600a9329
10 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/smt/params/smt_params.cpp
View file

@ -18,7 +18,6 @@ Revision History:
--*/
#include "smt/params/smt_params.h"
#include "smt/params/smt_params_helper.hpp"
#include "model/model_params.hpp"
#include "util/gparams.h"
void smt_params::updt_local_params(params_ref const & _p) {
@ -42,8 +41,6 @@ void smt_params::updt_local_params(params_ref const & _p) {
m_core_validate = p.core_validate();
m_logic = _p.get_sym("logic", m_logic);
m_string_solver = p.string_solver();
model_params mp(_p);
m_model_compact = mp.compact();
if (_p.get_bool("arith.greatest_error_pivot", false))
m_arith_pivot_strategy = ARITH_PIVOT_GREATEST_ERROR;
else if (_p.get_bool("arith.least_error_pivot", false))
@ -144,7 +141,6 @@ void smt_params::display(std::ostream & out) const {
DISPLAY_PARAM(m_display_ll_bool_var2expr);
DISPLAY_PARAM(m_model);
DISPLAY_PARAM(m_model_compact);
DISPLAY_PARAM(m_model_on_timeout);
DISPLAY_PARAM(m_model_on_final_check);

2
src/smt/params/smt_params.h
View file

@ -188,7 +188,6 @@ struct smt_params : public preprocessor_params,
//
// -----------------------------------
bool m_model;
bool m_model_compact;
bool m_model_on_timeout;
bool m_model_on_final_check;
@ -291,7 +290,6 @@ struct smt_params : public preprocessor_params,
m_display_bool_var2expr(false),
m_display_ll_bool_var2expr(false),
m_model(true),
m_model_compact(false),
m_model_on_timeout(false),
m_model_on_final_check(false),
m_progress_sampling_freq(0),

2
src/smt/smt_context.cpp
View file

@ -4387,8 +4387,6 @@ namespace smt {
m_proto_model->complete_partial_funcs(false);
TRACE("mbqi_bug", tout << "before cleanup:\n"; model_pp(tout, *m_proto_model););
m_proto_model->cleanup();
if (m_fparams.m_model_compact)
m_proto_model->compress();
TRACE("mbqi_bug", tout << "after cleanup:\n"; model_pp(tout, *m_proto_model););
IF_VERBOSE(11, model_pp(verbose_stream(), *m_proto_model););
}