Separation of loading and validation for renewables clusters [ANT-121…

…3] (#2175)
AntaresSimulatorTeam · Jun 20, 2024 · 7dbb39c · 7dbb39c
1 parent 9be866c
commit 7dbb39c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/libs/antares/study/area/list.cpp b/src/libs/antares/study/area/list.cpp
@@ -1222,6 +1222,7 @@ 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;
+            ret = area.renewable.list.validateClusters() && ret;
         }
     }
 

diff --git a/src/libs/antares/study/include/antares/study/parts/renewable/cluster_list.h b/src/libs/antares/study/include/antares/study/parts/renewable/cluster_list.h
@@ -26,9 +26,7 @@
 #include "../common/cluster_list.h"
 #include "cluster.h"
 
-namespace Antares
-{
-namespace Data
+namespace Antares::Data
 {
 /*!
 ** \brief List of renewable clusters
@@ -39,10 +37,12 @@ class RenewableClusterList: public ClusterList<RenewableCluster>
 public:
     std::string typeID() const override;
     uint64_t memoryUsage() const override;
+
     bool loadFromFolder(const AnyString& folder, Area* area);
+    bool validateClusters() const;
+
     bool saveToFolder(const AnyString& folder) const override;
 }; // class RenewableClusterList
-} // namespace Data
-} // namespace Antares
+} // namespace Antares::Data
 
 #endif /* __ANTARES_LIBS_STUDY_PARTS_RENEWABLE_CLUSTER_LIST_H__ */
diff --git a/src/libs/antares/study/parts/renewable/cluster_list.cpp b/src/libs/antares/study/parts/renewable/cluster_list.cpp
@@ -28,9 +28,7 @@
 
 using namespace Yuni;
 
-namespace Antares
-{
-namespace Data
+namespace Antares::Data
 {
 
 #define SEP IO::Separator
@@ -211,7 +209,6 @@ bool RenewableClusterList::loadFromFolder(const AnyString& folder, Area* area)
                     continue;
                 }
 
-                cluster->integrityCheck();
                 addToCompleteList(cluster);
             }
         }
@@ -223,7 +220,17 @@ bool RenewableClusterList::loadFromFolder(const AnyString& folder, Area* area)
     return false;
 }
 
+bool RenewableClusterList::validateClusters() const
+{
+    bool ret = true;
+    for (const auto& cluster : allClusters_)
+    {
+        ret = cluster->integrityCheck() && ret;
+    }
+
+    return ret;
+}
+
 #undef SEP
 
-} // namespace Data
-} // namespace Antares
+} // namespace Antares::Data