Simplify TS numbers drawings, fix bug related to refresh & local thermal generation

src/libs/antares/constants.h

@@ -35,11 +35,9 @@
 /*! Vendor */
 #define LOG_APPLICATION_VENDOR "RTE"
 
-/*! Days per year */
-#define DAYS_PER_YEAR 365
-
-/*! Hours per year */
-#define HOURS_PER_YEAR 8760
+const unsigned int HOURS_PER_DAY = 24;
+const unsigned int DAYS_PER_YEAR = 365;
+const unsigned int HOURS_PER_YEAR = 8760;
 
 namespace Antares::Constants
 {

src/libs/antares/series/series.cpp

@@ -38,8 +38,6 @@ using namespace Yuni;
 namespace Antares::Data
 {
 
-const std::vector<double> TimeSeries::emptyColumn(HOURS_PER_YEAR);
-
 TimeSeries::TimeSeries(numbers& tsNumbers) : timeseriesNumbers(tsNumbers)
 {}
 
@@ -74,24 +72,17 @@ int TimeSeries::saveToFile(const std::string& filename, bool saveEvenIfAllZero)
 
 double TimeSeries::getCoefficient(uint32_t year, uint32_t timestep) const
 {
-    if (timeSeries.width == 0)
-        return 0;
     return timeSeries[getSeriesIndex(year)][timestep];
 }
 
 const double* TimeSeries::getColumn(uint32_t year) const
 {
-    if (timeSeries.width == 0)
-        return emptyColumn.data();
     return timeSeries[getSeriesIndex(year)];
 }
 
 uint32_t TimeSeries::getSeriesIndex(uint32_t year) const
 {
-    if (timeSeries.width == 1)
-        return 0;
-    else
-        return timeseriesNumbers[0][year];
+    return timeseriesNumbers[0][year];
 }
 
 double* TimeSeries::operator[](uint32_t index)

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

@@ -257,39 +257,21 @@ void Area::resetToDefaultValues()
     invalidateJIT = true;
 }
 
-void Area::resizeAllTimeseriesNumbers(uint n)
+void Area::resizeAllTimeseriesNumbers(uint nbYears)
 {
-    assert(n < 200000); // arbitrary number
-
-    // asserts
     assert(hydro.series and "series must not be nullptr !");
 
-    if (!n)
+    load.series.timeseriesNumbers.reset(1, nbYears);
+    solar.series.timeseriesNumbers.reset(1, nbYears);
+    wind.series.timeseriesNumbers.reset(1, nbYears);
+    hydro.series->timeseriesNumbers.reset(1, nbYears);
+    for (auto& namedLink : links)
     {
-        load.series.timeseriesNumbers.clear();
-        solar.series.timeseriesNumbers.clear();
-        wind.series.timeseriesNumbers.clear();
-        hydro.series->timeseriesNumbers.clear();
-        for (auto& namedLink : links)
-        {
-            AreaLink* link = namedLink.second;
-            link->timeseriesNumbers.clear();
-        }
-    }
-    else
-    {
-        load.series.timeseriesNumbers.resize(1, n);
-        solar.series.timeseriesNumbers.resize(1, n);
-        wind.series.timeseriesNumbers.resize(1, n);
-        hydro.series->timeseriesNumbers.resize(1, n);
-        for (auto& namedLink : links)
-        {
-            AreaLink* link = namedLink.second;
-            link->timeseriesNumbers.resize(1, n);
-        }
+        AreaLink* link = namedLink.second;
+        link->timeseriesNumbers.reset(1, nbYears);
     }
-    thermal.resizeAllTimeseriesNumbers(n);
-    renewable.resizeAllTimeseriesNumbers(n);
+    thermal.resizeAllTimeseriesNumbers(nbYears);
+    renewable.resizeAllTimeseriesNumbers(nbYears);
 }
 
 bool Area::thermalClustersMinStablePowerValidity(std::vector<YString>& output) const

src/libs/antares/study/area/area.h

@@ -154,7 +154,7 @@ class Area final : private Yuni::NonCopyable<Area>
     **
     ** \param n A number of years
     */
-    void resizeAllTimeseriesNumbers(uint n);
+    void resizeAllTimeseriesNumbers(uint nbYears);
 
     /*!
     ** \brief Check if a link with another area is already established

src/libs/antares/study/binding_constraint/BindingConstraintGroup.cpp

@@ -22,14 +22,6 @@ namespace Antares::Data {
         return constraints_;
     }
 
-    void BindingConstraintGroup::fixTSNumbersWhenWidthIsOne() {
-        if (std::all_of(constraints_.begin(), constraints_.end(), [](auto constraint){
-            return constraint->RHSTimeSeries().width == 1;
-        })) {
-            timeseriesNumbers.fillColumn(0, 0);
-        }
-    }
-
     unsigned BindingConstraintGroup::numberOfTimeseries() const {
         //Assume all BC in a group have the same width
         if (constraints_.empty()) return 0;

src/libs/antares/study/binding_constraint/BindingConstraintGroup.h

@@ -15,7 +15,6 @@ class BindingConstraintGroup {
     [[nodiscard]] std::string name() { return name_; }
     void add(const std::shared_ptr<BindingConstraint>& constraint);
     [[nodiscard]] std::set<std::shared_ptr<BindingConstraint>> constraints() const;
-    void fixTSNumbersWhenWidthIsOne();
     [[nodiscard]] unsigned numberOfTimeseries() const;
 
 public:

src/libs/antares/study/binding_constraint/BindingConstraintGroupRepository.cpp

@@ -54,13 +54,7 @@ namespace Antares::Data {
     void BindingConstraintGroupRepository::resizeAllTimeseriesNumbers(unsigned int nb_years) {
         std::for_each(groups_.begin(), groups_.end(), [&](auto &group) {
             group->timeseriesNumbers.clear();
-            group->timeseriesNumbers.resize(1, nb_years);
-        });
-    }
-
-    void BindingConstraintGroupRepository::fixTSNumbersWhenWidthIsOne() {
-        std::for_each(groups_.begin(), groups_.end(), [](auto& group) {
-            group->fixTSNumbersWhenWidthIsOne();
+            group->timeseriesNumbers.reset(1, nb_years);
         });
     }
 

src/libs/antares/study/binding_constraint/BindingConstraintGroupRepository.h

@@ -22,8 +22,6 @@ class BindingConstraintGroupRepository {
 
     void resizeAllTimeseriesNumbers(unsigned nb_years);
 
-    void fixTSNumbersWhenWidthIsOne();
-
     BindingConstraintGroup* operator[](const std::string& name) const;
 
     using iterator = std::vector<std::unique_ptr<BindingConstraintGroup>>::iterator;

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

@@ -236,11 +236,30 @@ void DataSeriesHydro::reset()
     count = 1;
 }
 
-void DataSeriesHydro::resizeRORandSTORAGE(unsigned int width)
+void DataSeriesHydro::resize_ROR_STORAGE_MINGEN_whenGeneratedTS(unsigned int newWidth)
 {
-    ror.resize(width, HOURS_PER_YEAR);
-    storage.resize(width, DAYS_PER_YEAR);
-    count = width;
+    // This function is called in case hydro TS are generated.
+    // ROR ans STORAGE are resized here, and will be overriden at some point.
+    // MINGEN TS are different : when generating hydro TS, mingen TS are not generated, 
+    // but only resized, so that their size is the same as ROR and STORAGE TS.
+    // When resizing MINGEN :
+    //  - If we extend mingen TS, we keep already existing TS and fill the extra ones 
+    //    with a copy of the first TS
+    //  - if we reduce mingen TS, we remove some existing TS, but we must keep intact
+    //    the remaining ones.
+    ror.resize(newWidth, HOURS_PER_YEAR);
+    storage.resize(newWidth, DAYS_PER_YEAR);
+
+    // Resizing mingen (mingen has necessarily at least one column, by construction)
+    uint mingenOriginalSize = mingen.timeSeries.width;
+    mingen.timeSeries.resizeWithoutDataLost(newWidth, mingen.timeSeries.height);
+    if (mingenOriginalSize < newWidth)
+    {
+        for (uint col = mingenOriginalSize; col < newWidth; ++col)
+            mingen.timeSeries.pasteToColumn(col, mingen[0]);
+    }
+
+    count = newWidth;
 }
 
 void DataSeriesHydro::resizeGenerationTS(unsigned int w, unsigned int h)

src/libs/antares/study/parts/hydro/series.h

@@ -58,7 +58,7 @@ class DataSeriesHydro
     */
     void reset();
 
-    void resizeRORandSTORAGE(unsigned int width);
+    void resize_ROR_STORAGE_MINGEN_whenGeneratedTS(unsigned int width);
     void resizeGenerationTS(unsigned int w, unsigned int h);
 
     /*!

src/libs/antares/study/parts/solar/container.cpp

@@ -70,7 +70,7 @@ uint64_t Container::memoryUsage() const
 
 void Container::resetToDefault()
 {
-    series.timeSeries.reset();
+    series.reset();
     if (prepro)
         prepro->resetToDefault();
 }

src/solver/simulation/solver.hxx

@@ -312,6 +312,8 @@ void ISimulation<Impl>::run()
 
     ImplementationType::setNbPerformedYearsInParallel(pNbMaxPerformedYearsInParallel);
 
+    TSGenerator::ResizeGeneratedTimeSeries(study.areas, study.parameters);
+
     if (settings.tsGeneratorsOnly)
     {
         // Only the preprocessors can be used
@@ -323,7 +325,7 @@ void ISimulation<Impl>::run()
 
         // Destroy the TS Generators if any
         // It will export the time-series into the output in the same time
-        Solver::TSGenerator::DestroyAll(study);
+        TSGenerator::DestroyAll(study);
     }
     else
     {
@@ -370,7 +372,7 @@ void ISimulation<Impl>::run()
         }
         // Destroy the TS Generators if any
         // It will export the time-series into the output in the same time
-        Solver::TSGenerator::DestroyAll(study);
+        TSGenerator::DestroyAll(study);
 
         // Post operations
         {
@@ -449,7 +451,7 @@ void ISimulation<Impl>::regenerateTimeSeries(uint year)
     // * The option "Preprocessor" is checked in the interface _and_ year == 0
     // * Both options "Preprocessor" and "Refresh" are checked in the interface
     //   _and_ the refresh must be done for the given year (always done for the first year).
-    using namespace Solver::TSGenerator;
+    using namespace TSGenerator;
     // Load
     if (pData.haveToRefreshTSLoad && (year % pData.refreshIntervalLoad == 0))
     {