Remove sts container (#1804)

Remove storageById
AntaresSimulatorTeam · Dec 11, 2023 · d2092b5 · d2092b5
1 parent 4b8b7a9
commit d2092b5
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 37 deletions.
diff --git a/src/libs/antares/study/parts/short-term-storage/cluster.cpp b/src/libs/antares/study/parts/short-term-storage/cluster.cpp
@@ -63,7 +63,7 @@ bool STStorageCluster::loadFromSection(const IniFile::Section& section)
     return true;
 }
 
-bool STStorageCluster::validate()
+bool STStorageCluster::validate() const
 {
     logs.debug() << "Validating properties and series for st storage: " << id;
     return properties.validate() && series->validate();

diff --git a/src/libs/antares/study/parts/short-term-storage/cluster.h b/src/libs/antares/study/parts/short-term-storage/cluster.h
@@ -37,7 +37,7 @@ namespace Antares::Data::ShortTermStorage
 class STStorageCluster
 {
 public:
-    bool validate();
+    bool validate() const;
     bool loadFromSection(const IniFile::Section& section);
 
     bool loadSeries(const std::string& folder) const;
@@ -48,7 +48,7 @@ class STStorageCluster
     std::string id;
 
     std::shared_ptr<Series> series = std::make_shared<Series>();
-    Properties properties;
+    mutable Properties properties;
 
 };
 } // namespace Antares::Data::ShortTermStorage
diff --git a/src/libs/antares/study/parts/short-term-storage/container.cpp b/src/libs/antares/study/parts/short-term-storage/container.cpp
@@ -28,6 +28,7 @@
 #include <antares/logs/logs.h>
 #include <yuni/io/file.h>
 #include <filesystem>
+#include <algorithm>
 #include <string>
 
 #include "container.h"
@@ -39,7 +40,7 @@ namespace Antares::Data::ShortTermStorage
 bool STStorageInput::validate() const
 {
     return std::all_of(storagesByIndex.cbegin(), storagesByIndex.cend(), [](auto& cluster) {
-        return cluster->validate();
+        return cluster.validate();
     });
 }
 
@@ -61,12 +62,12 @@ bool STStorageInput::createSTStorageClustersFromIniFile(const std::string& path)
         if (!cluster.loadFromSection(*section))
             return false;
 
-        storagesById.try_emplace(cluster.properties.name, cluster);
+        storagesByIndex.push_back(cluster);
     }
 
-    storagesByIndex.reserve(storagesById.size());
-    for (auto& [id, storage] : storagesById)
-        storagesByIndex.push_back(&storage);
+    std::sort(storagesByIndex.begin(), storagesByIndex.end(), [&](const auto& a, const auto& b){
+        return a.properties.name < b.properties.name;
+    });
 
     return true;
 }
@@ -80,8 +81,8 @@ bool STStorageInput::loadSeriesFromFolder(const std::string& folder) const
 
     for (auto& cluster : storagesByIndex)
     {
-        const std::string buffer(folder + SEP + cluster->id);
-        ret = cluster->loadSeries(buffer) && ret;
+        const std::string buffer(folder + SEP + cluster.id);
+        ret = cluster.loadSeries(buffer) && ret;
     }
 
     return ret;
@@ -95,15 +96,15 @@ bool STStorageInput::saveToFolder(const std::string& folder) const
     logs.notice() << "created empty ini: " << folder + SEP + "list.ini";
 
     return std::all_of(storagesByIndex.cbegin(), storagesByIndex.cend(), [&folder](auto& storage) {
-        return storage->saveProperties(folder);
+        return storage.saveProperties(folder);
     });
 }
 
 bool STStorageInput::saveDataSeriesToFolder(const std::string& folder) const
 {
     Yuni::IO::Directory::Create(folder);
     return std::all_of(storagesByIndex.cbegin(), storagesByIndex.cend(), [&folder](auto& storage) {
-        return storage->saveSeries(folder + SEP + storage->id);
+        return storage.saveSeries(folder + SEP + storage.id);
     });
 }
 

diff --git a/src/libs/antares/study/parts/short-term-storage/container.h b/src/libs/antares/study/parts/short-term-storage/container.h
@@ -46,8 +46,6 @@ class STStorageInput
     bool saveToFolder(const std::string& folder) const;
     bool saveDataSeriesToFolder(const std::string& folder) const;
 
-
-    std::vector<STStorageCluster*> storagesByIndex;
-    std::map<std::string, STStorageCluster> storagesById;
+    std::vector<STStorageCluster> storagesByIndex;
 };
 } // namespace Antares::Data::ShortTermStorage
diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -57,15 +57,15 @@ static void importShortTermStorages(
             toInsert.clusterGlobalIndex = clusterGlobalIndex;
 
             // Properties
-            toInsert.reservoirCapacity = st->properties.reservoirCapacity.value();
-            toInsert.efficiency = st->properties.efficiencyFactor;
-            toInsert.injectionNominalCapacity = st->properties.injectionNominalCapacity.value();
-            toInsert.withdrawalNominalCapacity = st->properties.withdrawalNominalCapacity.value();
-            toInsert.initialLevel = st->properties.initialLevel;
-            toInsert.initialLevelOptim = st->properties.initialLevelOptim;
-            toInsert.name = st->properties.name;
-
-            toInsert.series = st->series;
+            toInsert.reservoirCapacity = st.properties.reservoirCapacity.value();
+            toInsert.efficiency = st.properties.efficiencyFactor;
+            toInsert.injectionNominalCapacity = st.properties.injectionNominalCapacity.value();
+            toInsert.withdrawalNominalCapacity = st.properties.withdrawalNominalCapacity.value();
+            toInsert.initialLevel = st.properties.initialLevel;
+            toInsert.initialLevelOptim = st.properties.initialLevelOptim;
+            toInsert.name = st.properties.name;
+
+            toInsert.series = st.series;
 
             // TODO add missing properties, or use the same struct
             storageIndex++;

diff --git a/src/solver/variable/economy/STStorageCashFlowByCluster.h b/src/solver/variable/economy/STStorageCashFlowByCluster.h
@@ -281,8 +281,8 @@ class STstorageCashFlowByCluster : public Variable::IVariable<STstorageCashFlowB
             for (uint clusterIndex = 0; clusterIndex < nbClusters_; ++clusterIndex)
             {
                 // Write the data for the current year
-                const auto* cluster = shortTermStorage.storagesByIndex[clusterIndex];
-                results.variableCaption = cluster->properties.name;
+                const auto& cluster = shortTermStorage.storagesByIndex[clusterIndex];
+                results.variableCaption = cluster.properties.name;
                 results.variableUnit = VCardType::Unit();
                 pValuesForTheCurrentYear[numSpace][clusterIndex]
                   .template buildAnnualSurveyReport<VCardType>(results, fileLevel, precision);

diff --git a/src/solver/variable/economy/STStorageInjectionByCluster.h b/src/solver/variable/economy/STStorageInjectionByCluster.h
@@ -283,8 +283,8 @@ class STstorageInjectionByCluster : public Variable::IVariable<STstorageInjectio
             for (uint clusterIndex = 0; clusterIndex < nbClusters_; ++clusterIndex)
             {
                 // Write the data for the current year
-                const auto* cluster = shortTermStorage.storagesByIndex[clusterIndex];
-                results.variableCaption = cluster->properties.name;
+                const auto& cluster = shortTermStorage.storagesByIndex[clusterIndex];
+                results.variableCaption = cluster.properties.name;
                 results.variableUnit = VCardType::Unit();
                 pValuesForTheCurrentYear[numSpace][clusterIndex]
                   .template buildAnnualSurveyReport<VCardType>(results, fileLevel, precision);

diff --git a/src/solver/variable/economy/STStorageLevelsByCluster.h b/src/solver/variable/economy/STStorageLevelsByCluster.h
@@ -283,8 +283,8 @@ class STstorageLevelsByCluster
             for (uint clusterIndex = 0; clusterIndex < nbClusters_; ++clusterIndex)
             {
                 // Write the data for the current year
-                const auto* cluster = shortTermStorage.storagesByIndex[clusterIndex];
-                results.variableCaption = cluster->properties.name;
+                const auto& cluster = shortTermStorage.storagesByIndex[clusterIndex];
+                results.variableCaption = cluster.properties.name;
                 results.variableUnit = VCardType::Unit();
                 pValuesForTheCurrentYear[numSpace][clusterIndex].template buildAnnualSurveyReport<VCardType>(
                     results, fileLevel, precision);

diff --git a/src/solver/variable/economy/STStorageWithdrawalByCluster.h b/src/solver/variable/economy/STStorageWithdrawalByCluster.h
@@ -283,8 +283,8 @@ class STstorageWithdrawalByCluster
             for (uint clusterIndex = 0; clusterIndex < nbClusters_; ++clusterIndex)
             {
                 // Write the data for the current year
-                const auto* cluster = shortTermStorage.storagesByIndex[clusterIndex];
-                results.variableCaption = cluster->properties.name;
+                const auto& cluster = shortTermStorage.storagesByIndex[clusterIndex];
+                results.variableCaption = cluster.properties.name;
                 results.variableUnit = VCardType::Unit();
                 pValuesForTheCurrentYear[numSpace][clusterIndex].template buildAnnualSurveyReport<VCardType>(
                     results, fileLevel, precision);

diff --git a/src/solver/variable/economy/shortTermStorage.h b/src/solver/variable/economy/shortTermStorage.h
@@ -237,8 +237,8 @@ class ShortTermStorageByGroup
         using namespace Antares::Data::ShortTermStorage;
         for (uint stsIndex = 0; stsIndex < state.area->shortTermStorage.count(); stsIndex++)
         {
-            const auto* cluster = state.area->shortTermStorage.storagesByIndex[stsIndex];
-            const uint group = groupIndex(cluster->properties.group);
+            const auto& cluster = state.area->shortTermStorage.storagesByIndex[stsIndex];
+            const uint group = groupIndex(cluster.properties.group);
 
             // Injection
             pValuesForTheCurrentYear[numSpace][3 * group][state.hourInTheYear]

diff --git a/src/solver/variable/info.h b/src/solver/variable/info.h
@@ -413,7 +413,7 @@ struct VariableAccessor<ResultsT, Category::dynamicColumns>
         if (st_storage_details)
         {
             auto& st_storage_part = results.data.area->shortTermStorage;
-            results.variableCaption = st_storage_part.storagesByIndex[idx]->properties.name;
+            results.variableCaption = st_storage_part.storagesByIndex[idx].properties.name;
             return true;
         }
         return true;

diff --git a/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input.cpp b/src/tests/src/libs/antares/study/short-term-storage-input/short-term-storage-input.cpp
@@ -249,7 +249,7 @@ BOOST_FIXTURE_TEST_CASE(check_container_properties_load, Fixture)
     createIniFile();
 
     BOOST_CHECK(container.createSTStorageClustersFromIniFile(folder));
-    BOOST_CHECK(container.storagesByIndex[0]->properties.validate());
+    BOOST_CHECK(container.storagesByIndex[0].properties.validate());
 
     removeIniFile();
 }
@@ -259,7 +259,7 @@ BOOST_FIXTURE_TEST_CASE(check_container_properties_wrong_value, Fixture)
     createIniFileWrongValue();
 
     BOOST_CHECK(container.createSTStorageClustersFromIniFile(folder));
-    BOOST_CHECK(!container.storagesByIndex[0]->properties.validate());
+    BOOST_CHECK(!container.storagesByIndex[0].properties.validate());
 
     removeIniFile();
 }