From aa4ff663230057603e573ffa43afc32f9fa991f8 Mon Sep 17 00:00:00 2001 From: Henri Lefebvre Date: Thu, 24 Oct 2024 15:04:16 +0200 Subject: [PATCH] rename containers folder as utils --- dev/main.cpp | 2 +- lib/CMakeLists.txt | 28 +++++++++---------- .../idol/linear-algebra/MatrixIndices.h | 4 +-- .../idol/modeling/expressions/AbstractExpr.h | 6 ++-- .../idol/modeling/expressions/Constant.h | 6 ++-- .../idol/modeling/expressions/LinExpr.h | 4 +-- .../idol/modeling/expressions/QuadExpr.h | 2 +- lib/include/idol/modeling/models/Model.h | 6 ++-- lib/include/idol/modeling/objects/Object.h | 4 +-- lib/include/idol/modeling/objects/Versions.h | 2 +- lib/include/idol/optimizers/Algorithm.h | 2 +- lib/include/idol/optimizers/Optimizer.h | 2 +- .../impls/BranchingWithPriority.h | 2 +- .../branching-rules/impls/VariableBranching.h | 2 +- .../AbstractBranchAndBoundCallbackI.h | 2 +- .../branch-and-bound/nodes/NodeSet.h | 2 +- .../callbacks/Callback.h | 2 +- .../dantzig-wolfe/DantzigWolfeDecomposition.h | 2 +- .../dantzig-wolfe/Formulation.h | 2 +- .../dantzig-wolfe/SubProblem.h | 2 +- .../DantzigWolfeInfeasibilityStrategy.h | 4 +-- .../dantzig-wolfe/logs/Factory.h | 2 +- .../dantzig-wolfe/logs/Info.h | 2 +- .../DualPriceSmoothingStabilization.h | 2 +- .../mixed-integer-optimization/padm/PADM.h | 2 +- .../padm/PenaltyMethod.h | 2 +- .../padm/SubProblem.h | 2 +- .../wrappers/Gurobi/Gurobi.h | 2 +- .../wrappers/HiGHS/HiGHS.h | 2 +- .../wrappers/Mosek/Mosek.h | 2 +- .../idol/{containers => utils}/Finally.h | 0 .../{containers => utils}/GeneratorPool.h | 2 +- .../{containers => utils}/IteratorForward.h | 0 .../LimitedWidthStream.h | 0 lib/include/idol/{containers => utils}/Map.h | 0 .../idol/{containers => utils}/Optional.h | 0 lib/include/idol/{containers => utils}/Pair.h | 0 .../{modeling/solutions => utils}/Point.h | 2 +- lib/include/idol/{containers => utils}/Set.h | 0 .../idol/{containers => utils}/SilentMode.h | 0 .../sparse-matrix => utils}/SparseVector.h | 2 +- .../idol/{containers => utils}/Vector.h | 0 lib/include/idol/{containers => utils}/sort.h | 0 .../{modeling/solutions => utils}/types.h | 0 lib/include/idol/{containers => utils}/uuid.h | 0 lib/src/containers/uuid.cpp | 2 +- .../bilevel-optimization/read_from_file.cpp | 2 +- lib/src/modeling/constraints/TempCtr.cpp | 2 +- lib/src/modeling/expressions/Constant.cpp | 2 +- .../expressions/operations/operators.cpp | 2 +- lib/src/modeling/matrix/Row.cpp | 2 +- .../wrappers/MibS/impl_MibSFromAPI.cpp | 2 +- .../wrappers/MibS/impl_MibSFromFile.cpp | 6 ++-- .../wrappers/GLPK/Optimizers_GLPK.cpp | 2 +- 54 files changed, 67 insertions(+), 67 deletions(-) rename lib/include/idol/{containers => utils}/Finally.h (100%) rename lib/include/idol/{containers => utils}/GeneratorPool.h (96%) rename lib/include/idol/{containers => utils}/IteratorForward.h (100%) rename lib/include/idol/{containers => utils}/LimitedWidthStream.h (100%) rename lib/include/idol/{containers => utils}/Map.h (100%) rename lib/include/idol/{containers => utils}/Optional.h (100%) rename lib/include/idol/{containers => utils}/Pair.h (100%) rename lib/include/idol/{modeling/solutions => utils}/Point.h (97%) rename lib/include/idol/{containers => utils}/Set.h (100%) rename lib/include/idol/{containers => utils}/SilentMode.h (100%) rename lib/include/idol/{modeling/sparse-matrix => utils}/SparseVector.h (99%) rename lib/include/idol/{containers => utils}/Vector.h (100%) rename lib/include/idol/{containers => utils}/sort.h (100%) rename lib/include/idol/{modeling/solutions => utils}/types.h (100%) rename lib/include/idol/{containers => utils}/uuid.h (100%) diff --git a/dev/main.cpp b/dev/main.cpp index d292e6bb..3e83819d 100644 --- a/dev/main.cpp +++ b/dev/main.cpp @@ -1,5 +1,5 @@ #include -#include "idol/modeling/sparse-matrix/SparseVector.h" +#include "idol/containers/SparseVector.h" #include "idol/modeling/variables/Var.h" #include "idol/modeling/models/Model.h" #include "idol/modeling/objects/Env.h" diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 9fc44f63..f3791fa1 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(idol STATIC include/idol/modeling/numericals.h - include/idol/containers/Optional.h - include/idol/containers/Map.h + include/idol/utils/Optional.h + include/idol/utils/Map.h include/idol/modeling.h include/idol/modeling/parameters/Param.h include/idol/modeling/Types.h @@ -14,9 +14,9 @@ add_library(idol STATIC src/modeling/matrix/MatrixCoefficientReference.cpp include/idol/modeling/constraints/TempCtr.h src/modeling/constraints/TempCtr.cpp - include/idol/containers/IteratorForward.h + include/idol/utils/IteratorForward.h include/idol/modeling/variables/TempVar.h - include/idol/containers/Set.h + include/idol/utils/Set.h include/idol/errors/NotImplemented.h include/idol/modeling/expressions/LinExpr.h include/idol/modeling/matrix/Row.h @@ -73,8 +73,8 @@ add_library(idol STATIC src/modeling/annotations/impl_Annotation.cpp include/idol/modeling/annotations/impl_Annotation.h include/idol/modeling/models/Model.h - include/idol/containers/GeneratorPool.h - include/idol/modeling/solutions/types.h + include/idol/utils/GeneratorPool.h + include/idol/utils/types.h include/idol/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.h include/idol/solvers.h src/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.cpp @@ -186,11 +186,11 @@ add_library(idol STATIC src/optimizers/logs.cpp include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/BranchingDecision.h - include/idol/containers/Pair.h + include/idol/utils/Pair.h include/idol/optimizers/mixed-integer-optimization/callbacks/cutting-planes/KnapsackCover.h include/idol/optimizers/mixed-integer-optimization/branch-and-bound/logs/Factory.h include/idol/optimizers/mixed-integer-optimization/branch-and-bound/logs/Info.h - include/idol/containers/Finally.h + include/idol/utils/Finally.h src/optimizers/bilevel-optimization/wrappers/MibS/MibS.cpp include/idol/optimizers/bilevel-optimization/wrappers/MibS/MibS.h src/optimizers/bilevel-optimization/wrappers/MibS/Optimizers_MibS.cpp @@ -210,10 +210,10 @@ add_library(idol STATIC include/idol/modeling/bilevel-optimization/LowerLevelDescription.h include/idol/modeling/bilevel-optimization/write_to_file.h src/modeling/bilevel-optimization/write_to_file.cpp - include/idol/containers/LimitedWidthStream.h + include/idol/utils/LimitedWidthStream.h include/idol/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.h src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.cpp - include/idol/containers/SilentMode.h + include/idol/utils/SilentMode.h include/idol/modeling/robust-optimization/StageDescription.h include/idol/modeling/models/KKT.h src/modeling/models/KKT.cpp @@ -230,16 +230,16 @@ add_library(idol STATIC src/optimizers/mixed-integer-optimization/padm/PenaltyMethod.cpp include/idol/optimizers/mixed-integer-optimization/padm/PenaltyMethod.h include/idol/optimizers/bilevel-optimization/wrappers/MibS/impl_MibS.h - include/idol/containers/uuid.h + include/idol/utils/uuid.h src/containers/uuid.cpp include/idol/optimizers/bilevel-optimization/wrappers/MibS/MibSCallbackI.h include/idol/optimizers/mixed-integer-optimization/callbacks/watchers/PlotManager.h src/optimizers/mixed-integer-optimization/callbacks/watchers/PlotManager.cpp include/idol/optimizers/mixed-integer-optimization/callbacks/watchers/Plots_OptimalityGap.h src/optimizers/mixed-integer-optimization/callbacks/watchers/Plots_OptimalityGap.cpp - include/idol/modeling/sparse-matrix/SparseVector.h - include/idol/containers/sort.h - include/idol/modeling/solutions/Point.h + include/idol/utils/SparseVector.h + include/idol/utils/sort.h + include/idol/utils/Point.h ) find_package(OpenMP REQUIRED) diff --git a/lib/include/idol/linear-algebra/MatrixIndices.h b/lib/include/idol/linear-algebra/MatrixIndices.h index 70ddaf03..c106ac49 100644 --- a/lib/include/idol/linear-algebra/MatrixIndices.h +++ b/lib/include/idol/linear-algebra/MatrixIndices.h @@ -6,9 +6,9 @@ #define IDOL_MATRIXINDICES_H #include -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "idol/modeling/variables/Var.h" -#include "idol/containers/IteratorForward.h" +#include "idol/utils/IteratorForward.h" namespace idol { class MatrixIndices; diff --git a/lib/include/idol/modeling/expressions/AbstractExpr.h b/lib/include/idol/modeling/expressions/AbstractExpr.h index 177c0192..81462aa1 100644 --- a/lib/include/idol/modeling/expressions/AbstractExpr.h +++ b/lib/include/idol/modeling/expressions/AbstractExpr.h @@ -5,15 +5,15 @@ #ifndef IDOL_ABSTRACTEXPR_H #define IDOL_ABSTRACTEXPR_H -#include "idol/containers/Map.h" -#include "idol/containers/IteratorForward.h" +#include "idol/utils/Map.h" +#include "idol/utils/IteratorForward.h" #include "idol/modeling/matrix/AbstractMatrixCoefficient.h" #include "Constant.h" #include "idol/modeling/expressions/operations/operators_Constant.h" #include "idol/modeling/matrix/MatrixCoefficient.h" #include "idol/modeling/variables/Var.h" #include "idol/errors/Exception.h" -#include "idol/containers/Pair.h" +#include "idol/utils/Pair.h" #include #include #include diff --git a/lib/include/idol/modeling/expressions/Constant.h b/lib/include/idol/modeling/expressions/Constant.h index 04d8745e..5c6e4912 100644 --- a/lib/include/idol/modeling/expressions/Constant.h +++ b/lib/include/idol/modeling/expressions/Constant.h @@ -5,11 +5,11 @@ #ifndef OPTIMIZE_CONSTANT_H #define OPTIMIZE_CONSTANT_H -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "idol/modeling/parameters/Param.h" #include "idol/modeling/numericals.h" -#include "idol/containers/IteratorForward.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/IteratorForward.h" +#include "idol/utils/Point.h" namespace idol { diff --git a/lib/include/idol/modeling/expressions/LinExpr.h b/lib/include/idol/modeling/expressions/LinExpr.h index 90ff00dd..0e29053d 100644 --- a/lib/include/idol/modeling/expressions/LinExpr.h +++ b/lib/include/idol/modeling/expressions/LinExpr.h @@ -5,8 +5,8 @@ #ifndef OPTIMIZE_EXPR_H #define OPTIMIZE_EXPR_H -#include "idol/containers/Map.h" -#include "idol/containers/IteratorForward.h" +#include "idol/utils/Map.h" +#include "idol/utils/IteratorForward.h" #include "idol/modeling/matrix/AbstractMatrixCoefficient.h" #include "Constant.h" #include "idol/modeling/expressions/operations/operators_Constant.h" diff --git a/lib/include/idol/modeling/expressions/QuadExpr.h b/lib/include/idol/modeling/expressions/QuadExpr.h index d57dbc68..ba6eafa7 100644 --- a/lib/include/idol/modeling/expressions/QuadExpr.h +++ b/lib/include/idol/modeling/expressions/QuadExpr.h @@ -6,7 +6,7 @@ #define IDOL_QUADEXPR_H #include "AbstractExpr.h" -#include "idol/containers/Pair.h" +#include "idol/utils/Pair.h" namespace idol { template diff --git a/lib/include/idol/modeling/models/Model.h b/lib/include/idol/modeling/models/Model.h index 5b804075..09b62196 100644 --- a/lib/include/idol/modeling/models/Model.h +++ b/lib/include/idol/modeling/models/Model.h @@ -9,13 +9,13 @@ #include #include -#include "idol/containers/Vector.h" +#include "idol/utils/Vector.h" #include "idol/modeling/matrix/Matrix.h" #include "idol/modeling/constraints/CtrVersion.h" #include "idol/modeling/variables/VarVersion.h" #include "idol/modeling/expressions/Expr.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include "Model.h" @@ -23,7 +23,7 @@ #include "idol/optimizers/OptimizerFactory.h" #include "idol/optimizers/Timer.h" -#include "idol/containers/LimitedWidthStream.h" +#include "idol/utils/LimitedWidthStream.h" namespace idol { static const unsigned int MasterId = std::numeric_limits::max(); diff --git a/lib/include/idol/modeling/objects/Object.h b/lib/include/idol/modeling/objects/Object.h index 46c7094a..2a85c76e 100644 --- a/lib/include/idol/modeling/objects/Object.h +++ b/lib/include/idol/modeling/objects/Object.h @@ -7,8 +7,8 @@ #include #include "ObjectId.h" -#include "idol/containers/Vector.h" -#include "idol/containers/Pair.h" +#include "idol/utils/Vector.h" +#include "idol/utils/Pair.h" #include "idol/modeling/annotations/Annotation.h" #include "idol/errors/Exception.h" diff --git a/lib/include/idol/modeling/objects/Versions.h b/lib/include/idol/modeling/objects/Versions.h index 5d632e6e..4bbcf4e4 100644 --- a/lib/include/idol/modeling/objects/Versions.h +++ b/lib/include/idol/modeling/objects/Versions.h @@ -9,7 +9,7 @@ #include #include #include "idol/errors/Exception.h" -#include "idol/containers/Optional.h" +#include "idol/utils/Optional.h" #include "idol/modeling/models/Model.h" namespace idol { diff --git a/lib/include/idol/optimizers/Algorithm.h b/lib/include/idol/optimizers/Algorithm.h index 2be82883..fe1df487 100644 --- a/lib/include/idol/optimizers/Algorithm.h +++ b/lib/include/idol/optimizers/Algorithm.h @@ -6,7 +6,7 @@ #define IDOL_ALGORITHM_H #include "Optimizer.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" namespace idol { class Algorithm; diff --git a/lib/include/idol/optimizers/Optimizer.h b/lib/include/idol/optimizers/Optimizer.h index 32f37b61..a95a37c0 100644 --- a/lib/include/idol/optimizers/Optimizer.h +++ b/lib/include/idol/optimizers/Optimizer.h @@ -10,7 +10,7 @@ #include "Timer.h" #include "idol/modeling/numericals.h" -#include "idol/modeling/solutions/types.h" +#include "idol/utils/types.h" namespace idol { class Model; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h index b6fd808a..76a8fc4b 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h @@ -9,7 +9,7 @@ #include #include "BranchingRule.h" #include "idol/modeling/variables/Var.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include "idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/factories/BranchingRuleFactory.h" namespace idol::BranchingRules { diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/VariableBranching.h b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/VariableBranching.h index 8a7cb08b..52f0138b 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/VariableBranching.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/VariableBranching.h @@ -8,7 +8,7 @@ #include #include "BranchingRule.h" #include "idol/modeling/variables/Var.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" namespace idol::BranchingRules { template diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/callbacks/AbstractBranchAndBoundCallbackI.h b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/callbacks/AbstractBranchAndBoundCallbackI.h index d0391322..ee1b4f70 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/callbacks/AbstractBranchAndBoundCallbackI.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/callbacks/AbstractBranchAndBoundCallbackI.h @@ -5,7 +5,7 @@ #ifndef IDOL_ABSTRACTBRANCHANDBOUNDCALLBACKI_H #define IDOL_ABSTRACTBRANCHANDBOUNDCALLBACKI_H -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include "idol/optimizers/mixed-integer-optimization/callbacks/Callback.h" namespace idol { diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/NodeSet.h b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/NodeSet.h index 14d43df2..a9931b24 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/NodeSet.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/NodeSet.h @@ -6,7 +6,7 @@ #define IDOL_NODESET_H #include -#include "idol/containers/IteratorForward.h" +#include "idol/utils/IteratorForward.h" namespace idol { template diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/callbacks/Callback.h b/lib/include/idol/optimizers/mixed-integer-optimization/callbacks/Callback.h index c823ee88..457b0e74 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/callbacks/Callback.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/callbacks/Callback.h @@ -5,7 +5,7 @@ #ifndef IDOL_CALLBACK_H #define IDOL_CALLBACK_H -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" namespace idol { class TempCtr; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/DantzigWolfeDecomposition.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/DantzigWolfeDecomposition.h index 0ca663e5..116fd81b 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/DantzigWolfeDecomposition.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/DantzigWolfeDecomposition.h @@ -8,7 +8,7 @@ #include "idol/optimizers/OptimizerFactory.h" #include "idol/modeling/annotations/Annotation.h" #include "SubProblem.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "Formulation.h" #include "idol/optimizers/mixed-integer-optimization/dantzig-wolfe/infeasibility-strategies/DantzigWolfeInfeasibilityStrategy.h" #include "idol/optimizers/mixed-integer-optimization/dantzig-wolfe/stabilization/DualPriceSmoothingStabilization.h" diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/Formulation.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/Formulation.h index 5048bc1d..c5881546 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/Formulation.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/Formulation.h @@ -6,7 +6,7 @@ #define IDOL_FORMULATION_H #include "idol/modeling/models/Model.h" -#include "idol/containers/GeneratorPool.h" +#include "idol/utils/GeneratorPool.h" namespace idol::DantzigWolfe { class Formulation; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/SubProblem.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/SubProblem.h index 5bc91e12..20c8de5d 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/SubProblem.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/SubProblem.h @@ -9,7 +9,7 @@ #include #include #include "idol/optimizers/OptimizerFactory.h" -#include "idol/containers/IteratorForward.h" +#include "idol/utils/IteratorForward.h" namespace idol::DantzigWolfe { class SubProblem; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/infeasibility-strategies/DantzigWolfeInfeasibilityStrategy.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/infeasibility-strategies/DantzigWolfeInfeasibilityStrategy.h index 9ed69c0a..da3363dc 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/infeasibility-strategies/DantzigWolfeInfeasibilityStrategy.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/infeasibility-strategies/DantzigWolfeInfeasibilityStrategy.h @@ -5,8 +5,8 @@ #ifndef IDOL_DANTZIGWOLFEINFEASIBILITYSTRATEGY_H #define IDOL_DANTZIGWOLFEINFEASIBILITYSTRATEGY_H -#include "idol/modeling/solutions/types.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/types.h" +#include "idol/utils/Point.h" namespace idol::Optimizers { class DantzigWolfeDecomposition; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Factory.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Factory.h index eb595590..d56fb9ba 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Factory.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Factory.h @@ -6,7 +6,7 @@ #define IDOL_LOGS_DANTZIGWOLFE_FACTORY_H #include "idol/modeling/numericals.h" -#include "idol/modeling/solutions/types.h" +#include "idol/utils/types.h" namespace idol::Logs::DantzigWolfe { class Factory; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Info.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Info.h index 2f6405e3..9687ee64 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Info.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/logs/Info.h @@ -6,7 +6,7 @@ #define IDOL_LOGS_DANTZIGWOLFE_INFO_H #include "Factory.h" -#include "idol/modeling/solutions/types.h" +#include "idol/utils/types.h" #include namespace idol::Logs::DantzigWolfe { diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/stabilization/DualPriceSmoothingStabilization.h b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/stabilization/DualPriceSmoothingStabilization.h index ad045316..5be015cd 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/stabilization/DualPriceSmoothingStabilization.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/stabilization/DualPriceSmoothingStabilization.h @@ -5,7 +5,7 @@ #ifndef IDOL_DUALPRICESMOOTHINGSTABILIZATION_H #define IDOL_DUALPRICESMOOTHINGSTABILIZATION_H -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" namespace idol::DantzigWolfe { class DualPriceSmoothingStabilization; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/padm/PADM.h b/lib/include/idol/optimizers/mixed-integer-optimization/padm/PADM.h index b85c4872..a237bd6e 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/padm/PADM.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/padm/PADM.h @@ -7,7 +7,7 @@ #include "idol/optimizers/OptimizerFactory.h" #include "idol/modeling/annotations/Annotation.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "SubProblem.h" #include "Formulation.h" #include "PenaltyUpdates.h" diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/padm/PenaltyMethod.h b/lib/include/idol/optimizers/mixed-integer-optimization/padm/PenaltyMethod.h index d5f60129..dfabc3c4 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/padm/PenaltyMethod.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/padm/PenaltyMethod.h @@ -7,7 +7,7 @@ #include "idol/optimizers/OptimizerFactory.h" #include "idol/modeling/annotations/Annotation.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "SubProblem.h" #include "Formulation.h" #include "PenaltyUpdates.h" diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/padm/SubProblem.h b/lib/include/idol/optimizers/mixed-integer-optimization/padm/SubProblem.h index 11348307..1d07189a 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/padm/SubProblem.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/padm/SubProblem.h @@ -6,7 +6,7 @@ #define IDOL_ADM_SUBPROBLEM_H #include "idol/optimizers/OptimizerFactory.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include namespace idol::ADM { diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h index 57294ab3..cce19b47 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h @@ -9,7 +9,7 @@ #include #include #include "idol/optimizers/mixed-integer-optimization/callbacks/CallbackFactory.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "idol/modeling/objects/Env.h" #ifdef IDOL_USE_GUROBI diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/HiGHS/HiGHS.h b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/HiGHS/HiGHS.h index aea17755..bbca3b32 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/HiGHS/HiGHS.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/HiGHS/HiGHS.h @@ -6,7 +6,7 @@ #define IDOL_HIGHS_H #include "idol/optimizers/OptimizerFactory.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" namespace idol { class HiGHS; diff --git a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Mosek/Mosek.h b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Mosek/Mosek.h index bc156521..231200aa 100644 --- a/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Mosek/Mosek.h +++ b/lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Mosek/Mosek.h @@ -8,7 +8,7 @@ #include #include #include "idol/optimizers/OptimizerFactory.h" -#include "idol/containers/Map.h" +#include "idol/utils/Map.h" #include "idol/optimizers/mixed-integer-optimization/callbacks/CallbackFactory.h" namespace idol { diff --git a/lib/include/idol/containers/Finally.h b/lib/include/idol/utils/Finally.h similarity index 100% rename from lib/include/idol/containers/Finally.h rename to lib/include/idol/utils/Finally.h diff --git a/lib/include/idol/containers/GeneratorPool.h b/lib/include/idol/utils/GeneratorPool.h similarity index 96% rename from lib/include/idol/containers/GeneratorPool.h rename to lib/include/idol/utils/GeneratorPool.h index c1775f66..72e0f86c 100644 --- a/lib/include/idol/containers/GeneratorPool.h +++ b/lib/include/idol/utils/GeneratorPool.h @@ -5,7 +5,7 @@ #ifndef IDOL_GENERATORPOOL_H #define IDOL_GENERATORPOOL_H -#include "idol/modeling/solutions/Point.h" +#include "Point.h" #include namespace idol { diff --git a/lib/include/idol/containers/IteratorForward.h b/lib/include/idol/utils/IteratorForward.h similarity index 100% rename from lib/include/idol/containers/IteratorForward.h rename to lib/include/idol/utils/IteratorForward.h diff --git a/lib/include/idol/containers/LimitedWidthStream.h b/lib/include/idol/utils/LimitedWidthStream.h similarity index 100% rename from lib/include/idol/containers/LimitedWidthStream.h rename to lib/include/idol/utils/LimitedWidthStream.h diff --git a/lib/include/idol/containers/Map.h b/lib/include/idol/utils/Map.h similarity index 100% rename from lib/include/idol/containers/Map.h rename to lib/include/idol/utils/Map.h diff --git a/lib/include/idol/containers/Optional.h b/lib/include/idol/utils/Optional.h similarity index 100% rename from lib/include/idol/containers/Optional.h rename to lib/include/idol/utils/Optional.h diff --git a/lib/include/idol/containers/Pair.h b/lib/include/idol/utils/Pair.h similarity index 100% rename from lib/include/idol/containers/Pair.h rename to lib/include/idol/utils/Pair.h diff --git a/lib/include/idol/modeling/solutions/Point.h b/lib/include/idol/utils/Point.h similarity index 97% rename from lib/include/idol/modeling/solutions/Point.h rename to lib/include/idol/utils/Point.h index 36f5b5ec..783e3328 100644 --- a/lib/include/idol/modeling/solutions/Point.h +++ b/lib/include/idol/utils/Point.h @@ -5,7 +5,7 @@ #ifndef IDOL_POINT_H #define IDOL_POINT_H -#include "idol/modeling/sparse-matrix/SparseVector.h" +#include "SparseVector.h" #include "types.h" #include "idol/modeling/variables/Var.h" #include "idol/modeling/numericals.h" diff --git a/lib/include/idol/containers/Set.h b/lib/include/idol/utils/Set.h similarity index 100% rename from lib/include/idol/containers/Set.h rename to lib/include/idol/utils/Set.h diff --git a/lib/include/idol/containers/SilentMode.h b/lib/include/idol/utils/SilentMode.h similarity index 100% rename from lib/include/idol/containers/SilentMode.h rename to lib/include/idol/utils/SilentMode.h diff --git a/lib/include/idol/modeling/sparse-matrix/SparseVector.h b/lib/include/idol/utils/SparseVector.h similarity index 99% rename from lib/include/idol/modeling/sparse-matrix/SparseVector.h rename to lib/include/idol/utils/SparseVector.h index b52e0fef..06a0fb47 100644 --- a/lib/include/idol/modeling/sparse-matrix/SparseVector.h +++ b/lib/include/idol/utils/SparseVector.h @@ -8,7 +8,7 @@ #include #include #include -#include "idol/containers/sort.h" +#include "idol/utils/sort.h" namespace idol { template diff --git a/lib/include/idol/containers/Vector.h b/lib/include/idol/utils/Vector.h similarity index 100% rename from lib/include/idol/containers/Vector.h rename to lib/include/idol/utils/Vector.h diff --git a/lib/include/idol/containers/sort.h b/lib/include/idol/utils/sort.h similarity index 100% rename from lib/include/idol/containers/sort.h rename to lib/include/idol/utils/sort.h diff --git a/lib/include/idol/modeling/solutions/types.h b/lib/include/idol/utils/types.h similarity index 100% rename from lib/include/idol/modeling/solutions/types.h rename to lib/include/idol/utils/types.h diff --git a/lib/include/idol/containers/uuid.h b/lib/include/idol/utils/uuid.h similarity index 100% rename from lib/include/idol/containers/uuid.h rename to lib/include/idol/utils/uuid.h diff --git a/lib/src/containers/uuid.cpp b/lib/src/containers/uuid.cpp index 84380ee4..9c5d859c 100644 --- a/lib/src/containers/uuid.cpp +++ b/lib/src/containers/uuid.cpp @@ -1,7 +1,7 @@ // // Created by henri on 21.10.24. // -#include "idol/containers/uuid.h" +#include "idol/utils/uuid.h" std::string idol::generate_uuid_v4() { std::random_device rd; diff --git a/lib/src/modeling/bilevel-optimization/read_from_file.cpp b/lib/src/modeling/bilevel-optimization/read_from_file.cpp index 46bb1f3c..378b6bf4 100644 --- a/lib/src/modeling/bilevel-optimization/read_from_file.cpp +++ b/lib/src/modeling/bilevel-optimization/read_from_file.cpp @@ -3,7 +3,7 @@ // #include "idol/modeling/bilevel-optimization/read_from_file.h" #include "idol/modeling/models/Model.h" -#include "idol/containers/Set.h" +#include "idol/utils/Set.h" #include "idol/modeling/objects/Versions.h" #include "idol/modeling/expressions/operations/operators.h" #include diff --git a/lib/src/modeling/constraints/TempCtr.cpp b/lib/src/modeling/constraints/TempCtr.cpp index 30cf2c4a..ce1fdb1f 100644 --- a/lib/src/modeling/constraints/TempCtr.cpp +++ b/lib/src/modeling/constraints/TempCtr.cpp @@ -2,7 +2,7 @@ // Created by henri on 08/09/22. // #include "idol/modeling/constraints/TempCtr.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include "idol/modeling/expressions/LinExpr.h" using namespace idol; diff --git a/lib/src/modeling/expressions/Constant.cpp b/lib/src/modeling/expressions/Constant.cpp index 27a2c29d..7a1ed431 100644 --- a/lib/src/modeling/expressions/Constant.cpp +++ b/lib/src/modeling/expressions/Constant.cpp @@ -3,7 +3,7 @@ // #include "idol/modeling/expressions/Constant.h" #include "idol/modeling/numericals.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include idol::Constant idol::Constant::Zero; diff --git a/lib/src/modeling/expressions/operations/operators.cpp b/lib/src/modeling/expressions/operations/operators.cpp index a1345825..e1b3cb56 100644 --- a/lib/src/modeling/expressions/operations/operators.cpp +++ b/lib/src/modeling/expressions/operations/operators.cpp @@ -2,7 +2,7 @@ // Created by henri on 16.10.23. // #include "idol/modeling//expressions/operations/operators.h" -#include "idol/modeling//solutions/Point.h" +#include "idol/utils/Point.h" double idol::evaluate(const Expr& t_expr, const PrimalPoint& t_values) { diff --git a/lib/src/modeling/matrix/Row.cpp b/lib/src/modeling/matrix/Row.cpp index c76812f5..efd05d28 100644 --- a/lib/src/modeling/matrix/Row.cpp +++ b/lib/src/modeling/matrix/Row.cpp @@ -3,7 +3,7 @@ // #include "idol/modeling/matrix/Row.h" #include "idol/modeling/expressions/operations/operators.h" -#include "idol/modeling/solutions/Point.h" +#include "idol/utils/Point.h" #include diff --git a/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromAPI.cpp b/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromAPI.cpp index 59da5008..24e4ecab 100644 --- a/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromAPI.cpp +++ b/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromAPI.cpp @@ -6,7 +6,7 @@ #include "idol/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromAPI.h" #include "idol/modeling/objects/Versions.h" -#include "idol/containers/SilentMode.h" +#include "idol/utils/SilentMode.h" #include "idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h" #include "idol/optimizers/bilevel-optimization/wrappers/MibS/MibSCallbackI.h" diff --git a/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.cpp b/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.cpp index b95fe07c..6a76f02f 100644 --- a/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.cpp +++ b/lib/src/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.cpp @@ -12,9 +12,9 @@ #include #include "idol/optimizers/bilevel-optimization/wrappers/MibS/impl_MibSFromFile.h" #include "idol/modeling/bilevel-optimization/write_to_file.h" -#include "idol/containers/Finally.h" -#include "idol/containers/SilentMode.h" -#include "idol/containers/uuid.h" +#include "idol/utils/Finally.h" +#include "idol/utils/SilentMode.h" +#include "idol/utils/uuid.h" #ifdef _WIN32 #define DEV_NULL "NUL" diff --git a/lib/src/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.cpp b/lib/src/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.cpp index a58704ab..a15d1b00 100644 --- a/lib/src/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.cpp +++ b/lib/src/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.cpp @@ -4,7 +4,7 @@ #include "idol/optimizers/mixed-integer-optimization/wrappers/GLPK/Optimizers_GLPK.h" #include "idol/optimizers/Algorithm.h" #include "idol/modeling/expressions/operations/operators.h" -#include "idol/containers/Finally.h" +#include "idol/utils/Finally.h" #ifdef IDOL_USE_GLPK