Make computation of intermediate values more readable (#2005)

AntaresSimulatorTeam · Mar 22, 2024 · 802ddb9 · 802ddb9
1 parent 06fce45
commit 802ddb9
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/solver/optimisation/opt_restaurer_les_donnees.cpp b/src/solver/optimisation/opt_restaurer_les_donnees.cpp
@@ -57,7 +57,8 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* problemeHebdo)
             if (!CaracteristiquesHydrauliques.PresenceDHydrauliqueModulable)
                 continue;
 
-            CaracteristiquesHydrauliques.ContrainteDePmaxHydrauliqueHoraire[pdt]
+            double& hourlyPmax = CaracteristiquesHydrauliques.ContrainteDePmaxHydrauliqueHoraire[pdt];
+            hourlyPmax
               = CaracteristiquesHydrauliques.ContrainteDePmaxHydrauliqueHoraireRef[pdt];
             if (CaracteristiquesHydrauliques.SansHeuristique)
                 continue;
@@ -73,18 +74,11 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* problemeHebdo)
                 double PmaxHydUplift
                   = CaracteristiquesHydrauliques.ContrainteDePmaxPompageHoraire[pdt];
                 PmaxHydUplift *= problemeHebdo->CoefficientEcretementPMaxHydraulique[pays];
-
-                if (PmaxHydEcretee < PmaxHydUplift)
-                    PmaxHydEcretee = PmaxHydUplift;
+                PmaxHydEcretee = std::max(PmaxHydUplift, PmaxHydEcretee);
             }
 
             // The generating power allowance cannot exceed the maximum available generating power
-            if (PmaxHydEcretee
-                < CaracteristiquesHydrauliques.ContrainteDePmaxHydrauliqueHoraire[pdt])
-            {
-                CaracteristiquesHydrauliques.ContrainteDePmaxHydrauliqueHoraire[pdt]
-                  = PmaxHydEcretee;
-            }
+            hourlyPmax = std::min(PmaxHydEcretee, hourlyPmax);
         }
     }