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

saved params work

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-11-29 17:19:12 -08:00
parent c3055207ed
commit cf28cbab0a
130 changed files with 1469 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/shell/datalog_frontend.cpp
View file

@ -72,8 +72,8 @@ static void display_statistics(
code.process_all_costs();
{
params_ref p(ctx.get_params());
p.set_bool(":output-profile", true);
p.set_uint(":profile-milliseconds-threshold", 100);
p.set_bool("output_profile", true);
p.set_uint("profile_milliseconds_threshold", 100);
ctx.updt_params(p);
out << "--------------\n";
@ -132,9 +132,9 @@ unsigned read_datalog(char const * file, datalog_params const& dl_params, front_
register_on_timeout_proc(on_timeout);
signal(SIGINT, on_ctrl_c);
params_ref params;
params.set_sym(":engine", symbol("datalog"));
params.set_sym(":default-table", dl_params.m_default_table);
params.set_bool(":default-table-checked", dl_params.m_default_table_checked);
params.set_sym("engine", symbol("datalog"));
params.set_sym("default_table", dl_params.m_default_table);
params.set_bool("default_table_checked", dl_params.m_default_table_checked);
datalog::context ctx(m, front_end_params, params);
size_t watermark = front_end_params.m_memory_high_watermark;
@ -252,7 +252,7 @@ unsigned read_datalog(char const * file, datalog_params const& dl_params, front_
TRACE("dl_compiler", ctx.display(tout);
rules_code.display(ctx, tout););
if (ctx.get_params().get_bool(":output-tuples", true)) {
if (ctx.get_params().get_bool("output_tuples", true)) {
ctx.display_output_facts(std::cout);
}

2
src/shell/dimacs_frontend.cpp
View file

@ -69,7 +69,7 @@ unsigned read_dimacs(char const * file_name, front_end_params & front_end_params
register_on_timeout_proc(on_timeout);
signal(SIGINT, on_ctrl_c);
params_ref p;
p.set_bool(":produce-models", front_end_params.m_model);
p.set_bool("produce_models", front_end_params.m_model);
sat::solver solver(p, 0);
g_solver = &solver;

15
src/shell/main.cpp
View file

@ -32,6 +32,7 @@ Revision History:
#include"timeout.h"
#include"z3_exception.h"
#include"error_codes.h"
#include"gparams.h"
typedef enum { IN_UNSPECIFIED, IN_SMTLIB, IN_SMTLIB_2, IN_DATALOG, IN_DIMACS, IN_Z3_LOG } input_kind;
@ -76,8 +77,7 @@ void display_usage() {
std::cout << " " << OPT << "version prints version number of Z3.\n";
std::cout << " " << OPT << "v:level be verbose, where <level> is the verbosity level.\n";
std::cout << " " << OPT << "nw disable warning messages.\n";
std::cout << " " << OPT << "ini:file configuration file.\n";
std::cout << " " << OPT << "ini? display all available INI file parameters.\n";
std::cout << " " << OPT << "params display all available parameters.\n";
std::cout << " --" << " all remaining arguments are assumed to be part of the input file name. This option allows Z3 to read files with strange names such as: -foo.smt2.\n";
std::cout << "\nResources:\n";
// timeout and memout are now available on Linux and OSX too.
@ -285,13 +285,8 @@ void parse_cmd_line_args(int argc, char ** argv) {
else if (strcmp(opt_name, "nw") == 0) {
enable_warning_messages(false);
}
else if (strcmp(opt_name, "ini") == 0) {
if (!opt_arg)
error("option argument (/ini:file) is missing.");
read_ini_file(opt_arg);
}
else if (strcmp(opt_name, "ini?") == 0) {
display_ini_help();
else if (strcmp(opt_name, "params") == 0) {
gparams::display(std::cout);
exit(0);
}
else if (strcmp(opt_name, "geninidoc") == 0) {
@ -327,7 +322,7 @@ void parse_cmd_line_args(int argc, char ** argv) {
char * key = argv[i];
*eq_pos = 0;
char * value = eq_pos+1;
g_params->set_param_value(key, value);
gparams::set(key, value);
}
else {
if (g_front_end_params->m_interactive) {