Refactor time series

src/libs/antares/study/CMakeLists.txt

@@ -114,9 +114,6 @@ source_group("study\\part\\short-term-storage" FILES ${SRC_STUDY_PART_SHORT_TERM
 set(SRC_STUDY_PART_WIND
         parts/wind/container.h
         parts/wind/container.cpp
-        parts/wind/series.h
-        parts/wind/series.hxx
-        parts/wind/series.cpp
         parts/wind/prepro.h
         parts/wind/prepro.hxx
         parts/wind/prepro.cpp
@@ -202,19 +199,13 @@ set(SRC_STUDY
         # Load
         parts/load/container.h
         parts/load/container.cpp
-        parts/load/series.h
-        parts/load/series.hxx
-        parts/load/series.cpp
         parts/load/prepro.cpp
         parts/load/prepro.h
         parts/load/prepro.hxx
 
         # Solar
         parts/solar/container.h
         parts/solar/container.cpp
-        parts/solar/series.h
-        parts/solar/series.hxx
-        parts/solar/series.cpp
         parts/solar/prepro.cpp
         parts/solar/prepro.h
         parts/solar/prepro.hxx

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

@@ -205,12 +205,6 @@ void Area::createMissingData()
 
 void Area::createMissingTimeSeries()
 {
-    if (!load.series)
-        load.series = new DataSeriesLoad();
-    if (!solar.series)
-        solar.series = new DataSeriesSolar();
-    if (!wind.series)
-        wind.series = new DataSeriesWind();
     if (!hydro.series)
         hydro.series = new DataSeriesHydro();
     thermal.list.ensureDataTimeSeries();
@@ -269,16 +263,13 @@ void Area::resizeAllTimeseriesNumbers(uint n)
     assert(n < 200000); // arbitrary number
 
     // asserts
-    assert(load.series and "load.series must not be nullptr !");
-    assert(solar.series and "solar.series must not be nullptr !");
-    assert(wind.series and "wind.series must not be nullptr !");
     assert(hydro.series and "series must not be nullptr !");
 
     if (!n)
     {
-        load.series->timeseriesNumbers.clear();
-        solar.series->timeseriesNumbers.clear();
-        wind.series->timeseriesNumbers.clear();
+        load.series.timeseriesNumbers.clear();
+        solar.series.timeseriesNumbers.clear();
+        wind.series.timeseriesNumbers.clear();
         hydro.series->timeseriesNumbers.clear();
         for (auto& namedLink : links)
         {
@@ -288,9 +279,9 @@ void Area::resizeAllTimeseriesNumbers(uint n)
     }
     else
     {
-        load.series->timeseriesNumbers.resize(1, n);
-        solar.series->timeseriesNumbers.resize(1, n);
-        wind.series->timeseriesNumbers.resize(1, n);
+        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)
         {

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

@@ -795,31 +795,16 @@ AreaLink* AreaListAddLink(AreaList* l, const char area[], const char with[], boo
 
 void AreaListClearAllLinks(AreaList* l);
 
-/*!
-** \brief Ensure data for load time-series are initialized
-*/
-void AreaListEnsureDataLoadTimeSeries(AreaList* l);
-
 /*!
 ** \brief Ensure data for load prepro are initialized
 */
 void AreaListEnsureDataLoadPrepro(AreaList* l);
 
-/*!
-** \brief Ensure data for load time-series are initialized
-*/
-void AreaListEnsureDataSolarTimeSeries(AreaList* l);
-
 /*!
 ** \brief Ensure data for solar prepro are initialized
 */
 void AreaListEnsureDataSolarPrepro(AreaList* l);
 
-/*!
-** \brief Ensure data for wind time-series are initialized
-*/
-void AreaListEnsureDataWindTimeSeries(AreaList* l);
-
 /*!
 ** \brief Ensure data for wind prepro are initialized
 */

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

@@ -215,11 +215,8 @@ static bool AreaListSaveToFolderSingleArea(const Area& area, Clob& buffer, const
                            << area.id;
             ret = area.load.prepro->saveToFolder(buffer) && ret;
         }
-        if (area.load.series) // Series
-        {
-            buffer.clear() << folder << SEP << "input" << SEP << "load" << SEP << "series";
-            ret = DataSeriesLoadSaveToFolder(area.load.series, area.id, buffer.c_str()) && ret;
-        }
+        buffer.clear() << folder << SEP << "input" << SEP << "load" << SEP << "series";
+        area.load.series.timeSeriesSaveToFolder(area.id, buffer.c_str(), "load_") && ret;
     }
 
     // Solar
@@ -230,11 +227,8 @@ static bool AreaListSaveToFolderSingleArea(const Area& area, Clob& buffer, const
                            << area.id;
             ret = area.solar.prepro->saveToFolder(buffer) && ret;
         }
-        if (area.solar.series) // Series
-        {
-            buffer.clear() << folder << SEP << "input" << SEP << "solar" << SEP << "series";
-            ret = DataSeriesSolarSaveToFolder(area.solar.series, area.id, buffer.c_str()) && ret;
-        }
+        buffer.clear() << folder << SEP << "input" << SEP << "solar" << SEP << "series";
+        ret = area.solar.series.timeSeriesSaveToFolder(area.id, buffer.c_str(), "solar_") && ret;
     }
 
     // Hydro
@@ -263,11 +257,9 @@ static bool AreaListSaveToFolderSingleArea(const Area& area, Clob& buffer, const
                            << area.id;
             ret = area.wind.prepro->saveToFolder(buffer) && ret;
         }
-        if (area.wind.series) // Series
-        {
-            buffer.clear() << folder << SEP << "input" << SEP << "wind" << SEP << "series";
-            ret = DataSeriesWindSaveToFolder(area.wind.series, area.id, buffer.c_str()) && ret;
-        }
+
+        buffer.clear() << folder << SEP << "input" << SEP << "wind" << SEP << "series";
+        ret = area.wind.series.timeSeriesSaveToFolder(area.id, buffer.c_str(), "wind_") && ret;
     }
 
     // Thermal cluster list
@@ -857,10 +849,10 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
                            << area.id;
             ret = area.load.prepro->loadFromFolder(buffer) && ret;
         }
-        if (area.load.series && (!options.loadOnlyNeeded || !area.load.prepro)) // Series
+        if (!options.loadOnlyNeeded || !area.load.prepro) // Series
         {
             buffer.clear() << study.folderInput << SEP << "load" << SEP << "series";
-            ret = DataSeriesLoadLoadFromFolder(study, area.load.series, area.id, buffer.c_str())
+            ret = area.load.series.timeSeriesLoadFromFolder(study, area.id, buffer.c_str(), "load_")
                   && ret;
         }
 
@@ -877,10 +869,10 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
                            << area.id;
             ret = area.solar.prepro->loadFromFolder(buffer) && ret;
         }
-        if (area.solar.series && (!options.loadOnlyNeeded || !area.solar.prepro)) // Series
+        if (!options.loadOnlyNeeded || !area.solar.prepro) // Series
         {
             buffer.clear() << study.folderInput << SEP << "solar" << SEP << "series";
-            ret = DataSeriesSolarLoadFromFolder(study, area.solar.series, area.id, buffer.c_str())
+            ret = area.solar.series.timeSeriesLoadFromFolder(study, area.id, buffer.c_str(), "solar_")
                 && ret;
         }
 
@@ -920,10 +912,10 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
                            << area.id;
             ret = area.wind.prepro->loadFromFolder(buffer) && ret;
         }
-        if (area.wind.series && (!options.loadOnlyNeeded || !area.wind.prepro)) // Series
+        if (!options.loadOnlyNeeded || !area.wind.prepro) // Series
         {
             buffer.clear() << study.folderInput << SEP << "wind" << SEP << "series";
-            ret = DataSeriesWindLoadFromFolder(study, area.wind.series, area.id, buffer.c_str())
+            ret = area.wind.series.timeSeriesLoadFromFolder(study, area.id, buffer.c_str(), "wind_")
                   && ret;
         }
 
@@ -1036,9 +1028,6 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
 
 void AreaList::ensureDataIsInitialized(Parameters& params, bool loadOnlyNeeded)
 {
-    AreaListEnsureDataLoadTimeSeries(this);
-    AreaListEnsureDataSolarTimeSeries(this);
-    AreaListEnsureDataWindTimeSeries(this);
     AreaListEnsureDataHydroTimeSeries(this);
     AreaListEnsureDataThermalTimeSeries(this);
     AreaListEnsureDataRenewableTimeSeries(this);
@@ -1246,17 +1235,6 @@ Area* AreaListFindPtr(AreaList* l, const Area* ptr)
     return nullptr;
 }
 
-void AreaListEnsureDataLoadTimeSeries(AreaList* l)
-{
-    /* Asserts */
-    assert(l);
-
-    l->each([&](Data::Area& area) {
-        if (!area.load.series)
-            area.load.series = new DataSeriesLoad();
-    });
-}
-
 void AreaListEnsureDataLoadPrepro(AreaList* l)
 {
     /* Asserts */
@@ -1268,17 +1246,6 @@ void AreaListEnsureDataLoadPrepro(AreaList* l)
     });
 }
 
-void AreaListEnsureDataSolarTimeSeries(AreaList* l)
-{
-    /* Asserts */
-    assert(l);
-
-    l->each([&](Data::Area& area) {
-        if (!area.solar.series)
-            area.solar.series = new DataSeriesSolar();
-    });
-}
-
 void AreaListEnsureDataSolarPrepro(AreaList* l)
 {
     /* Asserts */
@@ -1290,17 +1257,6 @@ void AreaListEnsureDataSolarPrepro(AreaList* l)
     });
 }
 
-void AreaListEnsureDataWindTimeSeries(AreaList* l)
-{
-    /* Asserts */
-    assert(l);
-
-    l->each([&](Data::Area& area) {
-        if (!area.wind.series)
-            area.wind.series = new DataSeriesWind();
-    });
-}
-
 void AreaListEnsureDataWindPrepro(AreaList* l)
 {
     /* Asserts */
@@ -1604,7 +1560,7 @@ void AreaList::updateNameIDSet() const
 
 void AreaList::removeLoadTimeseries()
 {
-    each([&](Data::Area& area) { area.load.series->timeSeries.reset(1, HOURS_PER_YEAR); });
+    each([&](Data::Area& area) { area.load.series.timeSeries.reset(1, HOURS_PER_YEAR); });
 }
 
 void AreaList::removeHydroTimeseries()
@@ -1619,12 +1575,12 @@ void AreaList::removeHydroTimeseries()
 
 void AreaList::removeSolarTimeseries()
 {
-    each([&](Data::Area& area) { area.solar.series->timeSeries.reset(1, HOURS_PER_YEAR); });
+    each([&](Data::Area& area) { area.solar.series.timeSeries.reset(1, HOURS_PER_YEAR); });
 }
 
 void AreaList::removeWindTimeseries()
 {
-    each([&](Data::Area& area) { area.wind.series->timeSeries.reset(1, HOURS_PER_YEAR); });
+    each([&](Data::Area& area) { area.wind.series.timeSeries.reset(1, HOURS_PER_YEAR); });
 }
 
 void AreaList::removeThermalTimeseries()

src/libs/antares/study/area/store-timeseries-numbers.cpp

@@ -69,12 +69,12 @@ static void genericStoreTimeseriesNumbers(Solver::IResultWriter& writer,
 
 void storeTimeseriesNumbersForLoad(Solver::IResultWriter& writer, const Area& area)
 {
-    genericStoreTimeseriesNumbers(writer, area.load.series->timeseriesNumbers, area.id, "load");
+    genericStoreTimeseriesNumbers(writer, area.load.series.timeseriesNumbers, area.id, "load");
 }
 
 void storeTimeseriesNumbersForSolar(Solver::IResultWriter& writer, const Area& area)
 {
-    genericStoreTimeseriesNumbers(writer, area.solar.series->timeseriesNumbers, area.id, "solar");
+    genericStoreTimeseriesNumbers(writer, area.solar.series.timeseriesNumbers, area.id, "solar");
 }
 
 void storeTimeseriesNumbersForHydro(Solver::IResultWriter& writer, const Area& area)
@@ -84,7 +84,7 @@ void storeTimeseriesNumbersForHydro(Solver::IResultWriter& writer, const Area& a
 
 void storeTimeseriesNumbersForWind(Solver::IResultWriter& writer, const Area& area)
 {
-    genericStoreTimeseriesNumbers(writer, area.wind.series->timeseriesNumbers, area.id, "wind");
+    genericStoreTimeseriesNumbers(writer, area.wind.series.timeseriesNumbers, area.id, "wind");
 }
 
 void storeTimeseriesNumbersForThermal(Solver::IResultWriter& writer, const Area& area)

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

@@ -38,6 +38,78 @@ using namespace Yuni;
 
 namespace Antares::Data
 {
+
+const double TimeSeries::emptyColumn[] = {0};
+
+int TimeSeries::timeSeriesLoadFromFolder(Study& s,
+                                         const AreaName& areaID,
+                                         const std::string& folder,
+                                         const std::string& prefix)
+{
+    String& buffer = s.bufferLoadingTS;
+
+    int ret = 1;
+    buffer.clear() << folder << SEP << prefix << areaID << '.' << s.inputExtension;
+    ret = timeSeries.loadFromCSVFile(buffer, 1, HOURS_PER_YEAR, &s.dataBuffer) && ret;
+
+    if (s.usedByTheSolver && s.parameters.derated)
+        timeSeries.averageTimeseries();
+
+    timeseriesNumbers.clear();
+
+    return ret;
+}
+
+int TimeSeries::timeSeriesSaveToFolder(const AreaName& areaID, const std::string& folder,
+                                       const std::string& prefix) const
+{
+    Clob buffer;
+    buffer.clear() << folder << SEP << prefix << areaID << ".txt";
+    return timeSeries.saveToCSVFile(buffer, 0);
+}
+
+void TimeSeries::reset()
+{
+    timeSeries.reset(1, HOURS_PER_YEAR);
+}
+
+double TimeSeries::getCoefficient(uint32_t year, uint32_t hourInYear) const
+{
+    if (timeSeries.width == 0)
+        return 0;
+    return timeSeries[getSeriesIndex(year)][hourInYear];
+}
+
+const double* TimeSeries::getColumn(uint32_t year) const
+{
+    if (timeSeries.width == 0)
+        return emptyColumn;
+    return timeSeries[getSeriesIndex(year)];
+}
+
+uint32_t TimeSeries::getSeriesIndex(uint32_t year) const
+{
+    if (timeSeries.width == 1)
+        return 0;
+    else
+        return timeseriesNumbers[0][year];
+}
+
+bool TimeSeries::forceReload(bool reload) const
+{
+    return timeSeries.forceReload(reload);
+}
+
+void TimeSeries::markAsModified() const
+{
+    timeSeries.markAsModified();
+}
+
+uint64_t TimeSeries::memoryUsage() const
+{
+    return timeSeries.memoryUsage();
+}
+
 bool DataSeriesCommon::forceReload(bool reload) const
 {
     return timeSeries.forceReload(reload);