Clean thermal lists : simplifying added(...) function (common list cl…

…ass) and consequences
AntaresSimulatorTeam · Dec 22, 2023 · ee1e5f5 · ee1e5f5
1 parent fbf0ade
commit ee1e5f5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 38 deletions.
diff --git a/src/libs/antares/study/parts/common/cluster_list.cpp b/src/libs/antares/study/parts/common/cluster_list.cpp
@@ -114,18 +114,12 @@ void ClusterList<ClusterT>::rebuildIndex()
 }
 
 template<class ClusterT>
-typename ClusterList<ClusterT>::SharedPtr ClusterList<ClusterT>::add(
-    const ClusterList<ClusterT>::SharedPtr newcluster)
+void ClusterList<ClusterT>::add(const SharedPtr newcluster)
 {
-    if (!newcluster)
-        return nullptr;
-
     if (exists(newcluster->id()))
-        return newcluster;
-
+        return;
     clusters.push_back(newcluster);
     rebuildIndex();
-    return newcluster;
 }
 
 template<class ClusterT>

diff --git a/src/libs/antares/study/parts/common/cluster_list.h b/src/libs/antares/study/parts/common/cluster_list.h
@@ -51,7 +51,7 @@ class ClusterList
     ** \param t The cluster to add
     ** \return True if the cluster has been added, false otherwise
     */
-    SharedPtr add(const SharedPtr clusters);
+    void add(const SharedPtr clusters);
 
     /*!
     ** \brief Try to find a cluster from its id (const)

diff --git a/src/libs/antares/study/parts/renewable/cluster_list.cpp b/src/libs/antares/study/parts/renewable/cluster_list.cpp
@@ -160,13 +160,7 @@ bool RenewableClusterList::loadFromFolder(const AnyString& folder, Area* area)
                 cluster->integrityCheck();
 
                 // adding the renewable cluster
-                if (not add(cluster))
-                {
-                    // This error should never happen
-                    logs.error() << "Impossible to add the renewable cluster '" << cluster->name()
-                                 << "'";
-                    continue;
-                }
+                add(cluster);
             }
         }
 

diff --git a/src/libs/antares/study/parts/thermal/cluster_list.cpp b/src/libs/antares/study/parts/thermal/cluster_list.cpp
@@ -136,16 +136,10 @@ bool ThermalClusterList::loadFromFolder(Study& study, const AnyString& folder, A
         cluster->integrityCheck();
 
         // adding the thermal cluster
-        auto added = add(cluster);
-        if (not added)
-        {
-            // This error should never happen
-            logs.error() << "Impossible to add the thermal cluster '" << cluster->name()
-                         << "'";
-            continue;
-        }
+        add(cluster);
+
         // keeping track of the cluster
-        mapping[cluster->id()] = added;
+        mapping[cluster->id()] = cluster;
     }
 
     return ret;

diff --git a/src/libs/antares/study/parts/thermal/container.cpp b/src/libs/antares/study/parts/thermal/container.cpp
@@ -106,17 +106,10 @@ uint PartThermal::prepareClustersInMustRunMode()
             if (!cluster->enabled)
                 continue;
             // ...and attaching it into the second list
-            if (!mustrunList.add(cluster))
-            {
-                logs.error() << "Impossible to prepare the thermal cluster in 'must-run' mode: "
-                    << cluster->parentArea->name << "::" << cluster->name();
-            }
-            else
-            {
-                ++count;
-                logs.info() << "enabling 'must-run' mode for the cluster  "
-                    << cluster->parentArea->name << "::" << cluster->name();
-            }
+            mustrunList.add(cluster);
+            ++count;
+            logs.info() << "enabling 'must-run' mode for the cluster  "
+                        << cluster->parentArea->name << "::" << cluster->name();
 
             // the iterator has been invalidated, loop again
             mustContinue = true;

diff --git a/src/tests/end-to-end/utils/utils.cpp b/src/tests/end-to-end/utils/utils.cpp
@@ -23,9 +23,9 @@ std::shared_ptr<ThermalCluster> addClusterToArea(Area* area, const std::string&
     cluster->setName(clusterName);
     cluster->reset();
 
-    auto added = area->thermal.list.add(cluster);
+    area->thermal.list.add(cluster);
 
-    area->thermal.list.mapping[cluster->id()] = added;
+    area->thermal.list.mapping[cluster->id()] = cluster;
     area->thermal.prepareAreaWideIndexes();
 
     return cluster;