[DEV] Replace flag by vector of bool

AntaresSimulatorTeam · Sep 21, 2023 · c4dd148 · c4dd148
1 parent f948eb7
commit c4dd148
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/solver/hydro/daily/h2o_j_lisser_les_sur_turbines.cpp b/src/solver/hydro/daily/h2o_j_lisser_les_sur_turbines.cpp
@@ -34,34 +34,34 @@ void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES* DonneesMensuelles, int Numer
 {
     PROBLEME_HYDRAULIQUE& ProblemeHydraulique = DonneesMensuelles->ProblemeHydraulique;
 
-    std::vector<double>& TurbineMax = DonneesMensuelles->TurbineMax;
-    std::vector<double>& Turbine = DonneesMensuelles->Turbine;
-    std::vector<double>& TurbineCible = DonneesMensuelles->TurbineCible;
-
-    char* Flag = (char*) ProblemeHydraulique.ProblemeLineairePartieVariable[NumeroDeProbleme].Xmax.data();
+    auto& Turbine = DonneesMensuelles->Turbine;
+    const auto& TurbineMax = DonneesMensuelles->TurbineMax;
+    const auto& TurbineCible = DonneesMensuelles->TurbineCible;
 
     const int NbPdt = ProblemeHydraulique.NbJoursDUnProbleme[NumeroDeProbleme];
 
+    std::vector<bool> flag(NbPdt);
+
     double SurTurbineARepartir = 0.0;
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
-        Flag[Pdt] = 0;
+        flag[Pdt] = 0;
         if (Turbine[Pdt] - TurbineCible[Pdt] > ZERO)
-            Flag[Pdt] = 1;
+            flag[Pdt] = 1;
     }
 
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
-        if (Flag[Pdt] == 1)
+        if (flag[Pdt] == 1)
             SurTurbineARepartir += Turbine[Pdt] - TurbineCible[Pdt];
     }
 
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
-        Flag[Pdt] = 0;
+        flag[Pdt] = 0;
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
         if (TurbineMax[Pdt] - TurbineCible[Pdt] > ZERO)
-            Flag[Pdt] = 1;
+            flag[Pdt] = 1;
     }
 
     int NbCycles = 0;
@@ -70,7 +70,7 @@ void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES* DonneesMensuelles, int Numer
     int Np = 0;
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
-        if (Flag[Pdt] == 1)
+        if (flag[Pdt] == 1)
             Np++;
     }
     if (Np <= 0)
@@ -83,7 +83,7 @@ void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES* DonneesMensuelles, int Numer
         MargeMin += TurbineMax[Pdt];
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
-        if (Flag[Pdt] == 1)
+        if (flag[Pdt] == 1)
         {
             if (TurbineMax[Pdt] - TurbineCible[Pdt] < MargeMin)
                 MargeMin = TurbineMax[Pdt] - TurbineCible[Pdt];
@@ -100,15 +100,15 @@ void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES* DonneesMensuelles, int Numer
     char LimiteAtteinte = 0;
     for (int Pdt = 0; Pdt < NbPdt; Pdt++)
     {
-        if (Flag[Pdt] == 0)
+        if (flag[Pdt] == 0)
             continue;
 
         Turbine[Pdt] = TurbineCible[Pdt] + SurTurbine;
         if (TurbineMax[Pdt] - Turbine[Pdt] <= ZERO)
         {
             SurTurbineARepartir -= SurTurbine;
             LimiteAtteinte = 1;
-            Flag[Pdt] = 0;
+            flag[Pdt] = 0;
         }
     }