Thermal clusters lists : cleaning

src/libs/antares/InfoCollection/StudyInfoCollector.cpp

@@ -59,8 +59,7 @@ void StudyInfoCollector::enabledThermalClustersCountToFileContent(FileContent& f
     for (auto i = study_.areas.begin(); i != end; ++i)
     {
         Area& area = *(i->second);
-        nbEnabledThermalClusters +=
-            std::ranges::count_if(area.thermal.list, [](const auto& c) { return c->enabled; });
+        nbEnabledThermalClusters += area.thermal.list.enabledAndNotMustRunCount();
     }
 
     // Adding an item related to number of enabled thermal clusters to the file content

src/libs/antares/checks/checkLoadedInputData.cpp

@@ -169,16 +169,15 @@ static void checkThermalColumnNumber(const Antares::Data::AreaList& areas,
     for (uint areaIndex = 0; areaIndex < areas.size(); ++areaIndex)
     {
         const auto& area = *(areas.byIndex[areaIndex]);
-        for (uint clusterIndex = 0; clusterIndex != area.thermal.clusterCount(); ++clusterIndex)
+        for (auto cluster : area.thermal.list.each_enabled())
         {
-            const auto& cluster = *(area.thermal.clusters[clusterIndex]);
-            if (cluster.costgeneration == Antares::Data::setManually)
+            if (cluster->costgeneration == Antares::Data::setManually)
                 continue;
-            const uint otherMatrixWidth = (cluster.ecoInput.*matrix).width;
-            uint tsWidth = cluster.series.timeSeries.width;
+            const uint otherMatrixWidth = (cluster->ecoInput.*matrix).width;
+            uint tsWidth = cluster->series.timeSeries.width;
             if (otherMatrixWidth != 1 && otherMatrixWidth != tsWidth)
             {
-                logs.warning() << "Area: " << area.name << ". Cluster name: " << cluster.name()
+                logs.warning() << "Area: " << area.name << ". Cluster name: " << cluster->name()
                                << ". " << exception.what();
                 error = true;
             }

src/libs/antares/study/CMakeLists.txt

@@ -67,7 +67,6 @@ source_group("study\\part\\common" FILES ${SRC_STUDY_PART_COMMON})
 
 set(SRC_STUDY_PART_THERMAL
         parts/thermal/container.h
-        parts/thermal/container.hxx
         parts/thermal/container.cpp
         parts/thermal/prepro.h
         parts/thermal/prepro.hxx

src/libs/antares/study/area/area.cpp

@@ -295,9 +295,8 @@ void Area::resizeAllTimeseriesNumbers(uint n)
 bool Area::thermalClustersMinStablePowerValidity(std::vector<YString>& output) const
 {
     bool noErrorMinStabPow = true;
-    for (uint l = 0; l != thermal.clusterCount(); ++l)
+    for (auto cluster : thermal.list.each_enabled())
     {
-        auto& cluster = thermal.clusters[l];
         logs.debug() << "cluster : " << cluster->name();
         if ((not cluster->checkMinStablePower())
             || (cluster->minStablePower

src/libs/antares/study/area/list.cpp

@@ -774,14 +774,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
                                              StringT& buffer,
                                              const StudyLoadOptions& options)
 {
-    // Progression
-    options.progressTicks = 0;
-    options.progressTickCount
-      = area.thermal.list.size() * (options.loadOnlyNeeded ? 1 : 2) // prepro+series
-        + 1                                                         // links
-        + 4                                                         // load,solar,wind,hydro
-        + 1;                                                        // DSM,misc...
-
     // Reset
     area.filterSynthesis = filterAll;
     area.filterYearByYear = filterAll;
@@ -820,15 +812,10 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
         MatrixTestForPositiveValues_LimitWidth(buffer.c_str(), &area.miscGen, fhhPSP);
     }
 
-    ++options.progressTicks;
-    options.pushProgressLogs();
-
     // Links
     {
         buffer.clear() << study.folderInput << SEP << "links" << SEP << area.id;
         ret = AreaLinksLoadFromFolder(study, list, &area, buffer) && ret;
-        ++options.progressTicks;
-        options.pushProgressLogs();
     }
 
     // UI
@@ -858,9 +845,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
             ret = area.load.series.loadFromFile(buffer.c_str(), averageTs)
                   && ret;
         }
-
-        ++options.progressTicks;
-        options.pushProgressLogs();
     }
 
     // Solar
@@ -880,9 +864,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
                   && ret;
 
         }
-
-        ++options.progressTicks;
-        options.pushProgressLogs();
     }
 
     // Hydro
@@ -903,9 +884,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
             buffer.clear() << study.folderInput << SEP << "hydro" << SEP << "series";
             ret = area.hydro.series->loadFromFolder(study, area.id, buffer) && ret;
         }
-
-        ++options.progressTicks;
-        options.pushProgressLogs();
     }
 
     // Wind
@@ -924,9 +902,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
             ret = area.wind.series.loadFromFile(buffer.c_str(), averageTs)
                   && ret;
         }
-
-        ++options.progressTicks;
-        options.pushProgressLogs();
     }
 
     // Thermal cluster list
@@ -1101,7 +1076,6 @@ bool AreaList::loadFromFolder(const StudyLoadOptions& options)
             Area& area = *(i->second);
             buffer.clear() << pStudy.folderInput << thermalPlant << area.id;
             ret = area.thermal.list.loadFromFolder(pStudy, buffer.c_str(), &area) && ret;
-            area.thermal.prepareAreaWideIndexes();
         }
     }
 
@@ -1141,7 +1115,6 @@ bool AreaList::loadFromFolder(const StudyLoadOptions& options)
             Area& area = *(i->second);
             buffer.clear() << pStudy.folderInput << renewablePlant << area.id;
             ret = area.renewable.list.loadFromFolder(buffer.c_str(), &area) && ret;
-            area.renewable.prepareAreaWideIndexes();
         }
     }
 
@@ -1296,7 +1269,6 @@ void AreaListEnsureDataHydroPrepro(AreaList* l)
 
 void AreaListEnsureDataThermalPrepro(AreaList* l)
 {
-    assert(l && "The area list must not be nullptr");
     l->each([&](Data::Area& area) { area.thermal.list.ensureDataPrepro(); });
 }
 
@@ -1534,8 +1506,7 @@ ThermalCluster* AreaList::findClusterFromINIKey(const AnyString& key)
     Area* parentArea = findFromName(parentName);
     if (parentArea == nullptr)
         return nullptr;
-    return parentArea->thermal.list.find(id);
-
+    return parentArea->thermal.list.findInAll(id);
 }
 
 void AreaList::updateNameIDSet() const
@@ -1574,8 +1545,8 @@ void AreaList::removeWindTimeseries()
 void AreaList::removeThermalTimeseries()
 {
     each([](Data::Area& area) {
-        area.thermal.list.each(
-          [](Data::ThermalCluster& cluster) { cluster.series.reset(); });
+        for (auto c : area.thermal.list.all())
+            c->series.reset();
     });
 }
 

src/libs/antares/study/area/store-timeseries-numbers.cpp

@@ -90,7 +90,6 @@ void storeTimeseriesNumbersForWind(Solver::IResultWriter& writer, const Area& ar
 void storeTimeseriesNumbersForThermal(Solver::IResultWriter& writer, const Area& area)
 {
     area.thermal.list.storeTimeseriesNumbers(writer);
-    area.thermal.mustrunList.storeTimeseriesNumbers(writer);
 }
 
 void storeTimeseriesNumbersForRenewable(Solver::IResultWriter& writer, const Area& area)

src/libs/antares/study/binding_constraint/BindingConstraint.cpp

@@ -274,7 +274,7 @@ void BindingConstraint::copyWeights(const Study &study,
             if (localParent)
             {
                 const ThermalCluster *localTC
-                        = localParent->thermal.list.find(thermalCluster->id());
+                        = localParent->thermal.list.findInAll(thermalCluster->id());
                 if (localTC)
                     pClusterWeights[localTC] = weight;
             }
@@ -335,7 +335,7 @@ void BindingConstraint::copyOffsets(const Study &study,
             if (localParent)
             {
                 const ThermalCluster *localTC
-                        = localParent->thermal.list.find(thermalCluster->id());
+                        = localParent->thermal.list.findInAll(thermalCluster->id());
                 if (localTC)
                     pClusterOffsets[localTC] = offset;
             }

src/libs/antares/study/cleaner/cleaner-v20.cpp

@@ -135,7 +135,7 @@ static void listOfFilesAnDirectoriesToKeepForArea(PathList& e, PathList& p, cons
         buffer.clear() << "input/thermal/clusters/" << id << "/list.ini";
         e.add(buffer);
 
-        for (const auto& cluster : area->thermal.list)
+        for (auto cluster : area->thermal.list.all())
         {
             buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster->id();
             p.add(buffer);
@@ -164,7 +164,7 @@ static void listOfFilesAnDirectoriesToKeepForArea(PathList& e, PathList& p, cons
         buffer.clear() << "input/renewables/clusters/" << id << "/list.ini";
         e.add(buffer);
 
-        for (const auto& cluster : area->renewable.list)
+        for (const auto cluster : area->renewable.list.all())
         {
             buffer.clear() << "input/renewables/series/" << id << '/' << cluster->id();
             p.add(buffer);
@@ -353,7 +353,7 @@ bool listOfFilesAnDirectoriesToKeep(StudyCleaningInfos* infos)
             // Exclude
             listOfFilesAnDirectoriesToKeepForArea(e, p, area, buffer);
             // Clear the memory used by the thermal clusters of the area
-            area->thermal.list.clear();
+            area->thermal.list.clearAll();
 
             // Interconnections
             {

src/libs/antares/study/load-options.cpp

@@ -53,16 +53,6 @@ StudyLoadOptions::StudyLoadOptions() :
 {
 }
 
-void StudyLoadOptions::pushProgressLogs() const
-{
-    if (loadOnlyNeeded && progressTicks)
-    {
-        uint percent = progressTicks * 100 / progressTickCount;
-        if (percent < 100)
-            logs.info() << logMessage << "  " << percent << '%';
-    }
-}
-
 void StudyLoadOptions::checkForceSimulationMode()
 {
     const uint number_of_enabled_force_options

src/libs/antares/study/load-options.h

@@ -44,9 +44,6 @@ class StudyLoadOptions
     StudyLoadOptions();
     //@}
 
-    //! Push a new log entry according to the local progress data
-    void pushProgressLogs() const;
-
     void checkForceSimulationMode();
 
 public:
@@ -95,10 +92,6 @@ class StudyLoadOptions
 
     //! Temporary string for passing log message
     mutable Yuni::String logMessage;
-    //! Porgression, tick count
-    mutable uint progressTickCount;
-    //! The current number of ticks
-    mutable uint progressTicks;
 
     //! Display version number and exit
     bool displayVersion = false;

src/libs/antares/study/parts/common/cluster.cpp

@@ -9,13 +9,8 @@
 namespace Antares::Data
 {
 Cluster::Cluster(Area* parent) :
- unitCount(0),
- enabled(true),
- parentArea(parent),
- index(0),
- nominalCapacity(0.),
- areaWideIndex((uint)-1),
- series(tsNumbers)
+    parentArea(parent),
+    series(tsNumbers)
 {
 }
 

src/libs/antares/study/parts/common/cluster.h

@@ -24,37 +24,21 @@ struct CompareClusterName final
 class Cluster
 {
 public:
-    //! Map of renewable clusters
-    using Map = std::map<ClusterName, Cluster*>;
+    using Set = std::set<Cluster*, CompareClusterName>;
 
 public:
     Cluster(Area* parent);
 
     virtual ~Cluster() = default;
 
-    //! Get the cluster ID
     const ClusterName& id() const;
-
-    //! \name Group
-    //@{
-    //! Get the group of the cluster
     const ClusterName& group() const;
-
-    //! Get the renewable cluster name
     const ClusterName& name() const;
-
-    //! Set the name/ID
     void setName(const AnyString& newname);
-    //@}
-
-    //! Get the full cluster name
     Yuni::String getFullName() const;
 
     virtual uint groupId() const = 0;
-
-    //! Set the group
     virtual void setGroup(Data::ClusterName newgrp) = 0;
-    //@}
 
     /*!
     ** \brief Check and fix all values of a renewable cluster
@@ -64,13 +48,13 @@ class Cluster
     virtual bool integrityCheck() = 0;
 
     /*!
-    ** \brief Get the memory consummed by the renewable cluster (in bytes)
+    ** \brief Get the memory consummed by the cluster (in bytes)
     */
     virtual uint64_t memoryUsage() const = 0;
     //@}
 
     /*!
-    ** \brief Invalidate all data associated to the renewable cluster
+    ** \brief Invalidate all data associated to the cluster
     */
     virtual bool forceReload(bool reload) const = 0;
 
@@ -80,7 +64,7 @@ class Cluster
     void invalidateArea();
 
     /*!
-    ** \brief Mark the renewable cluster as modified
+    ** \brief Mark the cluster as modified
     */
     virtual void markAsModified() const = 0;
 
@@ -97,25 +81,24 @@ class Cluster
     */
     virtual void reset();
 
-    //! Count of unit
-    uint unitCount;
+    bool saveDataSeriesToFolder(const AnyString& folder) const;
+    bool loadDataSeriesFromFolder(Study& s, const AnyString& folder);
+
+    uint unitCount = 0;
 
-    //! Enabled
-    bool enabled;
+    bool isEnabled() const { return enabled; }
+    bool enabled = true;
 
     //! The associate area (alias)
     Area* parentArea;
 
-    //! The index of the cluster (within a list)
-    uint index;
-
     //! Capacity of reference per unit (MW) (pMax)
-    double nominalCapacity;
+    double nominalCapacity = 0.;
 
     //! The index of the cluster from the area's point of view
     //! \warning this variable is only valid when used by the solver
     // (initialized in the same time that the runtime data)
-    uint areaWideIndex;
+    uint areaWideIndex = (uint)-1;
 
     //! Series
     TimeSeries series;
@@ -131,20 +114,10 @@ class Cluster
     Matrix<> modulation;
 
 protected:
-    //! Name
     Data::ClusterName pName;
-    //! ID
     Data::ClusterName pID;
-    //! Group
     Data::ClusterName pGroup;
 
-public:
-    //! Set of clusters
-    using Set = std::set<Cluster*, CompareClusterName>;
-
-    bool saveDataSeriesToFolder(const AnyString& folder) const;
-    bool loadDataSeriesFromFolder(Study& s, const AnyString& folder);
-
 private:
     virtual unsigned int precision() const = 0;
 };