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

disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-11-20 14:34:31 -08:00
parent 95fe9a3a68
commit c1a6163bda
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd_context/cmd_context.cpp
View file

@ -383,6 +383,9 @@ void cmd_context::global_params_updated() {
p.set_bool("auto_config", false); p.set_bool("auto_config", false);
m_solver->updt_params(p); m_solver->updt_params(p);
} }
if (m_opt) {
get_opt()->updt_params(gparams::get_module("opt"));
}
} }
void cmd_context::set_produce_models(bool f) { void cmd_context::set_produce_models(bool f) {

1
src/cmd_context/cmd_context.h
View file

@ -125,6 +125,7 @@ public:
virtual bool is_pareto() = 0; virtual bool is_pareto() = 0;
virtual void set_logic(symbol const& s) = 0; virtual void set_logic(symbol const& s) = 0;
virtual bool print_model() const = 0; virtual bool print_model() const = 0;
virtual void updt_params(params_ref& p) = 0;
}; };
class cmd_context : public progress_callback, public tactic_manager, public ast_printer_context { class cmd_context : public progress_callback, public tactic_manager, public ast_printer_context {

2
src/opt/opt_context.h
View file

@ -195,7 +195,7 @@ namespace opt {
void display(std::ostream& out); void display(std::ostream& out);
static void collect_param_descrs(param_descrs & r); static void collect_param_descrs(param_descrs & r);
void updt_params(params_ref& p); virtual void updt_params(params_ref& p);
params_ref& get_params() { return m_params; } params_ref& get_params() { return m_params; }
expr_ref get_lower(unsigned idx); expr_ref get_lower(unsigned idx);

4
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -84,12 +84,14 @@ public:
simp2_p.set_uint("local_ctx_limit", 10000000); simp2_p.set_uint("local_ctx_limit", 10000000);
simp2_p.set_bool("flat", true); // required by som simp2_p.set_bool("flat", true); // required by som
simp2_p.set_bool("hoist_mul", false); // required by som simp2_p.set_bool("hoist_mul", false); // required by som
simp2_p.set_bool("elim_and", true);
m_preprocess = m_preprocess =
and_then(mk_card2bv_tactic(m, m_params), and_then(mk_card2bv_tactic(m, m_params),
using_params(mk_simplify_tactic(m), simp2_p), using_params(mk_simplify_tactic(m), simp2_p),
mk_max_bv_sharing_tactic(m), mk_max_bv_sharing_tactic(m),
mk_bit_blaster_tactic(m, &m_bb_rewriter), mk_bit_blaster_tactic(m, &m_bb_rewriter),
mk_aig_tactic(), //mk_aig_tactic(),
using_params(mk_simplify_tactic(m), simp2_p)); using_params(mk_simplify_tactic(m), simp2_p));
} }