fix bug occuring when not all the thermal clusters are participating …

…to a reserve
AntaresSimulatorTeam · Nov 6, 2024 · 0c9eca8 · 0c9eca8
1 parent 2387087
commit 0c9eca8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/solver/optimisation/constraints/POutBounds.cpp b/src/solver/optimisation/constraints/POutBounds.cpp
@@ -103,16 +103,20 @@ void POutBounds::add(int pays, int cluster, int pdt)
             return counter;
         };
 
+        int nbTermsUp = countReservesParticipations(
+            data.areaReserves[pays].areaCapacityReservationsUp);
+        int nbTermsDown = countReservesParticipations(
+            data.areaReserves[pays].areaCapacityReservationsDown);
+
         int nbTermsToAdd
           = countReservesParticipations(
               data.areaReserves[pays].areaCapacityReservationsUp)
             + countReservesParticipations(
               data.areaReserves[pays].areaCapacityReservationsDown);
 
+        builder.data.NbTermesContraintesPourLesReserves
+            += (nbTermsUp + 1) * (nbTermsUp > 0) + (nbTermsDown + 1) * (nbTermsDown > 0);
 
-
-        builder.data.NbTermesContraintesPourLesReserves += 2 * (nbTermsToAdd + 1);
-
-        builder.data.nombreDeContraintes += 2;
+        builder.data.nombreDeContraintes += (nbTermsUp > 0) + (nbTermsDown > 0);
     }
 }
diff --git a/src/solver/optimisation/constraints/POutCapacityThreasholds.cpp b/src/solver/optimisation/constraints/POutCapacityThreasholds.cpp
@@ -107,7 +107,7 @@ void POutCapacityThreasholds::add(int pays, int cluster, int pdt)
             data.areaReserves[pays].areaCapacityReservationsDown);
 
         builder.data.NbTermesContraintesPourLesReserves
-            += (nbTermsUp + 1) * (nbTermsUp > 0) + (nbTermsDown + 1) * (nbTermsDown > 0);
+            += (nbTermsUp + 2) * (nbTermsUp > 0) + (nbTermsDown + 2) * (nbTermsDown > 0);
 
         builder.data.nombreDeContraintes += (nbTermsUp > 0) + (nbTermsDown > 0);
     }

diff --git a/src/solver/optimisation/opt_rename_problem.cpp b/src/solver/optimisation/opt_rename_problem.cpp
@@ -279,8 +279,7 @@ void VariableNamer::NumberOfOffUnitsParticipatingToReserve(unsigned int variable
                                                            const std::string& clusterName,
                                                            const std::string& reserveName)
 {
-    SetThermalClusterReserveElementName(
-      variable, "NumberOfOffUnitsParticipatingToReserve", clusterName);
+    SetThermalClusterAndReserveElementName(variable, "NumberOfOffUnitsParticipatingToReserve", clusterName, reserveName);
 }
 
 void VariableNamer::NumberStoppingDispatchableUnits(unsigned int variable,

diff --git a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp
@@ -248,10 +248,10 @@ void SIM_AllocationProblemePasDeTemps(PROBLEME_HEBDO& problem,
             study.runtime.thermalPlantTotalCount * study.runtime.capacityReservationCount, -1);
         problem.CorrespondanceCntNativesCntOptim[k]
           .NumeroDeContrainteDesContraintesDePuissanceMinDuPalier.assign(
-            study.runtime.thermalPlantTotalCount, 0);
+            study.runtime.thermalPlantTotalCount, -1);
         problem.CorrespondanceCntNativesCntOptim[k]
           .NumeroDeContrainteDesContraintesDePuissanceMaxDuPalier.assign(
-            study.runtime.thermalPlantTotalCount, 0);
+            study.runtime.thermalPlantTotalCount, -1);
 
         problem.CorrespondanceCntNativesCntOptim[k]
           .NumeroDeContrainteDesContraintesSTStorageClusterMaxWithdrawParticipation.assign(