create sub-folder in tests

hlefebvr · Nov 24, 2024 · 54b77cb · 54b77cb
1 parent 382cc89
commit 54b77cb
Show file tree

Hide file tree

Showing 27 changed files with 61 additions and 59 deletions.
diff --git a/lib/src/mixed-integer/modeling/models/Dualizer.cpp b/lib/src/mixed-integer/modeling/models/Dualizer.cpp
@@ -7,6 +7,7 @@
 #include "idol/mixed-integer/modeling/expressions/operations/operators.h"
 #include "idol/mixed-integer/modeling/constraints/TempQCtr.h"
 #include "idol/mixed-integer/modeling/variables/TempVar.h"
+#include <cassert>
 
 idol::Dualizer::Dualizer(const idol::Model &t_parent,
                          const QuadExpr<Var, double> &t_primal_objective,

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -32,7 +32,4 @@ file(COPY ${CMAKE_SOURCE_DIR}/tests/data DESTINATION ${CMAKE_BINARY_DIR}/tests/)
 file(COPY ${CMAKE_SOURCE_DIR}/tests/data DESTINATION ${CMAKE_BINARY_DIR}/) # Necessary for GitHub Actions
 
 # Define tests
-add_subdirectory(modeling)
-add_subdirectory(wrappers)
-add_subdirectory(branch-and-bound)
-add_subdirectory(branch-and-price)
+add_subdirectory(mixed-integer)
diff --git a/tests/mixed-integer/CMakeLists.txt b/tests/mixed-integer/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(branch-and-bound)
+add_subdirectory(branch-and-price)
+add_subdirectory(modeling)
+add_subdirectory(wrappers)
diff --git a/tests/branch-and-bound/CMakeLists.txt → ...d-integer/branch-and-bound/CMakeLists.txt b/tests/branch-and-bound/CMakeLists.txt → ...d-integer/branch-and-bound/CMakeLists.txt
@@ -5,7 +5,7 @@ foreach (OPTIMIZER ${AVAILABLE_MILP_SOLVERS})
 
     add_executable(${target_name}
             knapsack.cpp
-            ../cartesian_product.h
+            ../../cartesian_product.h
     )
 
     target_compile_definitions(${target_name} PRIVATE OPTIMIZER=${OPTIMIZER})
@@ -20,7 +20,7 @@ foreach (OPTIMIZER ${AVAILABLE_MILP_SOLVERS})
 
     add_executable(${target_name}
             location.cpp
-            ../cartesian_product.h
+            ../../cartesian_product.h
     )
 
     target_compile_definitions(${target_name} PRIVATE OPTIMIZER=${OPTIMIZER})

diff --git a/tests/branch-and-bound/knapsack.cpp → ...xed-integer/branch-and-bound/knapsack.cpp b/tests/branch-and-bound/knapsack.cpp → ...xed-integer/branch-and-bound/knapsack.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <catch2/catch_all.hpp>
-#include "../cartesian_product.h"
+#include "../../cartesian_product.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/DepthFirst.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/BreadthFirst.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/BestBound.h"
@@ -14,13 +14,13 @@
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/UniformlyRandom.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/StrongBranching.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/PseudoCost.h"
-#include <idol/modeling.h>
-#include <idol/mixed-integer/problems/knapsack-problem/KP_Instance.h>
-#include <idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h>
-#include <idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h>
-#include <idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h>
-#include <idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h>
-#include <idol/mixed-integer/optimizers/wrappers/Osi/Osi.h>
+#include "idol/modeling.h"
+#include "idol/mixed-integer/problems/knapsack-problem/KP_Instance.h"
+#include "idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h"
+#include "idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h"
+#include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
+#include "idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h"
+#include "idol/mixed-integer/optimizers/wrappers/Osi/Osi.h"
 
 using namespace Catch::literals;
 using namespace idol;
@@ -60,7 +60,7 @@ TEMPLATE_LIST_TEST_CASE("Solve Knapsack Problem instances with different node se
     );
     const auto subtree_depth = GENERATE(0, 1);
 
-    const auto instance = read_instance("../data/knapsack-problem/" + filename);
+    const auto instance = read_instance("../../data/knapsack-problem/" + filename);
     const unsigned int n_items = instance.n_items();
 
     auto x = Var::make_vector(env, Dim<1>(n_items), 0., 1., Binary, 0., "x");

diff --git a/tests/branch-and-bound/location.cpp → ...xed-integer/branch-and-bound/location.cpp b/tests/branch-and-bound/location.cpp → ...xed-integer/branch-and-bound/location.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <catch2/catch_all.hpp>
-#include "../cartesian_product.h"
+#include "../../cartesian_product.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/DepthFirst.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/BreadthFirst.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/BestBound.h"
@@ -14,13 +14,13 @@
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/UniformlyRandom.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/StrongBranching.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/PseudoCost.h"
-#include <idol/modeling.h>
-#include <idol/mixed-integer/problems/facility-location-problem/FLP_Instance.h>
-#include <idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h>
-#include <idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h>
-#include <idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h>
-#include <idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h>
-#include <idol/mixed-integer/optimizers/wrappers/Osi/Osi.h>
+#include "idol/modeling.h"
+#include "idol/mixed-integer/problems/facility-location-problem/FLP_Instance.h"
+#include "idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h"
+#include "idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h"
+#include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
+#include "idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h"
+#include "idol/mixed-integer/optimizers/wrappers/Osi/Osi.h"
 
 using namespace Catch::literals;
 using namespace idol;
@@ -64,7 +64,7 @@ TEMPLATE_LIST_TEST_CASE("Solve Facility Location Problem instances with differen
     const auto subtree_depth = GENERATE(0, 1);
 
     // Read instance
-    const auto instance = read_instance_1991_Cornuejols_et_al("../data/facility-location-problem/" + filename);
+    const auto instance = read_instance_1991_Cornuejols_et_al("../../data/facility-location-problem/" + filename);
     const unsigned int n_customers = instance.n_customers();
     const unsigned int n_facilities = instance.n_facilities();
 

diff --git a/tests/branch-and-price/CMakeLists.txt → ...d-integer/branch-and-price/CMakeLists.txt b/tests/branch-and-price/CMakeLists.txt → ...d-integer/branch-and-price/CMakeLists.txt
@@ -5,7 +5,7 @@ foreach (OPTIMIZER ${AVAILABLE_MILP_SOLVERS})
 
     add_executable(${target_name}
             assignment.cpp
-            ../cartesian_product.h
+            ../../cartesian_product.h
     )
 
     target_compile_definitions(${target_name} PRIVATE OPTIMIZER=${OPTIMIZER})

diff --git a/tests/branch-and-price/assignment.cpp → ...d-integer/branch-and-price/assignment.cpp b/tests/branch-and-price/assignment.cpp → ...d-integer/branch-and-price/assignment.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <catch2/catch_all.hpp>
-#include "../cartesian_product.h"
+#include "../../cartesian_product.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/node-selection-rules/factories/BestBound.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/BranchAndBound.h"
 #include "idol/mixed-integer/optimizers/branch-and-bound/branching-rules/factories/MostInfeasible.h"
@@ -12,13 +12,13 @@
 #include "idol/mixed-integer/optimizers/dantzig-wolfe/infeasibility-strategies/FarkasPricing.h"
 #include "idol/mixed-integer/optimizers/dantzig-wolfe/stabilization/Neame.h"
 #include "idol/mixed-integer/optimizers/dantzig-wolfe/infeasibility-strategies/ArtificialCosts.h"
-#include <idol/modeling.h>
-#include <idol/mixed-integer/problems/generalized-assignment-problem/GAP_Instance.h>
-#include <idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h>
-#include <idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h>
-#include <idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h>
-#include <idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h>
-#include <idol/mixed-integer/optimizers/wrappers/Osi/Osi.h>
+#include "idol/modeling.h"
+#include "idol/mixed-integer/problems/generalized-assignment-problem/GAP_Instance.h"
+#include "idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h"
+#include "idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h"
+#include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
+#include "idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h"
+#include "idol/mixed-integer/optimizers/wrappers/Osi/Osi.h"
 
 using namespace Catch::literals;
 using namespace idol;
@@ -47,7 +47,7 @@ TEST_CASE("Solve Generalized Assignment Problem instances with different branch-
     const auto subtree_depth = GENERATE(0, 1);
     const auto solver_index = GENERATE(0, 1, 2);
 
-    const auto instance = read_instance("../data/generalized-assignment-problem/" + filename);
+    const auto instance = read_instance("../../data/generalized-assignment-problem/" + filename);
     const unsigned int n_agents = instance.n_agents();
     const unsigned int n_jobs = instance.n_jobs();
 

diff --git a/tests/modeling/CMakeLists.txt → tests/mixed-integer/modeling/CMakeLists.txt b/tests/modeling/CMakeLists.txt → tests/mixed-integer/modeling/CMakeLists.txt
diff --git a/tests/modeling/Expr.operators-type.cpp → ...-integer/modeling/Expr.operators-type.cpp b/tests/modeling/Expr.operators-type.cpp → ...-integer/modeling/Expr.operators-type.cpp
@@ -2,7 +2,7 @@
 // Created by henri on 31/01/23.
 //
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/modeling/Model.add-by-column.cpp → ...-integer/modeling/Model.add-by-column.cpp b/tests/modeling/Model.add-by-column.cpp → ...-integer/modeling/Model.add-by-column.cpp
@@ -2,7 +2,7 @@
 // Created by henri on 30/11/22.
 //
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/modeling/Model.add-by-row.cpp → ...xed-integer/modeling/Model.add-by-row.cpp b/tests/modeling/Model.add-by-row.cpp → ...xed-integer/modeling/Model.add-by-row.cpp
@@ -2,7 +2,7 @@
 // Created by henri on 30/11/22.
 //
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/modeling/Model.update-variable.cpp → ...nteger/modeling/Model.update-variable.cpp b/tests/modeling/Model.update-variable.cpp → ...nteger/modeling/Model.update-variable.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/modeling/QuadExpr.rotated-cone.cpp → ...nteger/modeling/QuadExpr.rotated-cone.cpp b/tests/modeling/QuadExpr.rotated-cone.cpp → ...nteger/modeling/QuadExpr.rotated-cone.cpp
@@ -5,7 +5,7 @@
 #ifdef IDOL_USE_EIGEN
 
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/wrappers/CMakeLists.txt → tests/mixed-integer/wrappers/CMakeLists.txt b/tests/wrappers/CMakeLists.txt → tests/mixed-integer/wrappers/CMakeLists.txt
diff --git a/tests/wrappers/Gurobi/CMakeLists.txt → ...ed-integer/wrappers/Gurobi/CMakeLists.txt b/tests/wrappers/Gurobi/CMakeLists.txt → ...ed-integer/wrappers/Gurobi/CMakeLists.txt
diff --git a/...Gurobi.create-constraint-with-backend.cpp → ...Gurobi.create-constraint-with-backend.cpp b/...Gurobi.create-constraint-with-backend.cpp → ...Gurobi.create-constraint-with-backend.cpp
@@ -4,7 +4,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...obi.create-constraint-without-backend.cpp → ...obi.create-constraint-without-backend.cpp b/...obi.create-constraint-without-backend.cpp → ...obi.create-constraint-without-backend.cpp
@@ -4,7 +4,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...-variable-and-constraint-with-backend.cpp → ...-variable-and-constraint-with-backend.cpp b/...-variable-and-constraint-with-backend.cpp → ...-variable-and-constraint-with-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...i/Gurobi.create-variable-with-backend.cpp → ...i/Gurobi.create-variable-with-backend.cpp b/...i/Gurobi.create-variable-with-backend.cpp → ...i/Gurobi.create-variable-with-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...urobi.create-variable-without-backend.cpp → ...urobi.create-variable-without-backend.cpp b/...urobi.create-variable-without-backend.cpp → ...urobi.create-variable-without-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...Gurobi.update-constraint-with-backend.cpp → ...Gurobi.update-constraint-with-backend.cpp b/...Gurobi.update-constraint-with-backend.cpp → ...Gurobi.update-constraint-with-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/.../Gurobi.update-objective-with-backend.cpp → .../Gurobi.update-objective-with-backend.cpp b/.../Gurobi.update-objective-with-backend.cpp → .../Gurobi.update-objective-with-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/...i/Gurobi.update-variable-with-backend.cpp → ...i/Gurobi.update-variable-with-backend.cpp b/...i/Gurobi.update-variable-with-backend.cpp → ...i/Gurobi.update-variable-with-backend.cpp
@@ -5,7 +5,7 @@
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
 #include "idol/mixed-integer/optimizers/wrappers/Gurobi/Optimizers_Gurobi.h"
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
+#include "idol/modeling.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/wrappers/all/CMakeLists.txt → ...mixed-integer/wrappers/all/CMakeLists.txt b/tests/wrappers/all/CMakeLists.txt → ...mixed-integer/wrappers/all/CMakeLists.txt
diff --git a/tests/wrappers/all/toy_lp.cpp → tests/mixed-integer/wrappers/all/toy_lp.cpp b/tests/wrappers/all/toy_lp.cpp → tests/mixed-integer/wrappers/all/toy_lp.cpp
@@ -2,12 +2,12 @@
 // Created by henri on 22.10.23.
 //
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
-#include <idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h>
-#include <idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h>
-#include <idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h>
-#include <idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h>
-#include <idol/mixed-integer/optimizers/wrappers/Osi/Osi.h>
+#include "idol/modeling.h"
+#include "idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h"
+#include "idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h"
+#include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
+#include "idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h"
+#include "idol/mixed-integer/optimizers/wrappers/Osi/Osi.h"
 
 using namespace Catch::literals;
 using namespace idol;

diff --git a/tests/wrappers/all/toy_milp.cpp → ...s/mixed-integer/wrappers/all/toy_milp.cpp b/tests/wrappers/all/toy_milp.cpp → ...s/mixed-integer/wrappers/all/toy_milp.cpp
@@ -2,12 +2,12 @@
 // Created by henri on 22.10.23.
 //
 #include <catch2/catch_all.hpp>
-#include <idol/modeling.h>
-#include <idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h>
-#include <idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h>
-#include <idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h>
-#include <idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h>
-#include <idol/mixed-integer/optimizers/wrappers/Osi/Osi.h>
+#include "idol/modeling.h"
+#include "idol/mixed-integer/optimizers/wrappers/GLPK/GLPK.h"
+#include "idol/mixed-integer/optimizers/wrappers/Mosek/Mosek.h"
+#include "idol/mixed-integer/optimizers/wrappers/Gurobi/Gurobi.h"
+#include "idol/mixed-integer/optimizers/wrappers/HiGHS/HiGHS.h"
+#include "idol/mixed-integer/optimizers/wrappers/Osi/Osi.h"
 
 using namespace Catch::literals;
 using namespace idol;