reorganizing the code

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2025-04-27 10:55:50 +00:00 · 2012-10-23 21:53:34 -07:00 · 2012-10-23 21:53:34 -07:00 · 9e299b88c4
commit 9e299b88c4
parent b89d35dd69
101 changed files with 16 additions and 16 deletions
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@ -19,11 +19,11 @@ parse_options()
 #                'NDEBUG;_EXTERNAL_RELEASE')

 add_lib('util', [])
-add_lib('polynomial', ['util'])
+add_lib('polynomial', ['util'], 'math/polynomial')
 add_lib('sat', ['util'])
 # nlsat only reuses the file sat_types.h from sat
 add_lib('nlsat', ['polynomial', 'sat'])
-add_lib('subpaving', ['util'])
+add_lib('subpaving', ['util'], 'math/subpaving')
 add_lib('ast', ['util', 'polynomial'])
 add_lib('rewriter', ['ast', 'polynomial'])
 # Simplifier module will be deleted in the future.
@ -47,31 +47,31 @@ add_lib('spc', ['simplifier', 'substitution', 'old_params', 'pattern'])
 add_lib('parser_util', ['ast'])
 add_lib('smt2parser', ['cmd_context', 'parser_util'])
 add_lib('macros', ['simplifier', 'old_params'])
-add_lib('grobner', ['ast'])
-add_lib('euclid', ['util'])
+add_lib('grobner', ['ast'], 'math/grobner')
+add_lib('euclid', ['util'], 'math/euclid')
 add_lib('proof_checker', ['rewriter', 'spc'])
-add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic', 'assertion_set'])
+add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic', 'assertion_set'], 'bv/bit_blaster')
 add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'cmd_context', 
                'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util'])
-add_lib('user_plugin', ['smt'])
+add_lib('user_plugin', ['smt'], 'smt/user_plugin')
 add_lib('core_tactics', ['tactic', 'normal_forms'])
-add_lib('sat_tactic', ['tactic', 'sat'])
-add_lib('sat_strategy', ['assertion_set', 'sat_tactic'])
+add_lib('sat_tactic', ['tactic', 'sat'], 'sat/tactic')
+add_lib('sat_strategy', ['assertion_set', 'sat_tactic'], 'sat/strategy')
 add_lib('arith_tactics', ['core_tactics', 'assertion_set', 'sat', 'sat_strategy'])
-add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'])
-add_lib('subpaving_tactic', ['core_tactics', 'subpaving'])
-add_lib('bv_tactics', ['tactic', 'bit_blaster'])
-add_lib('fuzzing', ['ast'])
+add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'nlsat/tactic')
+add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'math/subpaving/tactic')
+add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'bv/tactics')
+add_lib('fuzzing', ['ast'], 'test/fuzzing')
 add_lib('fpa', ['core_tactics', 'bv_tactics', 'sat_tactic'])
-add_lib('smt_tactic', ['smt'])
-add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'])
-add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'])
+add_lib('smt_tactic', ['smt'], 'smt/tactic')
+add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'], 'cmd_context/extra_cmds')
+add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'bv/sls_tactic')
 add_lib('aig', ['cmd_context', 'assertion_set'])
 # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
 add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
 add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'])
 # TODO: rewrite ufbv_strategy as a tactic and move to smtlogic_tactics.
-add_lib('ufbv_strategy', ['assertion_set', 'normal_forms', 'macros', 'smt_tactic', 'rewriter'])
+add_lib('ufbv_strategy', ['assertion_set', 'normal_forms', 'macros', 'smt_tactic', 'rewriter'], 'bv/ufbv_strategy')
 add_lib('portfolio', ['smtlogic_tactics', 'ufbv_strategy', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'])
 # TODO: delete SMT 1.0 frontend
 add_lib('api', ['portfolio', 'user_plugin'])
--- a/src/bv/bit_blaster/bit_blaster.cpp
+++ b/src/bv/bit_blaster/bit_blaster.cpp
--- a/src/bv/bit_blaster/bit_blaster.h
+++ b/src/bv/bit_blaster/bit_blaster.h
--- a/src/bv/bit_blaster/bit_blaster_model_converter.cpp
+++ b/src/bv/bit_blaster/bit_blaster_model_converter.cpp
--- a/src/bv/bit_blaster/bit_blaster_model_converter.h
+++ b/src/bv/bit_blaster/bit_blaster_model_converter.h
--- a/src/bv/bit_blaster/bit_blaster_rewriter.cpp
+++ b/src/bv/bit_blaster/bit_blaster_rewriter.cpp
--- a/src/bv/bit_blaster/bit_blaster_rewriter.h
+++ b/src/bv/bit_blaster/bit_blaster_rewriter.h
--- a/src/bv/bit_blaster/bit_blaster_tpl.h
+++ b/src/bv/bit_blaster/bit_blaster_tpl.h
--- a/src/bv/bit_blaster/bit_blaster_tpl_def.h
+++ b/src/bv/bit_blaster/bit_blaster_tpl_def.h
--- a/src/bv/bit_blaster/bv1_blaster_tactic.cpp
+++ b/src/bv/bit_blaster/bv1_blaster_tactic.cpp
--- a/src/bv/bit_blaster/bv1_blaster_tactic.h
+++ b/src/bv/bit_blaster/bv1_blaster_tactic.h
--- a/src/bv/bit_blaster/eager_bit_blaster.cpp
+++ b/src/bv/bit_blaster/eager_bit_blaster.cpp
--- a/src/bv/bit_blaster/eager_bit_blaster.h
+++ b/src/bv/bit_blaster/eager_bit_blaster.h
--- a/src/bv/sls_tactic/sls_strategy.h
+++ b/src/bv/sls_tactic/sls_strategy.h
--- a/src/bv/sls_tactic/sls_tactic.cpp
+++ b/src/bv/sls_tactic/sls_tactic.cpp
--- a/src/bv/sls_tactic/sls_tactic.h
+++ b/src/bv/sls_tactic/sls_tactic.h
--- a/src/bv/tactics/bit_blaster_tactic.cpp
+++ b/src/bv/tactics/bit_blaster_tactic.cpp
--- a/src/bv/tactics/bit_blaster_tactic.h
+++ b/src/bv/tactics/bit_blaster_tactic.h
--- a/src/bv/tactics/bv_size_reduction_tactic.cpp
+++ b/src/bv/tactics/bv_size_reduction_tactic.cpp
--- a/src/bv/tactics/bv_size_reduction_tactic.h
+++ b/src/bv/tactics/bv_size_reduction_tactic.h
--- a/src/bv/tactics/max_bv_sharing_tactic.cpp
+++ b/src/bv/tactics/max_bv_sharing_tactic.cpp
--- a/src/bv/tactics/max_bv_sharing_tactic.h
+++ b/src/bv/tactics/max_bv_sharing_tactic.h
--- a/src/bv/ufbv_strategy/ufbv_strategy.cpp
+++ b/src/bv/ufbv_strategy/ufbv_strategy.cpp
--- a/src/bv/ufbv_strategy/ufbv_strategy.h
+++ b/src/bv/ufbv_strategy/ufbv_strategy.h
--- a/src/cmd_context/extra_cmds/dbg_cmds.cpp
+++ b/src/cmd_context/extra_cmds/dbg_cmds.cpp
--- a/src/cmd_context/extra_cmds/dbg_cmds.h
+++ b/src/cmd_context/extra_cmds/dbg_cmds.h
--- a/src/cmd_context/extra_cmds/polynomial_cmds.cpp
+++ b/src/cmd_context/extra_cmds/polynomial_cmds.cpp
--- a/src/cmd_context/extra_cmds/polynomial_cmds.h
+++ b/src/cmd_context/extra_cmds/polynomial_cmds.h
--- a/src/cmd_context/extra_cmds/subpaving_cmds.cpp
+++ b/src/cmd_context/extra_cmds/subpaving_cmds.cpp
--- a/src/cmd_context/extra_cmds/subpaving_cmds.h
+++ b/src/cmd_context/extra_cmds/subpaving_cmds.h
--- a/src/math/euclid/euclidean_solver.cpp
+++ b/src/math/euclid/euclidean_solver.cpp
--- a/src/math/euclid/euclidean_solver.h
+++ b/src/math/euclid/euclidean_solver.h
--- a/src/math/grobner/grobner.cpp
+++ b/src/math/grobner/grobner.cpp
--- a/src/math/grobner/grobner.h
+++ b/src/math/grobner/grobner.h
--- a/src/math/polynomial/algebraic_numbers.cpp
+++ b/src/math/polynomial/algebraic_numbers.cpp
--- a/src/math/polynomial/algebraic_numbers.h
+++ b/src/math/polynomial/algebraic_numbers.h
--- a/src/math/polynomial/linear_eq_solver.h
+++ b/src/math/polynomial/linear_eq_solver.h
--- a/src/math/polynomial/polynomial.cpp
+++ b/src/math/polynomial/polynomial.cpp
--- a/src/math/polynomial/polynomial.h
+++ b/src/math/polynomial/polynomial.h
--- a/src/math/polynomial/polynomial_cache.cpp
+++ b/src/math/polynomial/polynomial_cache.cpp
--- a/src/math/polynomial/polynomial_cache.h
+++ b/src/math/polynomial/polynomial_cache.h
--- a/src/math/polynomial/polynomial_factorization.cpp
+++ b/src/math/polynomial/polynomial_factorization.cpp
--- a/src/math/polynomial/polynomial_factorization.h
+++ b/src/math/polynomial/polynomial_factorization.h
--- a/src/math/polynomial/polynomial_primes.h
+++ b/src/math/polynomial/polynomial_primes.h
--- a/src/math/polynomial/polynomial_var2value.h
+++ b/src/math/polynomial/polynomial_var2value.h
--- a/src/math/polynomial/rpolynomial.cpp
+++ b/src/math/polynomial/rpolynomial.cpp
--- a/src/math/polynomial/rpolynomial.h
+++ b/src/math/polynomial/rpolynomial.h
--- a/src/math/polynomial/sexpr2upolynomial.cpp
+++ b/src/math/polynomial/sexpr2upolynomial.cpp
--- a/src/math/polynomial/sexpr2upolynomial.h
+++ b/src/math/polynomial/sexpr2upolynomial.h
--- a/src/math/polynomial/upolynomial.cpp
+++ b/src/math/polynomial/upolynomial.cpp
--- a/src/math/polynomial/upolynomial.h
+++ b/src/math/polynomial/upolynomial.h
--- a/src/math/polynomial/upolynomial_factorization.cpp
+++ b/src/math/polynomial/upolynomial_factorization.cpp
--- a/src/math/polynomial/upolynomial_factorization.h
+++ b/src/math/polynomial/upolynomial_factorization.h
--- a/src/math/polynomial/upolynomial_factorization_int.h
+++ b/src/math/polynomial/upolynomial_factorization_int.h
--- a/src/math/subpaving/subpaving.cpp
+++ b/src/math/subpaving/subpaving.cpp
--- a/src/math/subpaving/subpaving.h
+++ b/src/math/subpaving/subpaving.h
--- a/src/math/subpaving/subpaving_hwf.cpp
+++ b/src/math/subpaving/subpaving_hwf.cpp
--- a/src/math/subpaving/subpaving_hwf.h
+++ b/src/math/subpaving/subpaving_hwf.h
--- a/src/math/subpaving/subpaving_mpf.cpp
+++ b/src/math/subpaving/subpaving_mpf.cpp
--- a/src/math/subpaving/subpaving_mpf.h
+++ b/src/math/subpaving/subpaving_mpf.h
--- a/src/math/subpaving/subpaving_mpff.cpp
+++ b/src/math/subpaving/subpaving_mpff.cpp
--- a/src/math/subpaving/subpaving_mpff.h
+++ b/src/math/subpaving/subpaving_mpff.h
--- a/src/math/subpaving/subpaving_mpfx.cpp
+++ b/src/math/subpaving/subpaving_mpfx.cpp
--- a/src/math/subpaving/subpaving_mpfx.h
+++ b/src/math/subpaving/subpaving_mpfx.h
--- a/src/math/subpaving/subpaving_mpq.cpp
+++ b/src/math/subpaving/subpaving_mpq.cpp
--- a/src/math/subpaving/subpaving_mpq.h
+++ b/src/math/subpaving/subpaving_mpq.h
--- a/src/math/subpaving/subpaving_t.h
+++ b/src/math/subpaving/subpaving_t.h
--- a/src/math/subpaving/subpaving_t_def.h
+++ b/src/math/subpaving/subpaving_t_def.h
--- a/src/math/subpaving/subpaving_types.h
+++ b/src/math/subpaving/subpaving_types.h
--- a/src/math/subpaving/tactic/expr2subpaving.cpp
+++ b/src/math/subpaving/tactic/expr2subpaving.cpp
--- a/src/math/subpaving/tactic/expr2subpaving.h
+++ b/src/math/subpaving/tactic/expr2subpaving.h
--- a/src/math/subpaving/tactic/subpaving_tactic.cpp
+++ b/src/math/subpaving/tactic/subpaving_tactic.cpp
--- a/src/math/subpaving/tactic/subpaving_tactic.h
+++ b/src/math/subpaving/tactic/subpaving_tactic.h
--- a/src/nlsat/tactic/goal2nlsat.cpp
+++ b/src/nlsat/tactic/goal2nlsat.cpp
--- a/src/nlsat/tactic/goal2nlsat.h
+++ b/src/nlsat/tactic/goal2nlsat.h
--- a/src/nlsat/tactic/nlsat_tactic.cpp
+++ b/src/nlsat/tactic/nlsat_tactic.cpp
--- a/src/nlsat/tactic/nlsat_tactic.h
+++ b/src/nlsat/tactic/nlsat_tactic.h
--- a/src/nlsat/tactic/qfnra_nlsat_tactic.cpp
+++ b/src/nlsat/tactic/qfnra_nlsat_tactic.cpp
--- a/src/nlsat/tactic/qfnra_nlsat_tactic.h
+++ b/src/nlsat/tactic/qfnra_nlsat_tactic.h
--- a/src/sat/strategy/assertion_set2sat.cpp
+++ b/src/sat/strategy/assertion_set2sat.cpp
--- a/src/sat/strategy/assertion_set2sat.h
+++ b/src/sat/strategy/assertion_set2sat.h
--- a/src/sat/strategy/sat_solver_strategy.cpp
+++ b/src/sat/strategy/sat_solver_strategy.cpp
--- a/src/sat/strategy/sat_solver_strategy.h
+++ b/src/sat/strategy/sat_solver_strategy.h
--- a/src/sat/tactic/atom2bool_var.cpp
+++ b/src/sat/tactic/atom2bool_var.cpp
--- a/src/sat/tactic/atom2bool_var.h
+++ b/src/sat/tactic/atom2bool_var.h
--- a/src/sat/tactic/goal2sat.cpp
+++ b/src/sat/tactic/goal2sat.cpp
--- a/src/sat/tactic/goal2sat.h
+++ b/src/sat/tactic/goal2sat.h
--- a/src/sat/tactic/sat_tactic.cpp
+++ b/src/sat/tactic/sat_tactic.cpp
--- a/src/sat/tactic/sat_tactic.h
+++ b/src/sat/tactic/sat_tactic.h
--- a/src/smt/tactic/smt_tactic.cpp
+++ b/src/smt/tactic/smt_tactic.cpp
--- a/src/smt/tactic/smt_tactic.h
+++ b/src/smt/tactic/smt_tactic.h
--- a/src/smt/user_plugin/user_decl_plugin.cpp
+++ b/src/smt/user_plugin/user_decl_plugin.cpp
--- a/src/smt/user_plugin/user_decl_plugin.h
+++ b/src/smt/user_plugin/user_decl_plugin.h
--- a/src/smt/user_plugin/user_simplifier_plugin.cpp
+++ b/src/smt/user_plugin/user_simplifier_plugin.cpp
--- a/src/smt/user_plugin/user_simplifier_plugin.h
+++ b/src/smt/user_plugin/user_simplifier_plugin.h
--- a/src/smt/user_plugin/user_smt_theory.cpp
+++ b/src/smt/user_plugin/user_smt_theory.cpp
--- a/src/smt/user_plugin/user_smt_theory.h
+++ b/src/smt/user_plugin/user_smt_theory.h
--- a/src/test/fuzzing/expr_delta.cpp
+++ b/src/test/fuzzing/expr_delta.cpp
--- a/src/test/fuzzing/expr_delta.h
+++ b/src/test/fuzzing/expr_delta.h
--- a/src/test/fuzzing/expr_rand.cpp
+++ b/src/test/fuzzing/expr_rand.cpp
--- a/Show more
+++ b/Show more