Refactor common ClusterList class

src/libs/antares/InfoCollection/StudyInfoCollector.cpp

@@ -59,13 +59,9 @@ void StudyInfoCollector::enabledThermalClustersCountToFileContent(FileContent& f
     for (auto i = study_.areas.begin(); i != end; ++i)
     {
         Area& area = *(i->second);
-        auto end = area.thermal.list.end();
-        for (auto i = area.thermal.list.begin(); i != end; ++i)
-        {
-            auto& cluster = i->second;
+        for (const auto& cluster : area.thermal.list)
             if (cluster->enabled)
                 nbEnabledThermalClusters++;
-        }
     }
 
     // Adding an item related to number of enabled thermal clusters to the file content
@@ -152,4 +148,4 @@ void SimulationInfoCollector::toFileContent(FileContent& file_content)
             "optimization problem", "non-zero coefficients", opt_info_.nbNonZeroCoeffs);
 }
 
-}
+}

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

@@ -135,23 +135,19 @@ static void listOfFilesAnDirectoriesToKeepForArea(PathList& e, PathList& p, cons
         buffer.clear() << "input/thermal/clusters/" << id << "/list.ini";
         e.add(buffer);
 
-        auto end = area->thermal.list.end();
-        for (auto i = area->thermal.list.begin(); i != end; ++i)
+        for (const auto& cluster : area->thermal.list)
         {
-            // Reference to the thermal cluster
-            auto& cluster = *(i->second);
-
-            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster.id();
+            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster->id();
             p.add(buffer);
-            buffer.clear() << "input/thermal/series/" << id << '/' << cluster.id();
+            buffer.clear() << "input/thermal/series/" << id << '/' << cluster->id();
             p.add(buffer);
 
-            buffer.clear() << "input/thermal/series/" << id << '/' << cluster.id() << "/series.txt";
+            buffer.clear() << "input/thermal/series/" << id << '/' << cluster->id() << "/series.txt";
             e.add(buffer);
 
-            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster.id() << "/data.txt";
+            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster->id() << "/data.txt";
             e.add(buffer);
-            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster.id()
+            buffer.clear() << "input/thermal/prepro/" << id << '/' << cluster->id()
                            << "/modulation.txt";
             e.add(buffer);
         }
@@ -168,16 +164,12 @@ static void listOfFilesAnDirectoriesToKeepForArea(PathList& e, PathList& p, cons
         buffer.clear() << "input/renewables/clusters/" << id << "/list.ini";
         e.add(buffer);
 
-        auto end = area->renewable.list.end();
-        for (auto i = area->renewable.list.begin(); i != end; ++i)
+        for (const auto& cluster : area->renewable.list)
         {
-            // Reference to the thermal cluster
-            auto& cluster = *(i->second);
-
-            buffer.clear() << "input/renewables/series/" << id << '/' << cluster.id();
+            buffer.clear() << "input/renewables/series/" << id << '/' << cluster->id();
             p.add(buffer);
 
-            buffer.clear() << "input/renewables/series/" << id << '/' << cluster.id()
+            buffer.clear() << "input/renewables/series/" << id << '/' << cluster->id()
                            << "/series.txt";
             e.add(buffer);
         }

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

@@ -49,45 +49,43 @@ void Cluster::setName(const AnyString& newname)
 }
 
 #define SEP Yuni::IO::Separator
-int Cluster::saveDataSeriesToFolder(const AnyString& folder) const
+bool Cluster::saveDataSeriesToFolder(const AnyString& folder) const
 {
-    if (not folder.empty())
+    if (folder.empty())
+        return true;
+
+    Yuni::Clob buffer;
+
+    buffer.clear() << folder << SEP << parentArea->id << SEP << id();
+    if (Yuni::IO::Directory::Create(buffer))
     {
-        Yuni::Clob buffer;
-
-        buffer.clear() << folder << SEP << parentArea->id << SEP << id();
-        if (Yuni::IO::Directory::Create(buffer))
-        {
-            int ret = 1;
-            buffer.clear() << folder << SEP << parentArea->id << SEP << id() << SEP << "series.txt";
-            ret = series.timeSeries.saveToCSVFile(buffer, precision()) && ret;
-
-            return ret;
-        }
-        return 0;
+        bool ret = true;
+        buffer.clear() << folder << SEP << parentArea->id << SEP << id() << SEP << "series.txt";
+        ret = series.timeSeries.saveToCSVFile(buffer, precision()) && ret;
+
+        return ret;
     }
-    return 1;
+    return false;
 }
 
-int Cluster::loadDataSeriesFromFolder(Study& s, const AnyString& folder)
+bool Cluster::loadDataSeriesFromFolder(Study& s, const AnyString& folder)
 {
-    if (not folder.empty())
-    {
-        auto& buffer = s.bufferLoadingTS;
+    if (folder.empty())
+        return true;
 
-        int ret = 1;
-        buffer.clear() << folder << SEP << parentArea->id << SEP << id() << SEP << "series."
-                       << s.inputExtension;
-        ret = series.timeSeries.loadFromCSVFile(buffer, 1, HOURS_PER_YEAR, &s.dataBuffer) && ret;
+    auto& buffer = s.bufferLoadingTS;
 
-        if (s.usedByTheSolver && s.parameters.derated)
-            series.timeSeries.averageTimeseries();
+    bool ret = 1;
+    buffer.clear() << folder << SEP << parentArea->id << SEP << id() << SEP << "series."
+        << s.inputExtension;
+    ret = series.timeSeries.loadFromCSVFile(buffer, 1, HOURS_PER_YEAR, &s.dataBuffer) && ret;
 
-        series.timeseriesNumbers.clear();
+    if (s.usedByTheSolver && s.parameters.derated)
+        series.timeSeries.averageTimeseries();
 
-        return ret;
-    }
-    return 1;
+    series.timeseriesNumbers.clear();
+
+    return ret;
 }
 #undef SEP
 

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

@@ -142,8 +142,8 @@ class Cluster
     //! Set of clusters
     using Set = std::set<Cluster*, CompareClusterName>;
 
-    int saveDataSeriesToFolder(const AnyString& folder) const;
-    int loadDataSeriesFromFolder(Study& s, const AnyString& folder);
+    bool saveDataSeriesToFolder(const AnyString& folder) const;
+    bool loadDataSeriesFromFolder(Study& s, const AnyString& folder);
 
 private:
     virtual unsigned int precision() const = 0;