move solver-params to params

scripts/mk_project.py

@@ -38,7 +38,7 @@ def init_project_def():
     add_lib('substitution', ['ast', 'rewriter'], 'ast/substitution')
     add_lib('parser_util', ['ast'], 'parsers/util')
     add_lib('proofs', ['rewriter', 'util'], 'ast/proofs')
-    add_lib('solver', ['model', 'tactic', 'proofs'])
+    add_lib('solver', ['params', 'model', 'tactic', 'proofs'])
     add_lib('cmd_context', ['solver', 'rewriter', 'params'])
     add_lib('smt2parser', ['cmd_context', 'parser_util'], 'parsers/smt2')
     add_lib('pattern', ['normal_forms', 'smt2parser', 'rewriter'], 'ast/pattern')

src/api/api_solver.cpp

@@ -36,7 +36,7 @@ Revision History:
 #include "smt/smt_implied_equalities.h"
 #include "solver/smt_logics.h"
 #include "solver/tactic2solver.h"
-#include "solver/solver_params.hpp"
+#include "params/solver_params.hpp"
 #include "cmd_context/cmd_context.h"
 #include "parsers/smt2/smt2parser.h"
 #include "sat/dimacs.h"

src/params/CMakeLists.txt

@@ -15,6 +15,7 @@ z3_add_component(params
     poly_rewriter_params.pyg
     rewriter_params.pyg
     seq_rewriter_params.pyg
+    solver_params.pyg
   EXTRA_REGISTER_MODULE_HEADERS
     context_params.h
 )

src/smt/params/smt_params.cpp

@@ -19,7 +19,7 @@ Revision History:
 #include "smt/params/smt_params.h"
 #include "smt/params/smt_params_helper.hpp"
 #include "util/gparams.h"
-#include "solver/solver_params.hpp"
+#include "params/solver_params.hpp"
 
 void smt_params::updt_local_params(params_ref const & _p) {
     smt_params_helper p(_p);

src/solver/CMakeLists.txt

@@ -17,7 +17,5 @@ z3_add_component(solver
   PYG_FILES
     combined_solver_params.pyg
     parallel_params.pyg
-  PYG_FILES
-    solver_params.pyg
 
 )

src/solver/solver.cpp

@@ -24,7 +24,7 @@ Notes:
 #include "ast/display_dimacs.h"
 #include "tactic/model_converter.h"
 #include "solver/solver.h"
-#include "solver/solver_params.hpp"
+#include "params/solver_params.hpp"
 #include "model/model_evaluator.h"
 #include "model/model_params.hpp"