mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 12:23:38 +00:00
Code Activity

moving to gparams...

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-11-30 11:30:20 -08:00
parent 722cce0cff
commit caf14b96d4
2 changed files with 14 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/api/api_config_params.cpp
View file

@ -23,21 +23,14 @@ Revision History:
#include"api_util.h" #include"api_util.h"
#include"cmd_context.h" #include"cmd_context.h"
#include"symbol.h" #include"symbol.h"
#include"gparams.h"
namespace api { namespace api {
config_params::config_params(): config_params::config_params() {
m_ini(false /* do not abort on errors */) {
register_verbosity_level(m_ini);
register_warning(m_ini);
m_params.register_params(m_ini);
register_pp_params(m_ini);
} }
config_params::config_params(front_end_params const & p):m_params(p) { config_params::config_params(front_end_params const & p):m_params(p) {
register_verbosity_level(m_ini);
register_warning(m_ini);
register_pp_params(m_ini);
} }
}; };
@ -56,66 +49,35 @@ extern "C" {
} }
void Z3_API Z3_set_param_value(Z3_config c, char const * param_id, char const * param_value) { void Z3_API Z3_set_param_value(Z3_config c, char const * param_id, char const * param_value) {
// REMARK: we don't need Z3_config anymore
try { try {
LOG_Z3_set_param_value(c, param_id, param_value); LOG_Z3_set_param_value(c, param_id, param_value);
api::config_params* p = reinterpret_cast<api::config_params*>(c); gparams::set(param_id, param_value);
if (param_id != 0 && param_id[0] == ':') {
// Allow SMT2 style paramater names such as :model, :relevancy, etc
std::string new_param_id = smt2_keyword_to_param(symbol(param_id));
p->m_ini.set_param_value(new_param_id.c_str(), param_value);
} }
else { catch (gparams::exception & ex) {
p->m_ini.set_param_value(param_id, param_value);
}
}
catch (set_get_param_exception & ex) {
// The error handler was not set yet. // The error handler was not set yet.
// Just throw a warning. // Just throw a warning.
std::ostringstream buffer; std::ostringstream buffer;
buffer << "Error setting " << param_id << ", " << ex.get_msg(); buffer << "Error setting " << param_id << ", " << ex.msg();
warning_msg(buffer.str().c_str()); warning_msg(buffer.str().c_str());
} }
} }
void Z3_API Z3_update_param_value(Z3_context c, Z3_string param_id, Z3_string param_value) { void Z3_API Z3_update_param_value(Z3_context c, Z3_string param_id, Z3_string param_value) {
Z3_TRY;
LOG_Z3_update_param_value(c, param_id, param_value); LOG_Z3_update_param_value(c, param_id, param_value);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
ini_params ini; gparams::set(param_id, param_value);
mk_c(c)->fparams().register_params(ini); // TODO: set memory limits
register_pp_params(ini); // memory::set_high_watermark(static_cast<size_t>(mk_c(c)->fparams().m_memory_high_watermark)*1024*1024);
register_verbosity_level(ini); // memory::set_max_size(static_cast<size_t>(mk_c(c)->fparams().m_memory_max_size)*1024*1024);
register_warning(ini); Z3_CATCH;
if (mk_c(c)->has_solver()) {
ini.freeze();
}
if (param_id != 0 && param_id[0] == ':') {
// Allow SMT2 style paramater names such as :model, :relevancy, etc
std::string new_param_id = smt2_keyword_to_param(symbol(param_id));
ini.set_param_value(new_param_id.c_str(), param_value);
}
else {
ini.set_param_value(param_id, param_value);
}
memory::set_high_watermark(static_cast<size_t>(mk_c(c)->fparams().m_memory_high_watermark)*1024*1024);
memory::set_max_size(static_cast<size_t>(mk_c(c)->fparams().m_memory_max_size)*1024*1024);
} }
Z3_bool Z3_API Z3_get_param_value(Z3_context c, Z3_string param_id, Z3_string* param_value) { Z3_bool Z3_API Z3_get_param_value(Z3_context c, Z3_string param_id, Z3_string* param_value) {
LOG_Z3_get_param_value(c, param_id, param_value); LOG_Z3_get_param_value(c, param_id, param_value);
ini_params ini; // TODO: we don't really have support for that anymore.
mk_c(c)->fparams().register_params(ini);
register_verbosity_level(ini);
register_pp_params(ini);
register_warning(ini);
std::string param_value_s;
if (!ini.get_param_value(param_id, param_value_s)) {
if (param_value) *param_value = 0;
return false; return false;
} }
if (param_value) {
*param_value = mk_c(c)->mk_external_string(param_value_s);
}
return true;
}
}; };

2
src/api/api_config_params.h
View file

@ -18,14 +18,12 @@ Revision History:
#ifndef _API_CONFIG_PARAMS_H_ #ifndef _API_CONFIG_PARAMS_H_
#define _API_CONFIG_PARAMS_H_ #define _API_CONFIG_PARAMS_H_
#include"ini_file.h"
#include"front_end_params.h" #include"front_end_params.h"
namespace api { namespace api {
class config_params { class config_params {
public: public:
ini_params m_ini;
front_end_params m_params; front_end_params m_params;
config_params(); config_params();
config_params(front_end_params const & p); config_params(front_end_params const & p);