reorganize src

hlefebvr · Oct 24, 2024 · bbd8655 · bbd8655
1 parent 5f22764
commit bbd8655
Show file tree

Hide file tree

Showing 73 changed files with 73 additions and 73 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
diff --git a/...g/bilevel-optimization/read_from_file.cpp → lib/src/bilevel/modeling/read_from_file.cpp b/...g/bilevel-optimization/read_from_file.cpp → lib/src/bilevel/modeling/read_from_file.cpp
diff --git a/...ng/bilevel-optimization/write_to_file.cpp → lib/src/bilevel/modeling/write_to_file.cpp b/...ng/bilevel-optimization/write_to_file.cpp → lib/src/bilevel/modeling/write_to_file.cpp
diff --git a/...level-optimization/wrappers/MibS/MibS.cpp → ...bilevel/optimizers/wrappers/MibS/MibS.cpp b/...level-optimization/wrappers/MibS/MibS.cpp → ...bilevel/optimizers/wrappers/MibS/MibS.cpp
diff --git a/...ization/wrappers/MibS/Optimizers_MibS.cpp → ...imizers/wrappers/MibS/Optimizers_MibS.cpp b/...ization/wrappers/MibS/Optimizers_MibS.cpp → ...imizers/wrappers/MibS/Optimizers_MibS.cpp
diff --git a/...zation/wrappers/MibS/impl_MibSFromAPI.cpp → ...mizers/wrappers/MibS/impl_MibSFromAPI.cpp b/...zation/wrappers/MibS/impl_MibSFromAPI.cpp → ...mizers/wrappers/MibS/impl_MibSFromAPI.cpp
diff --git a/...ation/wrappers/MibS/impl_MibSFromFile.cpp → ...izers/wrappers/MibS/impl_MibSFromFile.cpp b/...ation/wrappers/MibS/impl_MibSFromFile.cpp → ...izers/wrappers/MibS/impl_MibSFromFile.cpp
diff --git a/lib/src/optimizers/Algorithm.cpp → lib/src/general/optimizers/Algorithm.cpp b/lib/src/optimizers/Algorithm.cpp → lib/src/general/optimizers/Algorithm.cpp
diff --git a/lib/src/optimizers/Optimizer.cpp → lib/src/general/optimizers/Optimizer.cpp b/lib/src/optimizers/Optimizer.cpp → lib/src/general/optimizers/Optimizer.cpp
diff --git a/lib/src/optimizers/Timer.cpp → lib/src/general/optimizers/Timer.cpp b/lib/src/optimizers/Timer.cpp → lib/src/general/optimizers/Timer.cpp
diff --git a/lib/src/optimizers/logs.cpp → lib/src/general/optimizers/logs.cpp b/lib/src/optimizers/logs.cpp → lib/src/general/optimizers/logs.cpp
diff --git a/lib/src/containers/uuid.cpp → lib/src/general/utils/uuid.cpp b/lib/src/containers/uuid.cpp → lib/src/general/utils/uuid.cpp
diff --git a/.../modeling/annotations/impl_Annotation.cpp → .../modeling/annotations/impl_Annotation.cpp b/.../modeling/annotations/impl_Annotation.cpp → .../modeling/annotations/impl_Annotation.cpp
diff --git a/lib/src/modeling/constraints/Ctr.cpp → ...ixed-integer/modeling/constraints/Ctr.cpp b/lib/src/modeling/constraints/Ctr.cpp → ...ixed-integer/modeling/constraints/Ctr.cpp
diff --git a/lib/src/modeling/constraints/TempCtr.cpp → ...-integer/modeling/constraints/TempCtr.cpp b/lib/src/modeling/constraints/TempCtr.cpp → ...-integer/modeling/constraints/TempCtr.cpp
diff --git a/lib/src/modeling/expressions/Constant.cpp → ...integer/modeling/expressions/Constant.cpp b/lib/src/modeling/expressions/Constant.cpp → ...integer/modeling/expressions/Constant.cpp
diff --git a/...ling/expressions/operations/operators.cpp → ...ling/expressions/operations/operators.cpp b/...ling/expressions/operations/operators.cpp → ...ling/expressions/operations/operators.cpp
diff --git a/...essions/operations/operators_Constant.cpp → ...essions/operations/operators_Constant.cpp b/...essions/operations/operators_Constant.cpp → ...essions/operations/operators_Constant.cpp
diff --git a/.../expressions/operations/operators_Ctr.cpp → .../expressions/operations/operators_Ctr.cpp b/.../expressions/operations/operators_Ctr.cpp → .../expressions/operations/operators_Ctr.cpp
diff --git a/.../expressions/operations/operators_Var.cpp → .../expressions/operations/operators_Var.cpp b/.../expressions/operations/operators_Var.cpp → .../expressions/operations/operators_Var.cpp
diff --git a/lib/src/modeling/matrix/Column.cpp → .../mixed-integer/modeling/matrix/Column.cpp b/lib/src/modeling/matrix/Column.cpp → .../mixed-integer/modeling/matrix/Column.cpp
diff --git a/lib/src/modeling/matrix/Matrix.cpp → .../mixed-integer/modeling/matrix/Matrix.cpp b/lib/src/modeling/matrix/Matrix.cpp → .../mixed-integer/modeling/matrix/Matrix.cpp
diff --git a/...src/modeling/matrix/MatrixCoefficient.cpp → ...ger/modeling/matrix/MatrixCoefficient.cpp b/...src/modeling/matrix/MatrixCoefficient.cpp → ...ger/modeling/matrix/MatrixCoefficient.cpp
diff --git a/...ing/matrix/MatrixCoefficientReference.cpp → ...ing/matrix/MatrixCoefficientReference.cpp b/...ing/matrix/MatrixCoefficientReference.cpp → ...ing/matrix/MatrixCoefficientReference.cpp
diff --git a/lib/src/modeling/matrix/Row.cpp → ...src/mixed-integer/modeling/matrix/Row.cpp b/lib/src/modeling/matrix/Row.cpp → ...src/mixed-integer/modeling/matrix/Row.cpp
diff --git a/lib/src/modeling/models/KKT.cpp → ...src/mixed-integer/modeling/models/KKT.cpp b/lib/src/modeling/models/KKT.cpp → ...src/mixed-integer/modeling/models/KKT.cpp
diff --git a/lib/src/modeling/models/Model.cpp → ...c/mixed-integer/modeling/models/Model.cpp b/lib/src/modeling/models/Model.cpp → ...c/mixed-integer/modeling/models/Model.cpp
diff --git a/lib/src/modeling/objects/Env.cpp → ...rc/mixed-integer/modeling/objects/Env.cpp b/lib/src/modeling/objects/Env.cpp → ...rc/mixed-integer/modeling/objects/Env.cpp
diff --git a/lib/src/modeling/variables/Var.cpp → .../mixed-integer/modeling/variables/Var.cpp b/lib/src/modeling/variables/Var.cpp → .../mixed-integer/modeling/variables/Var.cpp
diff --git a/...ching-rules/factories/StrongBranching.cpp → ...ching-rules/factories/StrongBranching.cpp b/...ching-rules/factories/StrongBranching.cpp → ...ching-rules/factories/StrongBranching.cpp
diff --git a/...-rules/factories/StrongBranchingPhase.cpp → ...-rules/factories/StrongBranchingPhase.cpp b/...-rules/factories/StrongBranchingPhase.cpp → ...-rules/factories/StrongBranchingPhase.cpp
diff --git a/...ranch-and-bound/nodes/DefaultNodeInfo.cpp → ...ranch-and-bound/nodes/DefaultNodeInfo.cpp b/...ranch-and-bound/nodes/DefaultNodeInfo.cpp → ...ranch-and-bound/nodes/DefaultNodeInfo.cpp
diff --git a/...teger-optimization/callbacks/Callback.cpp → ...integer/optimizers/callbacks/Callback.cpp b/...teger-optimization/callbacks/Callback.cpp → ...integer/optimizers/callbacks/Callback.cpp
diff --git a/...-optimization/callbacks/CutSeparation.cpp → ...er/optimizers/callbacks/CutSeparation.cpp b/...-optimization/callbacks/CutSeparation.cpp → ...er/optimizers/callbacks/CutSeparation.cpp
diff --git a/...n/callbacks/heuristics/LocalBranching.cpp → ...s/callbacks/heuristics/LocalBranching.cpp b/...n/callbacks/heuristics/LocalBranching.cpp → ...s/callbacks/heuristics/LocalBranching.cpp
diff --git a/...ptimization/callbacks/heuristics/RENS.cpp → .../optimizers/callbacks/heuristics/RENS.cpp b/...ptimization/callbacks/heuristics/RENS.cpp → .../optimizers/callbacks/heuristics/RENS.cpp
diff --git a/...n/callbacks/heuristics/SimpleRounding.cpp → ...s/callbacks/heuristics/SimpleRounding.cpp b/...n/callbacks/heuristics/SimpleRounding.cpp → ...s/callbacks/heuristics/SimpleRounding.cpp
diff --git a/...zation/callbacks/watchers/PlotManager.cpp → ...mizers/callbacks/watchers/PlotManager.cpp b/...zation/callbacks/watchers/PlotManager.cpp → ...mizers/callbacks/watchers/PlotManager.cpp
diff --git a/...allbacks/watchers/Plots_OptimalityGap.cpp → ...allbacks/watchers/Plots_OptimalityGap.cpp b/...allbacks/watchers/Plots_OptimalityGap.cpp → ...allbacks/watchers/Plots_OptimalityGap.cpp
diff --git a/...zation/dantzig-wolfe/ColumnGeneration.cpp → ...mizers/dantzig-wolfe/ColumnGeneration.cpp b/...zation/dantzig-wolfe/ColumnGeneration.cpp → ...mizers/dantzig-wolfe/ColumnGeneration.cpp
diff --git a/...ntzig-wolfe/DantzigWolfeDecomposition.cpp → ...ntzig-wolfe/DantzigWolfeDecomposition.cpp b/...ntzig-wolfe/DantzigWolfeDecomposition.cpp → ...ntzig-wolfe/DantzigWolfeDecomposition.cpp
diff --git a/...ptimization/dantzig-wolfe/Formulation.cpp → .../optimizers/dantzig-wolfe/Formulation.cpp b/...ptimization/dantzig-wolfe/Formulation.cpp → .../optimizers/dantzig-wolfe/Formulation.cpp
diff --git a/.../Optimizers_DantzigWolfeDecomposition.cpp → .../Optimizers_DantzigWolfeDecomposition.cpp b/.../Optimizers_DantzigWolfeDecomposition.cpp → .../Optimizers_DantzigWolfeDecomposition.cpp
diff --git a/...optimization/dantzig-wolfe/SubProblem.cpp → ...r/optimizers/dantzig-wolfe/SubProblem.cpp b/...optimization/dantzig-wolfe/SubProblem.cpp → ...r/optimizers/dantzig-wolfe/SubProblem.cpp
diff --git a/...easibility-strategies/ArtificialCosts.cpp → ...easibility-strategies/ArtificialCosts.cpp b/...easibility-strategies/ArtificialCosts.cpp → ...easibility-strategies/ArtificialCosts.cpp
diff --git a/...ies/DantzigWolfeInfeasibilityStrategy.cpp → ...ies/DantzigWolfeInfeasibilityStrategy.cpp b/...ies/DantzigWolfeInfeasibilityStrategy.cpp → ...ies/DantzigWolfeInfeasibilityStrategy.cpp
diff --git a/...nfeasibility-strategies/FarkasPricing.cpp → ...nfeasibility-strategies/FarkasPricing.cpp b/...nfeasibility-strategies/FarkasPricing.cpp → ...nfeasibility-strategies/FarkasPricing.cpp
diff --git a/...-optimization/dantzig-wolfe/logs/Info.cpp → ...er/optimizers/dantzig-wolfe/logs/Info.cpp b/...-optimization/dantzig-wolfe/logs/Info.cpp → ...er/optimizers/dantzig-wolfe/logs/Info.cpp
diff --git a/...integer-optimization/padm/Formulation.cpp → ...d-integer/optimizers/padm/Formulation.cpp b/...integer-optimization/padm/Formulation.cpp → ...d-integer/optimizers/padm/Formulation.cpp
diff --git a/...ger-optimization/padm/Optimizers_PADM.cpp → ...teger/optimizers/padm/Optimizers_PADM.cpp b/...ger-optimization/padm/Optimizers_PADM.cpp → ...teger/optimizers/padm/Optimizers_PADM.cpp
diff --git a/.../mixed-integer-optimization/padm/PADM.cpp → ...rc/mixed-integer/optimizers/padm/PADM.cpp b/.../mixed-integer-optimization/padm/PADM.cpp → ...rc/mixed-integer/optimizers/padm/PADM.cpp
diff --git a/...teger-optimization/padm/PenaltyMethod.cpp → ...integer/optimizers/padm/PenaltyMethod.cpp b/...teger-optimization/padm/PenaltyMethod.cpp → ...integer/optimizers/padm/PenaltyMethod.cpp
diff --git a/...eger-optimization/padm/PenaltyUpdates.cpp → ...nteger/optimizers/padm/PenaltyUpdates.cpp b/...eger-optimization/padm/PenaltyUpdates.cpp → ...nteger/optimizers/padm/PenaltyUpdates.cpp
diff --git a/...-integer-optimization/padm/SubProblem.cpp → ...ed-integer/optimizers/padm/SubProblem.cpp b/...-integer-optimization/padm/SubProblem.cpp → ...ed-integer/optimizers/padm/SubProblem.cpp
diff --git a/...teger-optimization/wrappers/GLPK/GLPK.cpp → ...integer/optimizers/wrappers/GLPK/GLPK.cpp b/...teger-optimization/wrappers/GLPK/GLPK.cpp → ...integer/optimizers/wrappers/GLPK/GLPK.cpp
diff --git a/...ization/wrappers/GLPK/Optimizers_GLPK.cpp → ...imizers/wrappers/GLPK/Optimizers_GLPK.cpp b/...ization/wrappers/GLPK/Optimizers_GLPK.cpp → ...imizers/wrappers/GLPK/Optimizers_GLPK.cpp
diff --git a/...r-optimization/wrappers/Gurobi/Gurobi.cpp → ...ger/optimizers/wrappers/Gurobi/Gurobi.cpp b/...r-optimization/wrappers/Gurobi/Gurobi.cpp → ...ger/optimizers/wrappers/Gurobi/Gurobi.cpp
diff --git a/...ation/wrappers/Gurobi/GurobiCallbackI.cpp → ...izers/wrappers/Gurobi/GurobiCallbackI.cpp b/...ation/wrappers/Gurobi/GurobiCallbackI.cpp → ...izers/wrappers/Gurobi/GurobiCallbackI.cpp
diff --git a/...ion/wrappers/Gurobi/Optimizers_Gurobi.cpp → ...ers/wrappers/Gurobi/Optimizers_Gurobi.cpp b/...ion/wrappers/Gurobi/Optimizers_Gurobi.cpp → ...ers/wrappers/Gurobi/Optimizers_Gurobi.cpp
diff --git a/...ger-optimization/wrappers/HiGHS/HiGHS.cpp → ...teger/optimizers/wrappers/HiGHS/HiGHS.cpp b/...ger-optimization/wrappers/HiGHS/HiGHS.cpp → ...teger/optimizers/wrappers/HiGHS/HiGHS.cpp
diff --git a/...ation/wrappers/HiGHS/Optimizers_HiGHS.cpp → ...izers/wrappers/HiGHS/Optimizers_HiGHS.cpp b/...ation/wrappers/HiGHS/Optimizers_HiGHS.cpp → ...izers/wrappers/HiGHS/Optimizers_HiGHS.cpp
diff --git a/...ger-optimization/wrappers/Mosek/Mosek.cpp → ...teger/optimizers/wrappers/Mosek/Mosek.cpp b/...ger-optimization/wrappers/Mosek/Mosek.cpp → ...teger/optimizers/wrappers/Mosek/Mosek.cpp
diff --git a/...ization/wrappers/Mosek/MosekCallbackI.cpp → ...imizers/wrappers/Mosek/MosekCallbackI.cpp b/...ization/wrappers/Mosek/MosekCallbackI.cpp → ...imizers/wrappers/Mosek/MosekCallbackI.cpp
diff --git a/...ation/wrappers/Mosek/Optimizers_Mosek.cpp → ...izers/wrappers/Mosek/Optimizers_Mosek.cpp b/...ation/wrappers/Mosek/Optimizers_Mosek.cpp → ...izers/wrappers/Mosek/Optimizers_Mosek.cpp
diff --git a/...imization/wrappers/Osi/Optimizers_Osi.cpp → ...ptimizers/wrappers/Osi/Optimizers_Osi.cpp b/...imization/wrappers/Osi/Optimizers_Osi.cpp → ...ptimizers/wrappers/Osi/Optimizers_Osi.cpp
diff --git a/...integer-optimization/wrappers/Osi/Osi.cpp → ...d-integer/optimizers/wrappers/Osi/Osi.cpp b/...integer-optimization/wrappers/Osi/Osi.cpp → ...d-integer/optimizers/wrappers/Osi/Osi.cpp
diff --git a/...n/wrappers/Osi/OsiIdolSolverInterface.cpp → ...s/wrappers/Osi/OsiIdolSolverInterface.cpp b/...n/wrappers/Osi/OsiIdolSolverInterface.cpp → ...s/wrappers/Osi/OsiIdolSolverInterface.cpp
diff --git a/...acility-location-problem/FLP_Instance.cpp → ...acility-location-problem/FLP_Instance.cpp b/...acility-location-problem/FLP_Instance.cpp → ...acility-location-problem/FLP_Instance.cpp
diff --git a/...lized-assignment-problem/GAP_Instance.cpp → ...lized-assignment-problem/GAP_Instance.cpp b/...lized-assignment-problem/GAP_Instance.cpp → ...lized-assignment-problem/GAP_Instance.cpp
diff --git a/...problems/knapsack-problem/KP_Instance.cpp → ...problems/knapsack-problem/KP_Instance.cpp b/...problems/knapsack-problem/KP_Instance.cpp → ...problems/knapsack-problem/KP_Instance.cpp
diff --git a/...ultiple-knapsack-problem/MKP_Instance.cpp → ...ultiple-knapsack-problem/MKP_Instance.cpp b/...ultiple-knapsack-problem/MKP_Instance.cpp → ...ultiple-knapsack-problem/MKP_Instance.cpp
diff --git a/.../staff-rostering-problem/SRP_Instance.cpp → .../staff-rostering-problem/SRP_Instance.cpp b/.../staff-rostering-problem/SRP_Instance.cpp → .../staff-rostering-problem/SRP_Instance.cpp
diff --git a/tests/modeling/QuadExpr.rotated-cone.cpp b/tests/modeling/QuadExpr.rotated-cone.cpp
@@ -10,7 +10,7 @@
 using namespace Catch::literals;
 using namespace idol;
 
-#include "idol/linear-algebra/to_rotated_quadratic_cone.h"
+#include "idol/general/linear-algebra/to_rotated_quadratic_cone.h"
 
 double eval(const LinExpr<Var>& t_expr, const Solution::Primal& t_primal) {
     double result = 0;