few comments

AntaresSimulatorTeam · Dec 31, 2024 · c2ca5b7 · c2ca5b7
1 parent 63d7935
commit c2ca5b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/libs/antares/study/parts/short-term-storage/additionalConstraints.cpp b/src/libs/antares/study/parts/short-term-storage/additionalConstraints.cpp
@@ -19,10 +19,10 @@
 ** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
 */
 
-#include "antares/study/parts/short-term-storage/additionalConstraints.h"
-
 #include <algorithm>
 
+#include "antares/study/parts/short-term-storage/additionalConstraints.h"
+
 namespace Antares::Data::ShortTermStorage
 {
 
@@ -59,8 +59,7 @@ bool SingleAdditionalConstraint::isValidHoursRange() const
 
 bool AdditionalConstraints::isValidHours() const
 {
-    return std::ranges::all_of(constraints.begin(),
-                               constraints.end(),
+    return std::ranges::all_of(constraints,
                                [](const auto& constraint)
                                { return constraint.isValidHoursRange(); });
 }

diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -39,7 +39,7 @@ static void importShortTermStorages(
   std::vector<::ShortTermStorage::AREA_INPUT>& ShortTermStorageOut)
 {
     int clusterGlobalIndex = 0;
-    int clusterCumulativeConstraintGlobalIndex = 0;
+    int constraintGlobalIndex = 0;
     for (uint areaIndex = 0; areaIndex != areas.size(); areaIndex++)
     {
         ShortTermStorageOut[areaIndex].resize(areas[areaIndex]->shortTermStorage.count());
@@ -65,8 +65,8 @@ static void importShortTermStorages(
             {
                 for (auto& [_, globalIndex, __]: additionalConstraints.constraints)
                 {
-                    globalIndex = clusterCumulativeConstraintGlobalIndex;
-                    ++clusterCumulativeConstraintGlobalIndex;
+                    globalIndex = constraintGlobalIndex;
+                    ++constraintGlobalIndex;
                 }
             }
             toInsert.series = st.series;

diff --git a/...tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp b/...tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input-output.cpp
@@ -535,8 +535,7 @@ BOOST_AUTO_TEST_CASE(Validate_ValidConstraints)
     ShortTermStorage::SingleAdditionalConstraint constraint2;
     constraint2.hours = {100, 150, 168}; // Valid hours
 
-    constraints.constraints.push_back(constraint1);
-    constraints.constraints.push_back(constraint2);
+    constraints.constraints = {constraint1, constraint2};
 
     auto [ok, error_msg] = constraints.validate();
     BOOST_CHECK_EQUAL(ok, true);