Create struct

AntaresSimulatorTeam · Dec 19, 2024 · 5af3641 · 5af3641
1 parent 02d75d0
commit 5af3641
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraint.h b/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraint.h
@@ -20,7 +20,6 @@
  */
 
 #pragma once
-#include <optional>
 #include <set>
 #include <string>
 
@@ -38,7 +37,13 @@ struct AdditionalConstraint
 
     unsigned int globalIndex = 0;
 
-    std::optional<std::string> validate() const;
+    struct ValidateResult
+    {
+        bool ok;
+        std::string error_msg;
+    };
+
+    ValidateResult validate() const;
 
 private:
     bool isValidVariable() const;

diff --git a/src/libs/antares/study/parts/short-term-storage/AdditionalConstraint.cpp b/src/libs/antares/study/parts/short-term-storage/AdditionalConstraint.cpp
@@ -22,29 +22,29 @@
 
 namespace Antares::Data::ShortTermStorage
 {
-std::optional<std::string> AdditionalConstraint::validate() const
+AdditionalConstraint::ValidateResult AdditionalConstraint::validate() const
 {
     if (cluster_id.empty())
     {
-        return "Cluster ID is empty.";
+        return {false, "Cluster ID is empty."};
     }
 
     if (!isValidVariable())
     {
-        return "Invalid variable type. Must be 'injection', 'withdrawal', or 'netting'.";
+        return {false, "Invalid variable type. Must be 'injection', 'withdrawal', or 'netting'."};
     }
 
     if (!isValidOperatorType())
     {
-        return "Invalid operator type. Must be 'less', 'equal', or 'greater'.";
+        return {false, "Invalid operator type. Must be 'less', 'equal', or 'greater'."};
     }
 
     if (!isValidHoursRange())
     {
-        return "Hours set contains invalid values. Must be between 1 and 168.";
+        return {false, "Hours set contains invalid values. Must be between 1 and 168."};
     }
 
-    return {};
+    return {true, ""};
 }
 
 bool AdditionalConstraint::isValidHoursRange() const

diff --git a/src/libs/antares/study/parts/short-term-storage/container.cpp b/src/libs/antares/study/parts/short-term-storage/container.cpp
@@ -125,10 +125,10 @@ bool STStorageInput::LoadConstraintsFromIniFile(const fs::path& parent_path)
             }
         }
 
-        if (auto errorMaybe = constraint.validate())
+        if (auto ret = constraint.validate(); !ret.ok)
         {
             logs.error() << "Invalid constraint in section: " << section->name;
-            logs.error() << errorMaybe.value();
+            logs.error() << ret.error_msg;
             return false;
         }