Skip to content

Commit

Permalink
Merge pull request #9 from AntaresSimulatorTeam/fix/infeasibility-heu…
Browse files Browse the repository at this point in the history
…ristic-hydro-change-lower-bound

Fix/infeasibility heuristic hydro change lower bound
  • Loading branch information
meslubi2021 authored Dec 22, 2024
2 parents d76b0cb + cf9f0d9 commit c7014e6
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES* DonneesMensuelle
{
const std::vector<double>& TurbineMax = DonneesMensuelles->TurbineMax;
const std::vector<double>& TurbineMin = DonneesMensuelles->TurbineMin;
const std::vector<double>& TurbineCible = DonneesMensuelles->TurbineCible;
std::vector<double>& Turbine = DonneesMensuelles->Turbine;

PROBLEME_HYDRAULIQUE& ProblemeHydraulique = DonneesMensuelles->ProblemeHydraulique;
Expand All @@ -53,7 +52,7 @@ void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES* DonneesMensuelle
int Var = CorrespondanceDesVariables.NumeroDeVariableTurbine[Pdt];
Xmax[Var] = TurbineMax[Pdt];

Xmin[Var] = std::min(TurbineMax[Pdt], std::max(TurbineCible[Pdt], TurbineMin[Pdt]));
Xmin[Var] = std::min(TurbineMax[Pdt], TurbineMin[Pdt]);

AdresseOuPlacerLaValeurDesVariablesOptimisees[Var] = &(Turbine[Pdt]);
}
Expand Down

0 comments on commit c7014e6

Please sign in to comment.