Move data validation to specialized functions [ANT-1213]

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

@@ -944,6 +944,7 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
             // if changes are required, please update reloadXCastData()
             buffer.clear() << study.folderInput << SEP << "hydro" << SEP << "prepro";
             ret = area.hydro.prepro->loadFromFolder(study, area.id, buffer.c_str()) && ret;
+            ret = area.hydro.prepro->validate(area.id) && ret;
         }
 
         auto* hydroSeries = area.hydro.series;

src/libs/antares/study/include/antares/study/parts/hydro/prepro.h

@@ -95,8 +95,9 @@ class PreproHydro
     ** \param folder The source folder (ex: `input/hydro/prepro`)
     ** \return A non-zero value if the operation succeeded, 0 otherwise
     */
-    bool loadFromFolder(Study& s, const AreaName& areaID, const char folder[]);
+    bool loadFromFolder(Study& s, const AreaName& areaID, const std::string& folder);
 
+    bool validate(const std::string& areaID);
     /*!
     ** \brief Save hydro settings for the prepro into a folder
     **

src/libs/antares/study/parts/hydro/hydromaxtimeseriesreader.cpp

@@ -47,6 +47,24 @@ HydroMaxTimeSeriesReader::HydroMaxTimeSeriesReader(PartHydro& hydro,
     dailyMaxPumpAndGen.reset(4U, DAYS_PER_YEAR, true);
 }
 
+static bool checkPower(const Matrix<>& dailyMaxPumpAndGen, const std::string& areaName)
+{
+    for (uint i = 0; i < 4U; ++i)
+    {
+        auto& col = dailyMaxPumpAndGen[i];
+        for (uint day = 0; day < DAYS_PER_YEAR; ++day)
+        {
+            if (col[day] < 0. || (i % 2U /*column hours*/ && col[day] > 24.))
+            {
+                logs.error() << areaName << ": invalid power or energy value";
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
 bool HydroMaxTimeSeriesReader::loadDailyMaxPowersAndEnergies(const AnyString& folder,
                                                              bool usedBySolver)
 {
@@ -90,21 +108,8 @@ bool HydroMaxTimeSeriesReader::loadDailyMaxPowersAndEnergies(const AnyString& fo
                                                  Matrix<>::optFixedSize,
                                                  &fileContent)
               && ret;
+        ret = checkPower(dailyMaxPumpAndGen, areaName_) && ret;
 
-        bool errorPowers = false;
-        for (uint i = 0; i < 4U; ++i)
-        {
-            auto& col = dailyMaxPumpAndGen[i];
-            for (uint day = 0; day < DAYS_PER_YEAR; ++day)
-            {
-                if (!errorPowers && (col[day] < 0. || (i % 2U /*column hours*/ && col[day] > 24.)))
-                {
-                    logs.error() << areaName_ << ": invalid power or energy value";
-                    errorPowers = true;
-                    ret = false;
-                }
-            }
-        }
     }
     return ret;
 }

src/libs/antares/study/parts/hydro/prepro.cpp

@@ -145,11 +145,10 @@ bool PreproHydro::saveToFolder(const AreaName& areaID, const char* folder)
     return false;
 }
 
-bool PreproHydro::loadFromFolder(Study& s, const AreaName& areaID, const char* folder)
+bool PreproHydro::loadFromFolder(Study& s, const AreaName& areaID, const std::string& folder)
 {
     /* Asserts */
-    assert(folder);
-    assert('\0' != *folder);
+    assert(!folder.empty());
 
     enum
     {
@@ -161,6 +160,17 @@ bool PreproHydro::loadFromFolder(Study& s, const AreaName& areaID, const char* f
 
     buffer.clear() << folder << SEP << areaID << SEP << "prepro.ini";
     bool ret = PreproHydroLoadSettings(this, buffer);
+
+    buffer.clear() << folder << SEP << areaID << SEP << "energy.txt";
+    ret = data.loadFromCSVFile(buffer, hydroPreproMax, 12, mtrxOption, &s.dataBuffer) && ret;
+
+    return ret;
+}
+
+bool PreproHydro::validate(const std::string& areaID)
+{
+    bool ret = true;
+
     if (intermonthlyCorrelation < 0. || intermonthlyCorrelation > 1.)
     {
         logs.error() << "Hydro: Prepro: `" << areaID
@@ -175,77 +185,58 @@ bool PreproHydro::loadFromFolder(Study& s, const AreaName& areaID, const char* f
         }
     }
 
-    buffer.clear() << folder << SEP << areaID << SEP << "energy.txt";
-    ret = data.loadFromCSVFile(buffer, hydroPreproMax, 12, mtrxOption, &s.dataBuffer) && ret;
-
-    if (JIT::enabled)
-    {
-        return ret;
-    }
-
-    // Checks
+    const auto& col = data[powerOverWater];
+    for (unsigned i = 0; i != data.height; ++i)
     {
-        auto& col = data[powerOverWater];
-        for (uint i = 0; i != data.height; ++i)
+        const double d = col[i];
+        if (d < 0. || d > 1.)
         {
-            const double d = col[i];
-            if (d < 0. || d > 1.)
-            {
-                logs.error() << "Hydro: Prepro: " << areaID
-                             << ": invalid value for ROR (line: " << (i + 1) << ")";
-            }
+            logs.error() << "Hydro: Prepro: " << areaID
+                         << ": invalid value for ROR (line: " << (i + 1) << ")";
         }
     }
 
-    {
-        auto& colMin = data[minimumEnergy];
-        auto& colMax = data[maximumEnergy];
+    const auto& colMin = data[minimumEnergy];
+    const auto& colMax = data[maximumEnergy];
 
-        for (uint i = 0; i != data.height; ++i)
+    for (unsigned i = 0; i != data.height; ++i)
+    {
+        if (colMin[i] < 0.)
         {
-            if (colMin[i] < 0.)
-            {
-                ret = false;
-                logs.error() << "Hydro: Prepro: `" << areaID
-                             << "`: minimum energy: At least one value is negative (line: "
-                             << (i + 1) << ')';
-                continue;
-            }
-            if (colMin[i] > colMax[i])
-            {
-                ret = false;
-                logs.error() << "Hydro: Prepro: `" << areaID
-                             << "`: the minimum energy must be less than the maximum energy (line: "
-                             << (i + 1) << ')';
-            }
+            ret = false;
+            logs.error() << "Hydro: Prepro: `" << areaID
+                         << "`: minimum energy: At least one value is negative (line: "
+                         << (i + 1) << ')';
+            continue;
+        }
+        if (colMin[i] > colMax[i])
+        {
+            ret = false;
+            logs.error() << "Hydro: Prepro: `" << areaID
+                         << "`: the minimum energy must be less than the maximum energy (line: "
+                         << (i + 1) << ')';
         }
     }
 
+    const auto& colExp = data[expectation];
+    for (unsigned i = 0; i != data.height; i++)
     {
-        auto& colExp = data[expectation];
-
-        for (uint i = 0; i != data.height; i++)
+        if (colExp[i] < 0.)
         {
-            if (colExp[i] < 0.)
-            {
-                ret = false;
-                logs.error() << "Hydro: Prepro: `" << areaID
-                             << "`: invalid value for expectation (line: " << (i + 1) << ")";
-            }
+            ret = false;
+            logs.error() << "Hydro: Prepro: `" << areaID
+                         << "`: invalid value for expectation (line: " << (i + 1) << ")";
         }
     }
 
+    const auto& colStdDev = data[stdDeviation];
+    for (unsigned i = 0; i != data.height; i++)
     {
-        auto& colStdDev = data[stdDeviation];
-
-        for (uint i = 0; i != data.height; i++)
+        if (colStdDev[i] < 0.)
         {
-            if (colStdDev[i] < 0.)
-            {
-                ret = false;
-                logs.error() << "Hydro: Prepro: `" << areaID
-                             << "`: invalid value for standard deviation (line: " << (i + 1) << ")";
-            }
+            ret = false;
+            logs.error() << "Hydro: Prepro: `" << areaID
+                         << "`: invalid value for standard deviation (line: " << (i + 1) << ")";
         }
     }