DO NOT MERGE - BUILDING EXECUTABLES RTE-I

src/CMakeLists.txt

@@ -6,8 +6,8 @@ set(ANTARES_VERSION_LO	      8)
 set(ANTARES_VERSION_REVISION  0)
 
 # Beta release
-set(ANTARES_BETA 0)
-set(ANTARES_RC 3)
+set(ANTARES_BETA 1)
+set(ANTARES_RC 0)
 
 set(ANTARES_VERSION_YEAR      2023)
 

src/libs/antares/InfoCollection/StudyInfoCollector.cpp

@@ -19,6 +19,7 @@ void StudyInfoCollector::toFileContent(FileContent& file_content)
     performedYearsCountToFileContent(file_content);
     enabledThermalClustersCountToFileContent(file_content);
     enabledBindingConstraintsCountToFileContent(file_content);
+    enabledMaintenanceGroupCountToFileContent(file_content);
     unitCommitmentModeToFileContent(file_content);
     maxNbYearsInParallelToFileContent(file_content);
     solverVersionToFileContent(file_content);
@@ -72,6 +73,13 @@ void StudyInfoCollector::enabledThermalClustersCountToFileContent(FileContent& f
     file_content.addItemToSection("study", "enabled thermal clusters", nbEnabledThermalClusters);
 }
 
+void StudyInfoCollector::enabledMaintenanceGroupCountToFileContent(FileContent& file_content)
+{
+    auto activeMntGroups = study_.maintenanceGroups.activeMaintenanceGroups();
+    auto nbEnabledMNT = activeMntGroups.size();
+    file_content.addItemToSection("study", "enabled Maintenance Group-s", nbEnabledMNT);
+}
+
 void StudyInfoCollector::enabledBindingConstraintsCountToFileContent(FileContent& file_content)
 {
     auto activeContraints = study_.bindingConstraints.activeContraints();

src/libs/antares/InfoCollection/include/antares/infoCollection/StudyInfoCollector.h

@@ -24,6 +24,7 @@ class StudyInfoCollector
     void performedYearsCountToFileContent(FileContent& file_content);
     void enabledThermalClustersCountToFileContent(FileContent& file_content);
     void enabledBindingConstraintsCountToFileContent(FileContent& file_content);
+    void enabledMaintenanceGroupCountToFileContent(FileContent& file_content);
     void unitCommitmentModeToFileContent(FileContent& file_content);
     void maxNbYearsInParallelToFileContent(FileContent& file_content);
     void solverVersionToFileContent(FileContent& file_content);

src/libs/antares/checks/antares/checks/checkLoadedInputData.h

@@ -46,4 +46,7 @@ void checkMinStablePower(bool tsGenThermal, const Antares::Data::AreaList& areas
 void checkFuelCostColumnNumber(const Antares::Data::AreaList& areas);
 void checkCO2CostColumnNumber(const Antares::Data::AreaList& areas);
 
+void checkMaintenancePlanningSettings(const Antares::Data::Parameters* parameters);
+void checkMaintenancePlanningTsNum(const Antares::Data::Parameters* parameters);
+
 } // namespace Antares::Check

src/libs/antares/checks/checkLoadedInputData.cpp

@@ -200,4 +200,36 @@ void checkCO2CostColumnNumber(const Antares::Data::AreaList& areas)
                              &Antares::Data::EconomicInputData::co2cost);
 }
 
+void checkMaintenancePlanningSettings(const Antares::Data::Parameters* parameters)
+{
+    const auto timeSeriesToGenerate = parameters->timeSeriesToGenerate;
+    bool aggregatedMode = parameters->renewableGeneration.isAggregated();
+
+    bool activeThermalTSGenAndMntPlanning
+      = (parameters->maintenancePlanning.isOptimized()
+         && (timeSeriesToGenerate & Antares::Data::timeSeriesThermal));
+
+    bool activeOtherTSGen
+      = ((timeSeriesToGenerate & Antares::Data::timeSeriesLoad)
+         || (timeSeriesToGenerate & Antares::Data::timeSeriesHydro)
+         || ((timeSeriesToGenerate & Antares::Data::timeSeriesWind) && aggregatedMode)
+         || ((timeSeriesToGenerate & Antares::Data::timeSeriesSolar) && aggregatedMode));
+
+    if (activeThermalTSGenAndMntPlanning && activeOtherTSGen)
+        throw Error::IncompatibleMaintenancePlanningUsage();
+}
+
+void checkMaintenancePlanningTsNum(const Antares::Data::Parameters* parameters)
+{
+    bool activeThermalTSGenAndMntPlanning
+      = (parameters->maintenancePlanning.isOptimized()
+         && (parameters->timeSeriesToGenerate & Antares::Data::timeSeriesThermal));
+
+    if (activeThermalTSGenAndMntPlanning
+        && parameters->maintenancePlanning.getScenarioLength()
+               * parameters->maintenancePlanning.getScenarioNumber()
+             != parameters->nbTimeSeriesThermal)
+        throw Error::IncompatibleMaintenancePlanningTsNum();
+}
+
 } // namespace Antares::Check

src/libs/antares/exception/LoadingError.cpp

@@ -166,5 +166,17 @@ IncompatibleFuelCostColumns::IncompatibleFuelCostColumns() :
 {
 }
 
+IncompatibleMaintenancePlanningUsage::IncompatibleMaintenancePlanningUsage() :
+ LoadingError("When generating thermal time series using Maintenance Planning, Stochastic "
+              "ts-generator for load, hydro and renewables must be turned off")
+{
+}
+
+IncompatibleMaintenancePlanningTsNum::IncompatibleMaintenancePlanningTsNum() :
+ LoadingError("When generating thermal time series using Maintenance Planning, scenario length "
+              "* scenario number must be equal to number of thermal ts in Stochastic TS")
+{
+}
+
 } // namespace Error
 } // namespace Antares

src/libs/antares/exception/antares/exception/LoadingError.hpp

@@ -221,5 +221,17 @@ class IncompatibleFuelCostColumns : public LoadingError
     IncompatibleFuelCostColumns();
 };
 
+class IncompatibleMaintenancePlanningUsage : public LoadingError
+{
+public:
+    IncompatibleMaintenancePlanningUsage();
+};
+
+class IncompatibleMaintenancePlanningTsNum : public LoadingError
+{
+public:
+    IncompatibleMaintenancePlanningTsNum();
+};
+
 } // namespace Error
 } // namespace Antares

src/libs/antares/series/include/antares/series/series.h

@@ -88,7 +88,7 @@ class TimeSeries
     void markAsModified() const;
     uint64_t memoryUsage() const;
 
-    TS timeSeries;
+    TS timeSeries; // TMP.INFO CR27: TS-s will be written here!
     numbers& timeseriesNumbers;
 
     static const std::vector<double> emptyColumn; ///< used in getColumn if timeSeries empty

src/libs/antares/study/CMakeLists.txt

@@ -180,6 +180,20 @@ set(SRC_STUDY_BINDING_CONSTRAINT
 
 source_group("study\\constraint" FILES ${SRC_STUDY_BINDING_CONSTRAINT})
 
+set(SRC_STUDY_MAINTENANCE_PLANNING
+        maintenance_planning/MaintenanceGroup.h
+        maintenance_planning/MaintenanceGroup.hxx
+        maintenance_planning/MaintenanceGroup.cpp
+        maintenance_planning/MaintenanceGroupSaver.h
+        maintenance_planning/MaintenanceGroupSaver.cpp
+        maintenance_planning/MaintenanceGroupLoader.h
+        maintenance_planning/MaintenanceGroupLoader.cpp
+        maintenance_planning/MaintenanceGroupRepository.h
+        maintenance_planning/MaintenanceGroupRepository.cpp
+        maintenance_planning/MaintenanceGroupRepository.hxx
+)
+
+source_group("study\\maintenance" FILES ${SRC_STUDY_MAINTENANCE_PLANNING})
 
 set(SRC_XCAST
         xcast.h
@@ -273,6 +287,7 @@ set(SRC_ALL
         ${SRC_STUDY_PARAMETERS}
         ${SRC_STUDY_FINDER}
         ${SRC_STUDY_BINDING_CONSTRAINT}
+        ${SRC_STUDY_MAINTENANCE_PLANNING}
         ${SRC_STUDY_PART_WIND}
         ${SRC_STUDY_PART_HYDRO}
         ${SRC_STUDY_PART_COMMON}

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

@@ -627,6 +627,11 @@ class AreaList final : public Yuni::NonCopyable<AreaList>
     */
     ThermalCluster* findClusterFromINIKey(const AnyString& key);
 
+    /*!
+    ** \brief Try to find the area from a given INI key (<area>.'weights')
+    */
+    Area* findAreaFromINIKey(const AnyString& key);
+
     /*!
     ** \brief Get the total number of interconnections between all areas
     */

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

@@ -675,6 +675,9 @@ bool AreaList::saveToFolder(const AnyString& folder) const
     buffer.clear() << folder << SEP << "input" << SEP << "bindingconstraints";
     ret = IO::Directory::Create(buffer) && ret;
 
+    buffer.clear() << folder << SEP << "input" << SEP << "maintenanceplanning";
+    ret = IO::Directory::Create(buffer) && ret;
+
     buffer.clear() << folder << SEP << "input" << SEP << "links";
     ret = IO::Directory::Create(buffer) && ret;
 
@@ -936,6 +939,7 @@ static bool AreaListLoadFromFolderSingleArea(Study& study,
         buffer.clear() << study.folderInput << SEP << "thermal" << SEP << "series";
         ret = area.thermal.list.loadDataSeriesFromFolder(study, options, buffer) && ret;
         ret = area.thermal.list.loadEconomicCosts(study, buffer) && ret;
+        ret = area.thermal.list.generateRandomDaysSinceLastMaintenance(study) && ret;
 
         // In adequacy mode, all thermal clusters must be in 'mustrun' mode
         if (study.usedByTheSolver && study.parameters.mode == SimulationMode::Adequacy)
@@ -1539,6 +1543,18 @@ ThermalCluster* AreaList::findClusterFromINIKey(const AnyString& key)
     return (i != nullptr) ? i : nullptr;
 }
 
+Area* AreaList::findAreaFromINIKey(const AnyString& key)
+{
+    if (key.empty())
+        return nullptr;
+    auto offset = key.find('.');
+    if (offset == AreaName::npos || (0 == offset) || (offset == key.size() - 1))
+        return nullptr;
+    AreaName parentName(key.c_str(), offset);
+    Area* parentArea = findFromName(parentName);
+    return (parentArea != nullptr) ? parentArea : nullptr;
+}
+
 void AreaList::updateNameIDSet() const
 {
     nameidSet.clear();

src/libs/antares/study/cleaner/cleaner-v20.cpp

@@ -260,6 +260,7 @@ bool listOfFilesAnDirectoriesToKeep(StudyCleaningInfos* infos)
     e.add("settings/constraintbuilder.ini");
     e.add("settings/scenariobuilder.dat");
     e.add("input/bindingconstraints/bindingconstraints.ini");
+    e.add("input/maintenanceplanning/maintenancegroups.ini");
     e.add("input/hydro/hydro.ini");
     e.add("input/areas/list.txt");
     e.add("input/areas/sets.ini");
@@ -311,6 +312,7 @@ bool listOfFilesAnDirectoriesToKeep(StudyCleaningInfos* infos)
     p.add("settings/resources");
     p.add("settings/simulations");
     p.add("input/bindingconstraints");
+    p.add("input/maintenanceplanning");
 
     // Getting all areas
     auto* arealist = new AreaList(*study);

src/libs/antares/study/fwd.cpp

@@ -345,6 +345,20 @@ const char* RenewableGenerationModellingToCString(RenewableGenerationModelling r
     return "";
 }
 
+const char* MaintenancePlanningModellingToCString(MaintenancePlanningModelling mtcPlanning)
+{
+    switch (mtcPlanning)
+    {
+    case mpRandomized:
+        return "randomized";
+    case mpOptimized:
+        return "optimized";
+    case mpUnknown:
+        return "";
+    }
+    return "";
+}
+
 std::string mpsExportStatusToString(const mpsExportStatus& mps_export_status)
 {
     switch (mps_export_status)

src/libs/antares/study/fwd.h

@@ -525,6 +525,26 @@ const char* RenewableGenerationModellingToCString(RenewableGenerationModelling r
 */
 RenewableGenerationModelling StringToRenewableGenerationModelling(const AnyString& text);
 
+/*
+ * Maintenance Planning
+ */
+enum MaintenancePlanningModelling
+{
+    mpRandomized = 0,   // Default
+    mpOptimized,       // Using Maintenance Planning algorithm
+    mpUnknown,
+};
+
+/*!
+** \brief Convert a Maintenance-Planning into a text
+*/
+const char* MaintenancePlanningModellingToCString(MaintenancePlanningModelling mtcPlanning);
+
+/*!
+** \brief Convert a text into a MaintenancePlanningModelling
+*/
+MaintenancePlanningModelling StringToMaintenancePlanningModelling(const AnyString& text);
+
 // ------------------------
 // MPS export status
 // ------------------------

src/libs/antares/study/load.cpp

@@ -205,6 +205,8 @@ bool Study::internalLoadFromFolder(const String& path, const StudyLoadOptions& o
     ret = internalLoadCorrelationMatrices(options) && ret;
     // Binding constraints
     ret = internalLoadBindingConstraints(options) && ret;
+    // Maintenance Group-s
+    ret = internalLoadMaintenanceGroup(options) && ret;
     // Sets of areas & links
     ret = internalLoadSets() && ret;
 
@@ -268,6 +270,14 @@ bool Study::internalLoadBindingConstraints(const StudyLoadOptions& options)
     return (!r && options.loadOnlyNeeded) ? false : r;
 }
 
+bool Study::internalLoadMaintenanceGroup(const StudyLoadOptions& options)
+{
+    // All checks are performed in 'loadFromFolder'
+    buffer.clear() << folderInput << SEP << "maintenanceplanning";
+    bool r = maintenanceGroups.loadFromFolder(*this, options, buffer);
+    return (!r && options.loadOnlyNeeded) ? false : r;
+}
+
 class SetHandlerAreas
 {
 public: