From 54b77cb1c7901f280a8f1ed2b60b3f6933dee272 Mon Sep 17 00:00:00 2001 From: Henri Lefebvre Date: Sun, 24 Nov 2024 16:26:47 +0100 Subject: [PATCH] create sub-folder in tests --- .../mixed-integer/modeling/models/Dualizer.cpp | 1 + tests/CMakeLists.txt | 5 +---- tests/mixed-integer/CMakeLists.txt | 4 ++++ .../branch-and-bound/CMakeLists.txt | 4 ++-- .../branch-and-bound/knapsack.cpp | 18 +++++++++--------- .../branch-and-bound/location.cpp | 18 +++++++++--------- .../branch-and-price/CMakeLists.txt | 2 +- .../branch-and-price/assignment.cpp | 18 +++++++++--------- .../modeling/CMakeLists.txt | 0 .../modeling/Expr.operators-type.cpp | 2 +- .../modeling/Model.add-by-column.cpp | 2 +- .../modeling/Model.add-by-row.cpp | 2 +- .../modeling/Model.update-variable.cpp | 2 +- .../modeling/QuadExpr.rotated-cone.cpp | 2 +- .../wrappers/CMakeLists.txt | 0 .../wrappers/Gurobi/CMakeLists.txt | 0 .../Gurobi.create-constraint-with-backend.cpp | 2 +- ...urobi.create-constraint-without-backend.cpp | 2 +- ...te-variable-and-constraint-with-backend.cpp | 2 +- .../Gurobi.create-variable-with-backend.cpp | 2 +- .../Gurobi.create-variable-without-backend.cpp | 2 +- .../Gurobi.update-constraint-with-backend.cpp | 2 +- .../Gurobi.update-objective-with-backend.cpp | 2 +- .../Gurobi.update-variable-with-backend.cpp | 2 +- .../wrappers/all/CMakeLists.txt | 0 .../wrappers/all/toy_lp.cpp | 12 ++++++------ .../wrappers/all/toy_milp.cpp | 12 ++++++------ 27 files changed, 61 insertions(+), 59 deletions(-) create mode 100644 tests/mixed-integer/CMakeLists.txt rename tests/{ => mixed-integer}/branch-and-bound/CMakeLists.txt (90%) rename tests/{ => mixed-integer}/branch-and-bound/knapsack.cpp (86%) rename tests/{ => mixed-integer}/branch-and-bound/location.cpp (90%) rename tests/{ => mixed-integer}/branch-and-price/CMakeLists.txt (90%) rename tests/{ => mixed-integer}/branch-and-price/assignment.cpp (95%) rename tests/{ => mixed-integer}/modeling/CMakeLists.txt (100%) rename tests/{ => mixed-integer}/modeling/Expr.operators-type.cpp (99%) rename tests/{ => mixed-integer}/modeling/Model.add-by-column.cpp (99%) rename tests/{ => mixed-integer}/modeling/Model.add-by-row.cpp (99%) rename tests/{ => mixed-integer}/modeling/Model.update-variable.cpp (98%) rename tests/{ => mixed-integer}/modeling/QuadExpr.rotated-cone.cpp (99%) rename tests/{ => mixed-integer}/wrappers/CMakeLists.txt (100%) rename tests/{ => mixed-integer}/wrappers/Gurobi/CMakeLists.txt (100%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp (99%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp (99%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp (99%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp (99%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp (99%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp (98%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp (98%) rename tests/{ => mixed-integer}/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp (98%) rename tests/{ => mixed-integer}/wrappers/all/CMakeLists.txt (100%) rename tests/{ => mixed-integer}/wrappers/all/toy_lp.cpp (92%) rename tests/{ => mixed-integer}/wrappers/all/toy_milp.cpp (93%) diff --git a/lib/src/mixed-integer/modeling/models/Dualizer.cpp b/lib/src/mixed-integer/modeling/models/Dualizer.cpp index 6bf81c60..36984604 100644 --- 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 idol::Dualizer::Dualizer(const idol::Model &t_parent, const QuadExpr &t_primal_objective, diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a8c8f7c5..7653094b 100644 --- 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 new file mode 100644 index 00000000..c6c77ab4 --- /dev/null +++ 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) \ No newline at end of file diff --git a/tests/branch-and-bound/CMakeLists.txt b/tests/mixed-integer/branch-and-bound/CMakeLists.txt similarity index 90% rename from tests/branch-and-bound/CMakeLists.txt rename to tests/mixed-integer/branch-and-bound/CMakeLists.txt index 9ae0ebe8..61b003b3 100644 --- a/tests/branch-and-bound/CMakeLists.txt +++ b/tests/mixed-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 b/tests/mixed-integer/branch-and-bound/knapsack.cpp similarity index 86% rename from tests/branch-and-bound/knapsack.cpp rename to tests/mixed-integer/branch-and-bound/knapsack.cpp index 52d001e6..c221c013 100644 --- a/tests/branch-and-bound/knapsack.cpp +++ b/tests/mixed-integer/branch-and-bound/knapsack.cpp @@ -3,7 +3,7 @@ // #include -#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 -#include -#include -#include -#include -#include -#include +#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 b/tests/mixed-integer/branch-and-bound/location.cpp similarity index 90% rename from tests/branch-and-bound/location.cpp rename to tests/mixed-integer/branch-and-bound/location.cpp index 2c919a5b..aa9a18e1 100644 --- a/tests/branch-and-bound/location.cpp +++ b/tests/mixed-integer/branch-and-bound/location.cpp @@ -3,7 +3,7 @@ // #include -#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 -#include -#include -#include -#include -#include -#include +#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 b/tests/mixed-integer/branch-and-price/CMakeLists.txt similarity index 90% rename from tests/branch-and-price/CMakeLists.txt rename to tests/mixed-integer/branch-and-price/CMakeLists.txt index e96d56f3..b0623f48 100644 --- a/tests/branch-and-price/CMakeLists.txt +++ b/tests/mixed-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 b/tests/mixed-integer/branch-and-price/assignment.cpp similarity index 95% rename from tests/branch-and-price/assignment.cpp rename to tests/mixed-integer/branch-and-price/assignment.cpp index 5a618128..540a9629 100644 --- a/tests/branch-and-price/assignment.cpp +++ b/tests/mixed-integer/branch-and-price/assignment.cpp @@ -3,7 +3,7 @@ // #include -#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 -#include -#include -#include -#include -#include -#include +#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 b/tests/mixed-integer/modeling/CMakeLists.txt similarity index 100% rename from tests/modeling/CMakeLists.txt rename to tests/mixed-integer/modeling/CMakeLists.txt diff --git a/tests/modeling/Expr.operators-type.cpp b/tests/mixed-integer/modeling/Expr.operators-type.cpp similarity index 99% rename from tests/modeling/Expr.operators-type.cpp rename to tests/mixed-integer/modeling/Expr.operators-type.cpp index 25a3afcf..2b4abdea 100644 --- a/tests/modeling/Expr.operators-type.cpp +++ b/tests/mixed-integer/modeling/Expr.operators-type.cpp @@ -2,7 +2,7 @@ // Created by henri on 31/01/23. // #include -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/modeling/Model.add-by-column.cpp b/tests/mixed-integer/modeling/Model.add-by-column.cpp similarity index 99% rename from tests/modeling/Model.add-by-column.cpp rename to tests/mixed-integer/modeling/Model.add-by-column.cpp index 8e6cd4cf..31ecac32 100644 --- a/tests/modeling/Model.add-by-column.cpp +++ b/tests/mixed-integer/modeling/Model.add-by-column.cpp @@ -2,7 +2,7 @@ // Created by henri on 30/11/22. // #include -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/modeling/Model.add-by-row.cpp b/tests/mixed-integer/modeling/Model.add-by-row.cpp similarity index 99% rename from tests/modeling/Model.add-by-row.cpp rename to tests/mixed-integer/modeling/Model.add-by-row.cpp index f01e3042..72864741 100644 --- a/tests/modeling/Model.add-by-row.cpp +++ b/tests/mixed-integer/modeling/Model.add-by-row.cpp @@ -2,7 +2,7 @@ // Created by henri on 30/11/22. // #include -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/modeling/Model.update-variable.cpp b/tests/mixed-integer/modeling/Model.update-variable.cpp similarity index 98% rename from tests/modeling/Model.update-variable.cpp rename to tests/mixed-integer/modeling/Model.update-variable.cpp index 49f095de..4c00c078 100644 --- a/tests/modeling/Model.update-variable.cpp +++ b/tests/mixed-integer/modeling/Model.update-variable.cpp @@ -3,7 +3,7 @@ // #include -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/modeling/QuadExpr.rotated-cone.cpp b/tests/mixed-integer/modeling/QuadExpr.rotated-cone.cpp similarity index 99% rename from tests/modeling/QuadExpr.rotated-cone.cpp rename to tests/mixed-integer/modeling/QuadExpr.rotated-cone.cpp index 997bb7c3..4539028a 100644 --- a/tests/modeling/QuadExpr.rotated-cone.cpp +++ b/tests/mixed-integer/modeling/QuadExpr.rotated-cone.cpp @@ -5,7 +5,7 @@ #ifdef IDOL_USE_EIGEN #include -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/CMakeLists.txt b/tests/mixed-integer/wrappers/CMakeLists.txt similarity index 100% rename from tests/wrappers/CMakeLists.txt rename to tests/mixed-integer/wrappers/CMakeLists.txt diff --git a/tests/wrappers/Gurobi/CMakeLists.txt b/tests/mixed-integer/wrappers/Gurobi/CMakeLists.txt similarity index 100% rename from tests/wrappers/Gurobi/CMakeLists.txt rename to tests/mixed-integer/wrappers/Gurobi/CMakeLists.txt diff --git a/tests/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp similarity index 99% rename from tests/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp index 26f299b6..b00180d4 100644 --- a/tests/wrappers/Gurobi/Gurobi.create-constraint-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp similarity index 99% rename from tests/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp index 4db2db3d..f2bf9d78 100644 --- a/tests/wrappers/Gurobi/Gurobi.create-constraint-without-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/Gurobi.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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp similarity index 99% rename from tests/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp index 0cca474f..1cee8515 100644 --- a/tests/wrappers/Gurobi/Gurobi.create-variable-and-constraint-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp similarity index 99% rename from tests/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp index 7012bedd..5a1e65f1 100644 --- a/tests/wrappers/Gurobi/Gurobi.create-variable-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp similarity index 99% rename from tests/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp index e0c0530c..6692696f 100644 --- a/tests/wrappers/Gurobi/Gurobi.create-variable-without-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/Gurobi.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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp similarity index 98% rename from tests/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp index 090004d8..0157164e 100644 --- a/tests/wrappers/Gurobi/Gurobi.update-constraint-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp similarity index 98% rename from tests/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp index 5020bed4..bce90ff0 100644 --- a/tests/wrappers/Gurobi/Gurobi.update-objective-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp b/tests/mixed-integer/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp similarity index 98% rename from tests/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp rename to tests/mixed-integer/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp index 491d0645..cdcadfeb 100644 --- a/tests/wrappers/Gurobi/Gurobi.update-variable-with-backend.cpp +++ b/tests/mixed-integer/wrappers/Gurobi/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 -#include +#include "idol/modeling.h" using namespace Catch::literals; using namespace idol; diff --git a/tests/wrappers/all/CMakeLists.txt b/tests/mixed-integer/wrappers/all/CMakeLists.txt similarity index 100% rename from tests/wrappers/all/CMakeLists.txt rename to tests/mixed-integer/wrappers/all/CMakeLists.txt diff --git a/tests/wrappers/all/toy_lp.cpp b/tests/mixed-integer/wrappers/all/toy_lp.cpp similarity index 92% rename from tests/wrappers/all/toy_lp.cpp rename to tests/mixed-integer/wrappers/all/toy_lp.cpp index 5fc89df0..285293fd 100644 --- a/tests/wrappers/all/toy_lp.cpp +++ b/tests/mixed-integer/wrappers/all/toy_lp.cpp @@ -2,12 +2,12 @@ // Created by henri on 22.10.23. // #include -#include -#include -#include -#include -#include -#include +#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 b/tests/mixed-integer/wrappers/all/toy_milp.cpp similarity index 93% rename from tests/wrappers/all/toy_milp.cpp rename to tests/mixed-integer/wrappers/all/toy_milp.cpp index 4c76f93f..e24afa21 100644 --- a/tests/wrappers/all/toy_milp.cpp +++ b/tests/mixed-integer/wrappers/all/toy_milp.cpp @@ -2,12 +2,12 @@ // Created by henri on 22.10.23. // #include -#include -#include -#include -#include -#include -#include +#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;