Relecture réserve: Optimisation / définition du besoin de réserves pour chaque zone [ANT-4174] by payetvin · Pull Request #3400 · AntaresSimulatorTeam/Antares_Simulator

payetvin · 2026-02-11T12:55:31Z

No description provided.

pull-request-size · 2026-02-11T12:55:53Z

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

payetvin

Reviewed mainly the code in src/solver/optimisation/

payetvin · 2026-02-11T14:31:28Z

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

 {
 namespace // anonymous
 {
+static void toLower(std::string& str)


use boost::to_lower();

payetvin · 2026-02-11T14:36:01Z

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

+    }
+}
+
+bool readReservesAreaParameters(Area& area, const IniFile::Section& section)


Move functions related to reserves in a new file src/libs/antares/study/area/reserves.cpp
list.cpp is too long already

payetvin · 2026-02-11T15:09:42Z

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

+namespace Antares::Data
+{
+
+void static errorIfNegativeValue(const std::string& propertyName,


Not used, remove or call it somewhere

Removed definition from header

payetvin · 2026-02-11T15:10:33Z

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

+    std::pair<UnsuppliedSpilled, ReserveName> reserveParticipationUnsuppliedSpilledAt(
+      unsigned int index) const
+    {
+        int column = 0;


unsigned int

payetvin · 2026-02-11T15:34:23Z

src/solver/optimisation/include/antares/solver/optimisation/opt_reserves.h

@@ -0,0 +1,28 @@
+/*


Maybe merge all the opt_.*reserves.h together ?

payetvin · 2026-02-13T16:11:55Z

src/solver/optimisation/opt_gestion_des_couts_reserves.cpp

+                                             const int PremierPdtDeLIntervalle,
+                                             const int DernierPdtDeLIntervalle)
+{
+    struct ReserveCostsInitializer


What's the point of having this struct defined directly in the function instead of outside or in a header ?

Struct now defined outside

payetvin · 2026-02-13T16:33:57Z

src/solver/optimisation/constraints/ReserveSatisfaction.cpp

+
+void ReserveSatisfaction::add(int pays, int reserve, int pdt)
+{
+    CAPACITY_RESERVATION& capacityReservation = data.areaReserves[pays]


payetvin · 2026-02-13T16:41:56Z

src/solver/optimisation/constraints/ReserveSatisfaction.cpp

+    {
+        if (!data.Simulation)
+        {
+            // 24


what does this mean ?

Every constraint.add function is called twice, once just for counting the constrains (data.Simulation = true) and the second time to implement it into the constraint matrix (data.Simulation = false)
It's the same code as elsewhere in antares

payetvin · 2026-02-13T16:43:28Z

src/solver/optimisation/constraints/ReserveSatisfaction.cpp

+            builder.updateHourWithinWeek(pdt);
+
+            // Thermal clusters reserve participation
+            for (auto& [clusterId, reserveParticipation]:


const, same for ohter loops below

payetvin · 2026-02-13T16:47:56Z

src/solver/optimisation/constraints/ReserveSatisfaction.cpp

+    int nbTermes = capacityReservation.AllThermalReservesParticipation.size()
+                   + capacityReservation.AllSTStorageReservesParticipation.size()
+                   + capacityReservation.AllHydroReservesParticipation.size();
+    if (nbTermes)


if (nbTermes == 0) return;

There's no else, exit and avoid complexity

…onstraints

pull-request-size bot added the size/XXL label Feb 11, 2026

payetvin commented Feb 13, 2026

View reviewed changes

sylvmara added 10 commits February 23, 2026 15:22

Fixed uint and ReserveSatisfaction return

c0179e6

Used boost for to_lower and added const to multiple declarations in c…

2bfa7f6

…onstraints

Fix : Added more const where necessary

da9fb98

Fix last commit and reduced number of headers files for opt_reserves

1ca9504

Fix : Removed doubled function errorIfNegativeValue

c2923e1

Fixed multiple comments, code smells

6c515d6

Fix : removed .get()

26685e6

Fixed list.cpp to exclude reserves only functions

32c45e8

Fixed last commit and ubuntu warnings for errorIfNegativeValue

2bcd154

Fix : refacto to remove structs from inside functions

bd3044f

payetvin changed the base branch from develop to feature/reserve_model_lot3_scalian March 19, 2026 13:28

Conversation

payetvin commented Feb 11, 2026

Uh oh!

pull-request-size bot commented Feb 11, 2026

Uh oh!

payetvin left a comment

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!

sylvmara Mar 17, 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!

sylvmara Feb 23, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sylvmara Mar 17, 2026 •

edited

Loading

sylvmara Feb 23, 2026 •

edited

Loading