3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00

saved params work

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

View file

@ -26,8 +26,8 @@ arith_eq_solver::arith_eq_solver(ast_manager & m, params_ref const& p):
m_util(m),
m_arith_rewriter(m)
{
m_params.set_bool(":gcd-rounding", true);
// m_params.set_bool(":sum", true);
m_params.set_bool("gcd_rounding", true);
// m_params.set_bool("sum", true);
m_arith_rewriter.updt_params(m_params);
}

View file

@ -197,7 +197,7 @@ namespace smt {
s_stats_val_eq_timer.start();
params_ref p;
p.set_bool(":produce-models", false);
p.set_bool("produce_models", false);
m_solver.updt_params(p);
for (unsigned i = 0; i < terms.size(); ++i) {
@ -232,7 +232,7 @@ namespace smt {
}
m_stats_val_eq_timer.stop();
s_stats_val_eq_timer.stop();
p.set_bool(":produce-models", true);
p.set_bool("produce_models", true);
m_solver.updt_params(p);
@ -325,7 +325,7 @@ namespace smt {
lbool operator()(unsigned num_terms, expr* const* terms, unsigned* class_ids) {
params_ref p;
p.set_bool(":produce-models", true);
p.set_bool("produce_models", true);
m_solver.updt_params(p);
sort2term_ids termids;
stopwatch timer;

View file

@ -60,8 +60,8 @@ public:
}
void updt_params_core(params_ref const & p) {
m_candidate_models = p.get_bool(":candidate-models", false);
m_fail_if_inconclusive = p.get_bool(":fail-if-inconclusive", true);
m_candidate_models = p.get_bool("candidate_models", false);
m_fail_if_inconclusive = p.get_bool("fail_if_inconclusive", true);
}
virtual void updt_params(params_ref const & p) {
@ -69,12 +69,12 @@ public:
updt_params_core(p);
m_params_ref = p;
params2front_end_params(m_params_ref, fparams());
SASSERT(p.get_bool(":auto_config", fparams().m_auto_config) == fparams().m_auto_config);
SASSERT(p.get_bool("auto_config", fparams().m_auto_config) == fparams().m_auto_config);
}
virtual void collect_param_descrs(param_descrs & r) {
r.insert(":candidate-models", CPK_BOOL, "(default: false) create candidate models even when quantifier or theory reasoning is incomplete.");
r.insert(":fail-if-inconclusive", CPK_BOOL, "(default: true) fail if found unsat (sat) for under (over) approximated goal.");
r.insert("candidate_models", CPK_BOOL, "(default: false) create candidate models even when quantifier or theory reasoning is incomplete.");
r.insert("fail_if_inconclusive", CPK_BOOL, "(default: true) fail if found unsat (sat) for under (over) approximated goal.");
solver_front_end_params_descrs(r);
}
@ -315,7 +315,7 @@ tactic * mk_smt_tactic(params_ref const & p) {
tactic * mk_smt_tactic_using(bool auto_config, params_ref const & _p) {
params_ref p = _p;
p.set_bool(":auto-config", auto_config);
p.set_bool("auto_config", auto_config);
tactic * r = mk_smt_tactic(p);
TRACE("smt_tactic", tout << "auto_config: " << auto_config << "\nr: " << r << "\np: " << p << "\n";);
return using_params(r, p);