Feature/rm new

src/api/API.cpp

@@ -78,7 +78,7 @@ SimulationResults APIInternal::execute() const
       study_->parameters.resultFormat, study_->folderOutput, ioQueueService, durationCollector);
     SimulationObserver simulationObserver;
     // Run the simulation
-    switch (study_->runtime->mode)
+    switch (study_->runtime.mode)
     {
     case Data::SimulationMode::Economy:
     case Data::SimulationMode::Expansion:

src/libs/antares/study/CMakeLists.txt

@@ -208,7 +208,6 @@ set(SRC_STUDY
         include/antares/study/load-options.h
         load-options.cpp
         include/antares/study/runtime/runtime.h
-        include/antares/study/runtime/runtime.hxx
         runtime/runtime.cpp
         include/antares/study/runtime.h
         include/antares/study/study.h

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

@@ -449,43 +449,31 @@ const AreaLink* AreaList::findLink(const AreaName& area, const AreaName& with) c
 
 void AreaList::clear()
 {
-    delete[] byIndex;
-    byIndex = nullptr;
+    byIndex.clear();
 
-    if (!areas.empty())
-    {
-        Area::Map copy;
-        copy.swap(areas);
+    Area::Map copy;
+    copy.swap(areas);
 
-        auto end = copy.end();
-        for (auto i = copy.begin(); i != end; ++i)
-        {
-            delete i->second;
-        }
+    auto end = copy.end();
+    for (auto i = copy.begin(); i != end; ++i)
+    {
+        delete i->second;
     }
 }
 
 void AreaList::rebuildIndexes()
 {
-    delete[] byIndex;
+    byIndex.clear();
 
-    if (areas.empty())
-    {
-        byIndex = nullptr;
-    }
-    else
-    {
-        using AreaWeakPtr = Area*;
-        byIndex = new AreaWeakPtr[areas.size()];
+    byIndex.resize(areas.size());
 
-        uint indx = 0;
-        auto end = areas.end();
-        for (auto i = areas.begin(); i != end; ++i, ++indx)
-        {
-            Area* area = i->second;
-            byIndex[indx] = area;
-            area->index = indx;
-        }
+    uint indx = 0;
+    auto end = areas.end();
+    for (auto i = areas.begin(); i != end; ++i, ++indx)
+    {
+        Area* area = i->second;
+        byIndex[indx] = area;
+        area->index = indx;
     }
 }
 

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

@@ -689,7 +689,7 @@ class AreaList final: public Yuni::NonCopyable<AreaList>
 
 public:
     //! All areas by their index
-    Area** byIndex = nullptr;
+    std::vector<Area*> byIndex;
     //! All areas in the list
     Area::Map areas;
 

src/libs/antares/study/include/antares/study/progression/progression.h

@@ -76,11 +76,11 @@ class Progression final
 
     public:
         //! The total number of ticks to achieve
-        int maxTickCount;
+        unsigned maxTickCount;
         //! The current number of ticks
-        std::atomic<int> tickCount;
+        std::atomic<unsigned> tickCount;
         //! The last number of ticks, to reduce the log verbosity
-        int lastTickCount;
+        unsigned lastTickCount;
         // Caption to use when displaying logs
         // Example: 'year: 10000, task: thermal'
         Yuni::CString<40, false> caption;
@@ -104,7 +104,7 @@ class Progression final
             return *this;
         }
 
-        Task& operator+=(int value)
+        Task& operator+=(unsigned value)
         {
             pPart.tickCount += value;
             return *this;
@@ -138,7 +138,7 @@ class Progression final
     ** \internal The number of ticks should remain an `int` because
     **   we can not use unsigned atomic integer
     */
-    void add(uint year, Section section, int nbTicks);
+    void add(uint year, Section section, unsigned nbTicks);
 
     void add(Section section, int nbTicks);
 

src/libs/antares/study/include/antares/study/runtime/runtime.h

@@ -25,11 +25,13 @@
 #include <vector>
 
 #include <antares/mersenne-twister/mersenne-twister.h>
-#include "antares/study/study.h"
+#include <antares/study/parameters.h>
 
 namespace Antares::Data
 {
 
+class Study;
+
 enum RangeLimitsIndex
 {
     rangeBegin = 0,
@@ -139,8 +141,12 @@ class StudyRuntimeInfos
     void checkThermalTSGeneration(Study& study);
 }; // struct StudyRuntimeInfos
 
-} // namespace Antares::Data
+#ifdef NDEBUG
+inline void StudyRangeLimits::checkIntegrity() const
+{
+}
+#endif
 
-#include "runtime.hxx"
+} // namespace Antares::Data
 
 #endif // __ANTARES_LIBS_STUDY_RUNTIME_RUNTIME_INFOS_H__

src/libs/antares/study/include/antares/study/study.h

@@ -31,6 +31,7 @@
 
 #include <antares/correlation/correlation.h>
 #include <antares/date/date.h>
+#include <antares/study/runtime/runtime.h>
 #include <antares/writer/i_writer.h>
 #include "antares/antares/antares.h"
 #include "antares/study/binding_constraint/BindingConstraintGroupRepository.h"
@@ -596,7 +597,7 @@ class Study: public Yuni::NonCopyable<Study>, public LayerData
     **
     ** These informations are only needed when a study is processed.
     */
-    StudyRuntimeInfos* runtime = nullptr;
+    StudyRuntimeInfos runtime;
 
     // Antares::Solver::Variable::State* state;
 
@@ -690,7 +691,6 @@ YString StudyCreateOutputPath(SimulationMode mode,
                               int64_t startTime);
 } // namespace Antares::Data
 
-#include "runtime.h"
 #include "study.hxx"
 
 #endif /* __ANTARES_LIBS_STUDY_STUDY_H__ */

src/libs/antares/study/progression/progression.cpp

@@ -42,7 +42,7 @@ Progression::Task::Task(const Antares::Data::Study& study, uint year, Section se
     assert(&pProgression);
 }
 
-void Progression::add(uint year, Section section, int nbTicks)
+void Progression::add(uint year, Section section, unsigned nbTicks)
 {
     // This section is not thread-safe because always called before really launching
     // the simulation

src/libs/antares/study/runtime/runtime.cpp

@@ -21,6 +21,7 @@
 
 #include "antares/study/runtime/runtime.h"
 
+#include <antares/study/study.h>
 #include <antares/utils/utils.h>
 #include "antares/antares/fatal-error.h"
 #include "antares/study/area/scratchpad.h"

src/libs/antares/study/study.cpp

@@ -104,8 +104,6 @@ Study::~Study()
 
 void Study::clear()
 {
-    // Releasing runtime infos
-    FreeAndNil(runtime);
     FreeAndNil(scenarioRules);
     FreeAndNil(uiinfo);
 
@@ -504,9 +502,7 @@ void Study::getNumberOfCores(const bool forceParallel, const uint nbYearsParalle
 
 bool Study::initializeRuntimeInfos()
 {
-    delete runtime;
-    runtime = new StudyRuntimeInfos();
-    return runtime->loadFromStudy(*this);
+    return runtime.loadFromStudy(*this);
 }
 
 void Study::performTransformationsBeforeLaunchingSimulation()
@@ -1164,25 +1160,24 @@ struct TS final
 
 void Study::initializeProgressMeter(bool tsGeneratorOnly)
 {
-    uint years = tsGeneratorOnly ? 1 : (runtime->rangeLimits.year[rangeEnd] + 1);
-    assert(runtime);
+    uint years = tsGeneratorOnly ? 1 : (runtime.rangeLimits.year[rangeEnd] + 1);
 
-    int ticksPerYear = 0;
-    int ticksPerOutput = 0;
+    unsigned ticksPerYear = 0;
+    unsigned ticksPerOutput = 0;
 
     if (not tsGeneratorOnly)
     {
         // One tick at the begining and 2 at the end of the year
         // Output - Areas
-        ticksPerOutput += (int)areas.size();
+        ticksPerOutput += areas.size();
         // Output - Links
-        ticksPerOutput += (int)runtime->interconnectionsCount();
+        ticksPerOutput += runtime.interconnectionsCount();
         // Output - digest
         ticksPerOutput += 1;
         ticksPerYear = 1;
     }
 
-    int n;
+    unsigned n;
 
     for (uint y = 0; y != years; ++y)
     {
@@ -1191,7 +1186,7 @@ void Study::initializeProgressMeter(bool tsGeneratorOnly)
             n = parameters.nbTimeSeriesLoad * areas.size() * 365;
             if (0 != (timeSeriesLoad & parameters.timeSeriesToArchive))
             {
-                n += (int)areas.size();
+                n += areas.size();
             }
             progression.add(y, Solver::Progression::sectTSGLoad, n);
         }
@@ -1200,7 +1195,7 @@ void Study::initializeProgressMeter(bool tsGeneratorOnly)
             n = parameters.nbTimeSeriesSolar * areas.size() * 365;
             if (0 != (timeSeriesSolar & parameters.timeSeriesToArchive))
             {
-                n += (int)areas.size();
+                n += areas.size();
             }
             progression.add(y, Solver::Progression::sectTSGSolar, n);
         }
@@ -1209,7 +1204,7 @@ void Study::initializeProgressMeter(bool tsGeneratorOnly)
             n = parameters.nbTimeSeriesWind * areas.size() * 365;
             if (0 != (timeSeriesWind & parameters.timeSeriesToArchive))
             {
-                n += (int)areas.size();
+                n += areas.size();
             }
             progression.add(y, Solver::Progression::sectTSGWind, n);
         }
@@ -1219,17 +1214,17 @@ void Study::initializeProgressMeter(bool tsGeneratorOnly)
             n = parameters.nbTimeSeriesHydro;
             if (0 != (timeSeriesHydro & parameters.timeSeriesToArchive))
             {
-                n += (int)areas.size();
+                n += areas.size();
             }
             progression.add(y, Solver::Progression::sectTSGHydro, n);
         }
         if (TS<timeSeriesThermal>::IsNeeded(*this, y))
         {
-            n = runtime->thermalPlantTotalCount;
+            n = runtime.thermalPlantTotalCount;
             if (0 != (timeSeriesThermal & parameters.timeSeriesToArchive))
             {
-                n += (int)runtime->thermalPlantTotalCount;
-                n += (int)runtime->thermalPlantTotalCountMustRun;
+                n += runtime.thermalPlantTotalCount;
+                n += runtime.thermalPlantTotalCountMustRun;
             }
             progression.add(y, Solver::Progression::sectTSGThermal, n);
         }
@@ -1249,23 +1244,23 @@ void Study::initializeProgressMeter(bool tsGeneratorOnly)
     n = 0;
     if (0 != (timeSeriesLoad & parameters.exportTimeSeriesInInput))
     {
-        n += (int)areas.size();
+        n += areas.size();
     }
     if (0 != (timeSeriesSolar & parameters.exportTimeSeriesInInput))
     {
-        n += (int)areas.size();
+        n += areas.size();
     }
     if (0 != (timeSeriesWind & parameters.exportTimeSeriesInInput))
     {
-        n += (int)areas.size();
+        n += areas.size();
     }
     if (0 != (timeSeriesHydro & parameters.exportTimeSeriesInInput))
     {
-        n += (int)areas.size();
+        n += areas.size();
     }
     if (0 != (timeSeriesThermal & parameters.exportTimeSeriesInInput))
     {
-        n += (int)areas.size();
+        n += areas.size();
     }
     if (n)
     {

src/libs/antares/study/study.importprepro.cpp

@@ -33,7 +33,7 @@ bool Study::importTimeseriesIntoInput()
 {
     // Special case: some thermal clusters may force TS generation
     const bool importThermal = parameters.haveToImport(timeSeriesThermal)
-                               && runtime->thermalTSRefresh;
+                               && runtime.thermalTSRefresh;
     // Something to import ?
     if ((parameters.exportTimeSeriesInInput && parameters.timeSeriesToGenerate) || importThermal)
     {

src/solver/application/ScenarioBuilderOwner.cpp

@@ -39,7 +39,7 @@ void Antares::Solver::ScenarioBuilderOwner::callScenarioBuilder()
     // We will resize all matrix related to the time-series numbers
     // This operation can be done once since the number of years is constant
     // for a single simulation
-    study_.resizeAllTimeseriesNumbers(1 + study_.runtime->rangeLimits.year[Data::rangeEnd]);
+    study_.resizeAllTimeseriesNumbers(1 + study_.runtime.rangeLimits.year[Data::rangeEnd]);
     if (not TimeSeriesNumbers::CheckNumberOfColumns(study_.areas))
     {
         throw FatalError(

src/solver/application/application.cpp

@@ -224,7 +224,6 @@ void Application::readDataForTheStudy(Data::StudyLoadOptions& options)
         writeComment(study);
     }
 
-    // Runtime data dedicated for the solver
     if (!study.initializeRuntimeInfos())
     {
         throw Error::RuntimeInfoInitialization();
@@ -391,7 +390,7 @@ void Application::execute()
     pStudy->computePThetaInfForThermalClusters();
 
     // Run the simulation
-    switch (pStudy->runtime->mode)
+    switch (pStudy->runtime.mode)
     {
     case Data::SimulationMode::Economy:
     case Data::SimulationMode::Expansion: