style: use -> instead of value(). for std::optionals by flomnes · Pull Request #3809 · AntaresSimulatorTeam/Antares_Simulator

flomnes · 2026-07-15T07:51:03Z

std::optional has an -> operator which is more compact than .value().

Example

std::optional<std::string> myString("hello, world");
std::size_t size = myString.value().size();
std::size_t size2 = myString->size();
assert(size == size2);

See std::optional<T>::value, std::optional<T>::operator->

pull-request-size · 2026-07-15T07:56:28Z

This PR is too big. Please break it up into smaller PRs.

YoshuaLisasi · 2026-07-16T11:32:56Z

            if (!tryParseYamlField(
                  param.second,
-                  area.allCapacityReservations.value().maxGlobalEnergyActivationRatio.up,
+                  area.allCapacityReservations->maxGlobalEnergyActivationRatio.up,


is allCapacityReservations always defined?
if not
if(area.allCapacityReservations) should be added to dodge the UB that comes with the "->" operator.

if (root["global-parameters"]) { ret = readReservesAreaParameters(area, root["global-parameters"]) && ret; } if (root["reserves"]) { for (const auto& reserveNode: root["reserves"]) { ret = readReserveParameters(folderInput, area, reserveNode) && ret; } } validateCapacityReservations(area); return ret;

it seems that the validations is done after the function is called.

YoshuaLisasi · 2026-07-16T11:33:18Z

            if (!tryParseYamlField(
                  param.second,
-                  area.allCapacityReservations.value().maxGlobalEnergyActivationRatio.down,
+                  area.allCapacityReservations->maxGlobalEnergyActivationRatio.down,


same comment

YoshuaLisasi · 2026-07-16T11:33:21Z

            if (!tryParseYamlField(
                  param.second,
-                  area.allCapacityReservations.value().referenceGlobalActivationDuration.up,
+                  area.allCapacityReservations->referenceGlobalActivationDuration.up,


same comment

YoshuaLisasi · 2026-07-16T11:33:57Z

            if (!tryParseYamlField(
                  param.second,
-                  area.allCapacityReservations.value().referenceGlobalActivationDuration.down,
+                  area.allCapacityReservations->referenceGlobalActivationDuration.down,


same comment

YoshuaLisasi · 2026-07-16T11:34:02Z


    ReserveID reserveId = transformNameIntoID(reserveName);
-    if (area.allCapacityReservations.value().contains(reserveId))
+    if (area.allCapacityReservations->contains(reserveId))


same comment

YoshuaLisasi · 2026-07-16T11:34:33Z

    capacityReservation.loadNeedFromFile(filePath);
-    area.allCapacityReservations.value().areaCapacityReservations.emplace(capacityReservation.id(),
-                                                                          capacityReservation);
+    area.allCapacityReservations->areaCapacityReservations.emplace(capacityReservation.id(),


same comment

YoshuaLisasi · 2026-07-16T11:55:05Z

                                       const std::string& reserveID)
    {
-        const auto* reserve = area.allCapacityReservations.value().getReserveByID(reserveID);
+        const auto* reserve = area.allCapacityReservations->getReserveByID(reserveID);


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T11:55:46Z

        if constexpr (std::is_same_v<ClusterT, ShortTermStorage::STStorageCluster>)
        {
-            area.allCapacityReservations.value().reserveGroupPartSTS[reserveID].insert(
+            area.allCapacityReservations->reserveGroupPartSTS[reserveID].insert(


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T11:55:53Z

        else if constexpr (std::is_same_v<ClusterT, ThermalCluster>)
        {
-            area.allCapacityReservations.value().reserveGroupPartThermal[reserveID].insert(
+            area.allCapacityReservations->reserveGroupPartThermal[reserveID].insert(


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:07:56Z

            readProperties(cert, rp);

-            const auto* reserve = area.allCapacityReservations.value().getReserveByID(reserveId);
+            const auto* reserve = area.allCapacityReservations->getReserveByID(reserveId);


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:09:52Z


    for (const auto& reserveID:
-         area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:13:53Z

    unsigned int column = 0;
    for (const auto& reserveID:
-         area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:15:36Z


    for (const auto& reserveID:
-         area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:16:47Z

+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)
    {
-        if (reserveParticipationContainer.value().isParticipatingInReserve(reserveID))
+        if (reserveParticipationContainer->isParticipatingInReserve(reserveID))


is reserveParticipationContainer defined ?

YoshuaLisasi · 2026-07-16T12:19:39Z


    for (const auto& reserveID:
-         area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:20:02Z

    unsigned int column = 0;
    for (const auto& reserveID:
-         area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+         area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:23:32Z

    {
        for (const auto& [_, reserveParticipation]:
-             cluster->reserveParticipationContainer.value().getReservesParticipations())
+             cluster->reserveParticipationContainer->getReservesParticipations())


is reserveParticipationContainer always defined ?

YoshuaLisasi · 2026-07-16T12:28:20Z

            r.counts.reserveParticipations += area.hydro.reserveParticipationsCount();
-            r.counts.capacityReservations += area.allCapacityReservations.value()
-                                               .areaCapacityReservations.size();
+            r.counts.capacityReservations += area.allCapacityReservations->areaCapacityReservations


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:31:17Z

-                  .reservesIndices.value()
-                  .HydroEnergyLevelParticipation[reserveParticipation
-                                                   .globalIndexClusterParticipation]
+                  .reservesIndices->HydroEnergyLevelParticipation


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:32:30Z

                    data.CorrespondanceCntNativesCntOptim[pdt]
-                      .reservesIndices.value()
-                      .HydroGlobalEnergyLevelParticipationUp[globalClusterIdx]
+                      .reservesIndices->HydroGlobalEnergyLevelParticipationUp[globalClusterIdx]


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:32:41Z

                    data.CorrespondanceCntNativesCntOptim[pdt]
-                      .reservesIndices.value()
-                      .HydroGlobalEnergyLevelParticipationDown[globalClusterIdx]
+                      .reservesIndices->HydroGlobalEnergyLevelParticipationDown[globalClusterIdx]


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:32:52Z

                data.CorrespondanceCntNativesCntOptim[pdt]
-                  .reservesIndices.value()
-                  .HydroLevelParticipation[type][globalClusterIdx]
+                  .reservesIndices->HydroLevelParticipation[type][globalClusterIdx]


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:33:12Z

                data.CorrespondanceCntNativesCntOptim[pdt]
-                  .reservesIndices.value()
-                  .HydroReleaseCapacityThresholdsMin[globalClusterIdx]
+                  .reservesIndices->HydroReleaseCapacityThresholdsMin[globalClusterIdx]


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:42:23Z


-            cnt = CorrespondanceCntNativesCntOptim.reservesIndices.value()
-                    .HydroGlobalEnergyLevelParticipationDown[globalClusterIdx];
+            cnt = CorrespondanceCntNativesCntOptim.reservesIndices


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:42:49Z


-            cnt = CorrespondanceCntNativesCntOptim.reservesIndices.value()
-                    .HydroGlobalEnergyLevelParticipationUp[globalClusterIdx];
+            cnt = CorrespondanceCntNativesCntOptim.reservesIndices


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:42:54Z

-            int cnt = CorrespondanceCntNativesCntOptim.reservesIndices.value()
-                        .HydroMaxReleaseParticipation[reserveParticipation
-                                                        .globalIndexClusterParticipation];
+            int cnt = CorrespondanceCntNativesCntOptim.reservesIndices->HydroMaxReleaseParticipation


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:42:58Z

-            cnt = CorrespondanceCntNativesCntOptim.reservesIndices.value()
-                    .HydroMaxStoreParticipation[reserveParticipation
-                                                  .globalIndexClusterParticipation];
+            cnt = CorrespondanceCntNativesCntOptim.reservesIndices->HydroMaxStoreParticipation


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:43:04Z

-            cnt = CorrespondanceCntNativesCntOptim.reservesIndices.value()
-                    .HydroEnergyLevelParticipation[reserveParticipation
-                                                     .globalIndexClusterParticipation];
+            cnt = CorrespondanceCntNativesCntOptim.reservesIndices->HydroEnergyLevelParticipation


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:48:10Z

-              .internalUnsatisfied.assign(capacityReservationCount, 0);
-            variablesMapping.reservesIndices.value().internalExcess.assign(capacityReservationCount,
-                                                                           0);
+            variablesMapping.reservesIndices->runningThermalClusterParticipation


is reservesIndices always defined ?

YoshuaLisasi · 2026-07-16T12:48:30Z

        {
            areaReserves.referenceGlobalActivationDuration[type]
-              = area->allCapacityReservations.value().referenceGlobalActivationDuration[type];
+              = area->allCapacityReservations->referenceGlobalActivationDuration[type];


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:49:26Z


        for (const auto& [reserveID, reserveCapacity]:
-             area->allCapacityReservations.value().areaCapacityReservations)
+             area->allCapacityReservations->areaCapacityReservations)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:49:33Z

            int areaReserveIdx = 0;
            for (const auto& [reserveID, _]:
-                 area->allCapacityReservations.value().areaCapacityReservations)
+                 area->allCapacityReservations->areaCapacityReservations)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:49:37Z

                {
                    if (cluster.reserveParticipationContainer
-                        && cluster.reserveParticipationContainer.value().isParticipatingInReserve(
+                        && cluster.reserveParticipationContainer->isParticipatingInReserve(


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:55:56Z

    if (hasIndexMapping(state.study, state.area))
    {
-        const auto& resData = state.reserveData.value().at(state.area->index);
+        const auto& resData = state.reserveData->at(state.area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T12:56:08Z

    if (hasIndexMapping(state.study, state.area))
    {
-        const auto& resData = state.reserveData.value().at(state.area->index);
+        const auto& resData = state.reserveData->at(state.area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T12:56:21Z

        for (const auto& [reserveName, reserveParticipation]:
-             state.reserveData.value()
-               .at(state.area->index)
+             state.reserveData->at(state.area->index)


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T12:56:31Z

    if (hasIndexMapping(state.study, state.area))
    {
-        const auto& resData = state.reserveData.value().at(state.area->index);
+        const auto& resData = state.reserveData->at(state.area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T12:57:15Z

            int column = 0;
            for (const auto& reserveID:
-                 area->allCapacityReservations.value().areaCapacityReservations | std::views::keys)
+                 area->allCapacityReservations->areaCapacityReservations | std::views::keys)


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:57:26Z

                        pValuesForTheCurrentYear[numSpace][column].hour[state.hourInTheYear]
-                          += state.reserveData.value()
-                               .at(area->index)
+                          += state.reserveData->at(area->index)


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T12:57:38Z

            int column = 0;
            for (const auto& reserveID:
-                 results.data.area->allCapacityReservations.value().areaCapacityReservations
+                 results.data.area->allCapacityReservations->areaCapacityReservations


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T12:58:32Z

                        pValuesForTheCurrentYear[numSpace][column].hour[state.hourInTheYear]
-                          += state.reserveData.value()
-                               .at(area->index)
+                          += state.reserveData->at(area->index)


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T13:00:07Z


        pSize = study->parameters.include.reserves
-                  ? area->allCapacityReservations.value().areaCapacityReservations.size()
+                  ? area->allCapacityReservations->areaCapacityReservations.size()


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T13:00:17Z

            int column = 0;
            for (const auto& reserveID:
-                 results.data.area->allCapacityReservations.value().areaCapacityReservations
+                 results.data.area->allCapacityReservations->areaCapacityReservations


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T13:03:59Z


        pSize = study->parameters.include.reserves
-                  ? area->allCapacityReservations.value().areaCapacityReservations.size() * 2
+                  ? area->allCapacityReservations->areaCapacityReservations.size() * 2


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T13:10:38Z

    {
-        auto [unsuppliedOrSpilled, reserveID] = results.data.area->allCapacityReservations.value()
-                                                  .reserveParticipationUnsuppliedSpilledAt(i);
+        auto [unsuppliedOrSpilled, reserveID] = results.data.area->allCapacityReservations


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T13:10:54Z

    {
-        const auto& reserveID = results.data.area->allCapacityReservations.value()
-                                  .getReserveAtIndex(i);
+        const auto& reserveID = results.data.area->allCapacityReservations->getReserveAtIndex(i);


is allCapacityReservations always defined ?

YoshuaLisasi · 2026-07-16T13:12:13Z

        && study.parameters.include.reserves && STStorageCluster->reserveParticipationContainer)
    {
-        auto& resData = reserveData.value().at(area->index);
+        auto& resData = reserveData->at(area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T13:12:40Z

        && study.parameters.include.reserves && Hydro.reserveParticipationContainer)
    {
-        auto& resData = reserveData.value().at(area->index);
+        auto& resData = reserveData->at(area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T13:13:27Z

        && study.parameters.include.reserves && thermalCluster->reserveParticipationContainer)
    {
-        auto& resData = reserveData.value().at(area->index);
+        auto& resData = reserveData->at(area->index);


is reserveData always defined ?

YoshuaLisasi · 2026-07-16T13:13:41Z

        uint endHourForCurrentYear = startHourForCurrentYear
                                     + study.runtime.rangeLimits.hour[Data::rangeCount];
-        auto& resData = reserveData.value().at(area->index);
+        auto& resData = reserveData->at(area->index);


is reserveData always defined ?

YoshuaLisasi

I wonder if the optinals is always defined and not nullopt

# Conflicts: # src/solver/variable/include/antares/solver/variable/economy/reserves/reserveParticipationByHydro.h # src/solver/variable/include/antares/solver/variable/economy/reserves/reserveParticipationBySTStorage.h

sonarqubecloud · 2026-07-17T09:01:25Z

Quality Gate failed

Failed conditions
16.4% Coverage on New Code (required ≥ 60%)

See analysis details on SonarQube Cloud

Use -> instead of value(). for std::optionals

8b4fe4c

pull-request-size Bot added the size/XL label Jul 15, 2026

flomnes requested a review from YoshuaLisasi July 15, 2026 07:51

format

7b9c679

pull-request-size Bot added size/XXL and removed size/XL labels Jul 15, 2026

YoshuaLisasi reviewed Jul 16, 2026

View reviewed changes

Merge remote-tracking branch 'origin/develop' into pr-3809-fix

cf910c8

# Conflicts: # src/solver/variable/include/antares/solver/variable/economy/reserves/reserveParticipationByHydro.h # src/solver/variable/include/antares/solver/variable/economy/reserves/reserveParticipationBySTStorage.h

Uh oh!

Conversation

flomnes commented Jul 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pull-request-size Bot commented Jul 15, 2026

Uh oh!

YoshuaLisasi Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

flomnes commented Jul 15, 2026 •

edited

Loading

YoshuaLisasi Jul 16, 2026 •

edited

Loading