diff --git a/scripts/mk_project.py b/scripts/mk_project.py index 0e7fcf521..6b5197fa5 100644 --- a/scripts/mk_project.py +++ b/scripts/mk_project.py @@ -20,10 +20,10 @@ def init_project_def(): add_lib('simplex', ['util'], 'math/simplex') add_lib('hilbert', ['util'], 'math/hilbert') add_lib('automata', ['util'], 'math/automata') - add_lib('params', ['util']) add_lib('realclosure', ['interval'], 'math/realclosure') add_lib('subpaving', ['interval'], 'math/subpaving') add_lib('ast', ['util', 'polynomial']) + add_lib('params', ['util', 'ast']) add_lib('parser_util', ['ast'], 'parsers/util') add_lib('euf', ['ast'], 'ast/euf') add_lib('grobner', ['ast', 'dd', 'simplex'], 'math/grobner') diff --git a/src/ast/simplifiers/euf_completion.cpp b/src/ast/simplifiers/euf_completion.cpp index 1337562a3..02e556adb 100644 --- a/src/ast/simplifiers/euf_completion.cpp +++ b/src/ast/simplifiers/euf_completion.cpp @@ -54,7 +54,6 @@ Mam optimization? #include "ast/rewriter/var_subst.h" #include "ast/simplifiers/euf_completion.h" #include "ast/shared_occs.h" -#include "params/tactic_params.hpp" #include "params/smt_params_helper.hpp" namespace euf { @@ -99,8 +98,8 @@ namespace euf { } void completion::updt_params(params_ref const& p) { - tactic_params tp(p); - m_max_instantiations = tp.completion_max_instantiations(); + smt_params_helper sp(p); + m_max_instantiations = sp.qi_max_instances(); } struct completion::push_watch_rule : public trail { diff --git a/src/params/CMakeLists.txt b/src/params/CMakeLists.txt index b587b99ef..a00917834 100644 --- a/src/params/CMakeLists.txt +++ b/src/params/CMakeLists.txt @@ -14,6 +14,7 @@ z3_add_component(params theory_str_params.cpp COMPONENT_DEPENDENCIES util + ast PYG_FILES arith_rewriter_params.pyg array_rewriter_params.pyg diff --git a/src/params/tactic_params.pyg b/src/params/tactic_params.pyg index 6fceee20c..40ea5f535 100644 --- a/src/params/tactic_params.pyg +++ b/src/params/tactic_params.pyg @@ -12,7 +12,6 @@ def_module_params('tactic', ('lia2card.max_range', UINT, 100, "maximal range of integers to compilation into Booleans"), ('lia2card.max_ite_nesting', UINT, 4, "maximal nesting depth for ite expressions to be compiled into PB constraints"), ('randomizer.seed', UINT, 0, "seed for randomizer pre-processor"), - ('completion.max_instantiations', UINT, UINT_MAX, "Maximal number of instantiations allowed for euf-completion"), ('default_tactic', SYMBOL, '', "overwrite default tactic in strategic solver"), # ('aig.per_assertion', BOOL, True, "process one assertion at a time"),