mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-07 07:45:46 +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/cmd_context/cmd_context.cpp
View file

@ -1674,9 +1674,9 @@ void cmd_context::display_dimacs() {
void cmd_context::display_model(model_ref& mdl) {
if (mdl) {
if (m_mc0) (*m_mc0)(mdl);
if (m_params.m_model_compress) mdl->compress();
add_declared_functions(*mdl);
model_params p;
if (p.compact()) mdl->compress();
add_declared_functions(*mdl);
if (p.v1() || p.v2()) {
std::ostringstream buffer;
model_v2_pp(buffer, *mdl, p.partial());

6
src/cmd_context/context_params.cpp
View file

@ -34,7 +34,6 @@ context_params::context_params() {
m_debug_ref_count = false;
m_smtlib2_compliant = false;
m_well_sorted_check = false;
m_model_compress = true;
m_timeout = UINT_MAX;
m_rlimit = 0;
m_statistics = false;
@ -104,9 +103,6 @@ void context_params::set(char const * param, char const * value) {
else if (p == "model_validate") {
set_bool(m_model_validate, param, value);
}
else if (p == "model_compress") {
set_bool(m_model_compress, param, value);
}
else if (p == "dump_models") {
set_bool(m_dump_models, param, value);
}
@ -154,7 +150,6 @@ void context_params::updt_params(params_ref const & p) {
m_proof = p.get_bool("proof", m_proof);
m_model = p.get_bool("model", m_model);
m_model_validate = p.get_bool("model_validate", m_model_validate);
m_model_compress = p.get_bool("model_compress", m_model_compress);
m_dump_models = p.get_bool("dump_models", m_dump_models);
m_trace = p.get_bool("trace", m_trace);
m_trace_file_name = p.get_str("trace_file_name", "z3.log");
@ -172,7 +167,6 @@ void context_params::collect_param_descrs(param_descrs & d) {
d.insert("type_check", CPK_BOOL, "type checker (alias for well_sorted_check)", "true");
d.insert("auto_config", CPK_BOOL, "use heuristics to automatically select solver and configure it", "true");
d.insert("model_validate", CPK_BOOL, "validate models produced by solvers", "false");
d.insert("model_compress", CPK_BOOL, "compress models for easier consumption", "true");
d.insert("dump_models", CPK_BOOL, "dump models whenever check-sat returns sat", "false");
d.insert("trace", CPK_BOOL, "trace generation for VCC", "false");
d.insert("trace_file_name", CPK_STRING, "trace out file name (see option 'trace')", "z3.log");

1
src/cmd_context/context_params.h
View file

@ -40,7 +40,6 @@ public:
bool m_well_sorted_check;
bool m_model;
bool m_model_validate;
bool m_model_compress;
bool m_dump_models;
bool m_unsat_core;
bool m_smtlib2_compliant; // it must be here because it enable/disable the use of coercions in the ast_manager.