diff --git a/include/integration/simple_MC_integration.hpp b/include/integration/simple_MC_integration.hpp index 58739650d..75f60a1c0 100644 --- a/include/integration/simple_MC_integration.hpp +++ b/include/integration/simple_MC_integration.hpp @@ -16,16 +16,17 @@ #include #include #include -#include "convex_bodies/hpolytope.h" + #include "Eigen/Eigen" +#include "convex_bodies/hpolytope.h" #include "generators/known_polytope_generators.h" -#include "boost_random_number_generator.hpp" +#include "generators/boost_random_number_generator.hpp" #include "cartesian_geom/cartesian_kernel.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "misc.h" +#include "misc/misc.h" typedef double NT; typedef Cartesian Kernel; diff --git a/include/preprocess/min_sampling_covering_ellipsoid_rounding.hpp b/include/preprocess/min_sampling_covering_ellipsoid_rounding.hpp index 1e97835d9..0a2aba7c5 100644 --- a/include/preprocess/min_sampling_covering_ellipsoid_rounding.hpp +++ b/include/preprocess/min_sampling_covering_ellipsoid_rounding.hpp @@ -11,7 +11,7 @@ #define MIN_ELLIPSOID_ROUNDING_HPP #include -#include "khach.h" +#include "minimum_ellipsoid/khach.h" #include "sampling/random_point_generators.hpp" #include "volume/sampling_policies.hpp" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3bde869d2..a3f8f03d1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -153,7 +153,6 @@ if (USE_MKL) find_library(GFORTRAN NAME libgfortran.dylib PATHS /usr/local/Cellar/gcc/10.2.0_4/lib/gcc/10) find_library(LAPACK NAME liblapack.dylib PATHS /usr/lib) find_library(OPENMP NAME libiomp5.dylib PATHS /opt/intel/oneapi/compiler/2021.1.1/mac/compiler/lib) - include_directories (BEFORE ${MKLROOT}/include) set(PROJECT_LIBS ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} ${GFORTRAN_LIBRARIES}) set(MKL_LINK "-L${MKLROOT}/lib -Wl,-rpath,${MKLROOT}/lib -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl") @@ -163,21 +162,7 @@ else() endif(USE_MKL) include_directories (BEFORE ../external) -include_directories (BEFORE ../external/minimum_ellipsoid) -include_directories (BEFORE ../include/generators) -include_directories (BEFORE ../include/volume) include_directories (BEFORE ../include) -include_directories (BEFORE ../include/integration) -include_directories (BEFORE ../include/convex_bodies) -include_directories (BEFORE ../include/convex_bodies/spectrahedra) -include_directories (BEFORE ../include/annealing) -include_directories (BEFORE ../include/ode_solvers) -include_directories (BEFORE ../include/root_finders) -include_directories (BEFORE ../include/samplers) -include_directories (BEFORE ../include/lp_oracles) -include_directories (BEFORE ../include/nlp_oracles) -include_directories (BEFORE ../include/misc) -include_directories (BEFORE ../test) #for Eigen if (${CMAKE_VERSION} VERSION_LESS "3.12.0") diff --git a/test/benchmarks_cb.cpp b/test/benchmarks_cb.cpp index 5837109e3..6d6c95a6d 100644 --- a/test/benchmarks_cb.cpp +++ b/test/benchmarks_cb.cpp @@ -21,7 +21,7 @@ #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "exact_vols.h" +#include "volume/exact_vols.h" #include "generators/known_polytope_generators.h" int main() diff --git a/test/benchmarks_cg.cpp b/test/benchmarks_cg.cpp index d9c6964d9..4a6a91198 100644 --- a/test/benchmarks_cg.cpp +++ b/test/benchmarks_cg.cpp @@ -21,7 +21,7 @@ #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "exact_vols.h" +#include "volume/exact_vols.h" #include "generators/known_polytope_generators.h" int main() diff --git a/test/benchmarks_sob.cpp b/test/benchmarks_sob.cpp index 5fe46e209..44350a1c2 100644 --- a/test/benchmarks_sob.cpp +++ b/test/benchmarks_sob.cpp @@ -21,7 +21,7 @@ #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "exact_vols.h" +#include "volume/exact_vols.h" #include "generators/known_polytope_generators.h" int main() diff --git a/test/boundary_oracles_test.cpp b/test/boundary_oracles_test.cpp index 62cbdf86e..b0a043602 100755 --- a/test/boundary_oracles_test.cpp +++ b/test/boundary_oracles_test.cpp @@ -22,10 +22,11 @@ #include "Eigen/Eigen" #include "doctest.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" +#include +#include +#include +#include + #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" diff --git a/test/logconcave_sampling_test.cpp b/test/logconcave_sampling_test.cpp index 1f67b2851..f0f7fab97 100644 --- a/test/logconcave_sampling_test.cpp +++ b/test/logconcave_sampling_test.cpp @@ -23,13 +23,15 @@ #include "doctest.h" #include "Eigen/Eigen" -#include "ode_solvers.hpp" + +#include +#include +#include +#include + +#include "ode_solvers/ode_solvers.hpp" #include "diagnostics/diagnostics.hpp" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" diff --git a/test/max_ellipsoid_rounding_test.cpp b/test/max_ellipsoid_rounding_test.cpp index 086dcabe5..a9c25b8c1 100644 --- a/test/max_ellipsoid_rounding_test.cpp +++ b/test/max_ellipsoid_rounding_test.cpp @@ -8,11 +8,13 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" @@ -22,7 +24,7 @@ #include "preprocess/max_inscribed_ellipsoid_rounding.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/mcmc_diagnostics_test.cpp b/test/mcmc_diagnostics_test.cpp index 4d303004b..93f4cbbb6 100644 --- a/test/mcmc_diagnostics_test.cpp +++ b/test/mcmc_diagnostics_test.cpp @@ -10,18 +10,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" #include "sampling/sampling.hpp" #include "diagnostics/effective_sample_size.hpp" diff --git a/test/new_rounding_test.cpp b/test/new_rounding_test.cpp index b3f6a2adf..87c63a32a 100644 --- a/test/new_rounding_test.cpp +++ b/test/new_rounding_test.cpp @@ -8,12 +8,13 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" @@ -24,7 +25,7 @@ #include "preprocess/max_inscribed_ellipsoid_rounding.hpp" #include "preprocess/svd_rounding.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/new_volume_example.cpp b/test/new_volume_example.cpp index 205316559..b2838f04e 100644 --- a/test/new_volume_example.cpp +++ b/test/new_volume_example.cpp @@ -10,10 +10,14 @@ #include "Eigen/Eigen" //#define VOLESTI_DEBUG #include + + #include -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" +#include +#include +#include + + #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" @@ -21,7 +25,7 @@ #include "misc/misc.h" #include "misc/linear_extensions.h" #include "sampling/sampling.hpp" -#include "exact_vols.h" +#include "volume/exact_vols.h" #include "generators/known_polytope_generators.h" #include "generators/z_polytopes_generators.h" diff --git a/test/ode_solvers_test.cpp b/test/ode_solvers_test.cpp index 735afdef0..4a82472d8 100644 --- a/test/ode_solvers_test.cpp +++ b/test/ode_solvers_test.cpp @@ -18,17 +18,19 @@ #include #include -#include "Eigen/Eigen" #include "doctest.h" +#include "Eigen/Eigen" + +#include +#include +#include +#include + #include "generators/known_polytope_generators.h" -#include "ode_solvers.hpp" +#include "ode_solvers/ode_solvers.hpp" #include "preprocess/crhmc/crhmc_input.h" #include "preprocess/crhmc/crhmc_problem.h" -#include "random.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_int.hpp" -#include "random/uniform_real_distribution.hpp" #include "random_walks/random_walks.hpp" #include "volume/volume_cooling_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" diff --git a/test/order_polytope.cpp b/test/order_polytope.cpp index ddc7b54f3..e2ad4300d 100644 --- a/test/order_polytope.cpp +++ b/test/order_polytope.cpp @@ -11,12 +11,19 @@ #include "doctest.h" #include #include + + +#include +#include +#include +#include + #include "cartesian_geom/cartesian_kernel.h" #include "cartesian_geom/point.h" -#include "poset.h" -#include "orderpolytope.h" -#include "misc.h" -#include "random.hpp" +#include "convex_bodies/orderpolytope.h" +#include "misc/poset.h" +#include "misc/misc.h" + template diff --git a/test/sampling_test.cpp b/test/sampling_test.cpp index 3831e1ea4..8e82e5818 100644 --- a/test/sampling_test.cpp +++ b/test/sampling_test.cpp @@ -11,16 +11,19 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" #include "sampling/sampling.hpp" #include "diagnostics/univariate_psrf.hpp" diff --git a/test/simple_mc_integration.cpp b/test/simple_mc_integration.cpp index ca633f8f6..c1b6b9ecd 100644 --- a/test/simple_mc_integration.cpp +++ b/test/simple_mc_integration.cpp @@ -10,18 +10,20 @@ // Link to the Latte-Integrale Software: https://www.math.ucdavis.edu/~latte/software.php // Link to the tests: https://github.com/surajchoubey/latte-integrale-checks +#include +#include +#include + #include "doctest.h" -#include "simple_MC_integration.hpp" + #include "Eigen/Eigen" -#include +#include "integration/simple_MC_integration.hpp" #include "cartesian_geom/cartesian_kernel.h" #include "convex_bodies/hpolytope.h" #include "generators/known_polytope_generators.h" #include "ode_solvers/oracle_functors.hpp" #include "random_walks/random_walks.hpp" -#include -#include -#include "misc.h" +#include "misc/misc.h" template NT exp_normsq(Point X) { diff --git a/test/volume_cb_hpolytope.cpp b/test/volume_cb_hpolytope.cpp index cd0df2d83..e938cc255 100644 --- a/test/volume_cb_hpolytope.cpp +++ b/test/volume_cb_hpolytope.cpp @@ -10,18 +10,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/volume_cb_vpoly_intersection_vpoly.cpp b/test/volume_cb_vpoly_intersection_vpoly.cpp index a9f7d9cb6..204a560bf 100644 --- a/test/volume_cb_vpoly_intersection_vpoly.cpp +++ b/test/volume_cb_vpoly_intersection_vpoly.cpp @@ -8,20 +8,22 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" -#include "v_polytopes_generators.h" +#include "generators/known_polytope_generators.h" +#include "generators/v_polytopes_generators.h" template NT factorial(NT n) diff --git a/test/volume_cb_vpolytope.cpp b/test/volume_cb_vpolytope.cpp index eb32dd4dc..7b261ac18 100644 --- a/test/volume_cb_vpolytope.cpp +++ b/test/volume_cb_vpolytope.cpp @@ -8,18 +8,21 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/volume_cb_zonotopes.cpp b/test/volume_cb_zonotopes.cpp index 77bc6db20..a6b40d7d3 100644 --- a/test/volume_cb_zonotopes.cpp +++ b/test/volume_cb_zonotopes.cpp @@ -8,12 +8,13 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" @@ -21,8 +22,8 @@ #include "volume/volume_cooling_balls.hpp" #include "volume/volume_cooling_hpoly.hpp" -#include "exact_vols.h" -#include "z_polytopes_generators.h" +#include "volume/exact_vols.h" +#include "generators/z_polytopes_generators.h" template NT factorial(NT n) diff --git a/test/volume_cg_hpolytope.cpp b/test/volume_cg_hpolytope.cpp index 2d2f5bb97..2e9060e45 100644 --- a/test/volume_cg_hpolytope.cpp +++ b/test/volume_cg_hpolytope.cpp @@ -8,18 +8,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/volume_cg_vpolytope.cpp b/test/volume_cg_vpolytope.cpp index 7809199ff..eac97d976 100644 --- a/test/volume_cg_vpolytope.cpp +++ b/test/volume_cg_vpolytope.cpp @@ -8,18 +8,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/volume_sob_hpolytope.cpp b/test/volume_sob_hpolytope.cpp index 18fa28bb0..0d2ea5c85 100644 --- a/test/volume_sob_hpolytope.cpp +++ b/test/volume_sob_hpolytope.cpp @@ -8,18 +8,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n) diff --git a/test/volume_sob_vpolytope.cpp b/test/volume_sob_vpolytope.cpp index 41b963be2..76b3c784a 100644 --- a/test/volume_sob_vpolytope.cpp +++ b/test/volume_sob_vpolytope.cpp @@ -8,18 +8,20 @@ #include "doctest.h" #include #include -#include "misc.h" -#include "random.hpp" -#include "random/uniform_int.hpp" -#include "random/normal_distribution.hpp" -#include "random/uniform_real_distribution.hpp" + +#include +#include +#include +#include + +#include "misc/misc.h" #include "random_walks/random_walks.hpp" #include "volume/volume_sequence_of_balls.hpp" #include "volume/volume_cooling_gaussians.hpp" #include "volume/volume_cooling_balls.hpp" -#include "known_polytope_generators.h" +#include "generators/known_polytope_generators.h" template NT factorial(NT n)