rename containers folder as utils

dev/main.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#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"

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)

lib/include/idol/linear-algebra/MatrixIndices.h

@@ -6,9 +6,9 @@
 #define IDOL_MATRIXINDICES_H
 
 #include <cassert>
-#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;

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 <memory>
 #include <utility>
 #include <functional>

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 {
 

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"

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<class Key1, class Key2>

lib/include/idol/modeling/models/Model.h

@@ -9,21 +9,21 @@
 #include <string>
 #include <functional>
 
-#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"
 
 #include "idol/optimizers/Optimizer.h"
 #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<unsigned int>::max();

lib/include/idol/modeling/objects/Object.h

@@ -7,8 +7,8 @@
 
 #include <memory>
 #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"
 

lib/include/idol/modeling/objects/Versions.h

@@ -9,7 +9,7 @@
 #include <optional>
 #include <any>
 #include "idol/errors/Exception.h"
-#include "idol/containers/Optional.h"
+#include "idol/utils/Optional.h"
 #include "idol/modeling/models/Model.h"
 
 namespace idol {

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;

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;

lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/BranchingWithPriority.h

@@ -9,7 +9,7 @@
 #include <list>
 #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 {

lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/branching-rules/impls/VariableBranching.h

@@ -8,7 +8,7 @@
 #include <list>
 #include "BranchingRule.h"
 #include "idol/modeling/variables/Var.h"
-#include "idol/modeling/solutions/Point.h"
+#include "idol/utils/Point.h"
 
 namespace idol::BranchingRules {
     template<class>

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 {

lib/include/idol/optimizers/mixed-integer-optimization/branch-and-bound/nodes/NodeSet.h

@@ -6,7 +6,7 @@
 #define IDOL_NODESET_H
 
 #include <map>
-#include "idol/containers/IteratorForward.h"
+#include "idol/utils/IteratorForward.h"
 
 namespace idol {
     template<class NodeT>

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;

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"

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;

lib/include/idol/optimizers/mixed-integer-optimization/dantzig-wolfe/SubProblem.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <optional>
 #include "idol/optimizers/OptimizerFactory.h"
-#include "idol/containers/IteratorForward.h"
+#include "idol/utils/IteratorForward.h"
 
 namespace idol::DantzigWolfe {
     class SubProblem;

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;

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;

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 <optional>
 
 namespace idol::Logs::DantzigWolfe {

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;

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"

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"

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 <memory>
 
 namespace idol::ADM {

lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Gurobi/Gurobi.h

@@ -9,7 +9,7 @@
 #include <list>
 #include <memory>
 #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

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;

lib/include/idol/optimizers/mixed-integer-optimization/wrappers/Mosek/Mosek.h

@@ -8,7 +8,7 @@
 #include <list>
 #include <memory>
 #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 {

lib/include/idol/containers/GeneratorPool.h → 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 <list>
 
 namespace idol {

lib/include/idol/modeling/solutions/Point.h → 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"