Skip to content

Commit

Permalink
Fixing build errors due to migration from raw ptrs to stl vectors
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaredstork committed Jul 31, 2023
1 parent 13db210 commit 04b6104
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/solver/hydro/management/daily.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ inline void HydroManagement::prepareDailyOptimalGenerations(Solver::Variable::St
auto const& maxPower = area.hydro.series->maxgen;

uint tsIndexPowerCredits
= (*NumeroChroniquesTireesParPays[numSpace][z]).HydrauliquePowerCredits;
= (NumeroChroniquesTireesParPays[numSpace][z]).HydrauliquePowerCredits;

auto const& maxP = maxPower[tsIndexPowerCredits < maxPower.width ? tsIndexPowerCredits : 0];
auto const& maxE = maxPowerHours[Data::PartHydro::genMaxE];
Expand Down
2 changes: 1 addition & 1 deletion src/solver/simulation/sim_calcul_economique.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ void SIM_RenseignementProblemeHebdo(PROBLEME_HEBDO& problem,
auto& inflowsmatrix = area.hydro.series->storage;
auto const& srcinflows = inflowsmatrix[tsIndex < inflowsmatrix.width ? tsIndex : 0];

uint tsIndexPowerCredits = (*NumeroChroniquesTireesParPays[numSpace][k]).HydrauliquePowerCredits;
uint tsIndexPowerCredits = (NumeroChroniquesTireesParPays[numSpace][k]).HydrauliquePowerCredits;
auto& maxgenmatrix = area.hydro.series->maxgen;
auto const& srcmaxgen = maxgenmatrix[tsIndexPowerCredits < maxgenmatrix.width ? tsIndexPowerCredits : 0];
auto& maxpumpmatrix = area.hydro.series->maxpump;
Expand Down
2 changes: 1 addition & 1 deletion src/solver/variable/economy/max-mrg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ inline void PrepareMaxMRGFor(const State& state, double* opmrg, uint numSpace)
uint loop = 100; // arbitrary - maximum number of iterations

// Pmax
uint tsIndex = (*NumeroChroniquesTireesParPays[numSpace][index]).HydrauliquePowerCredits;
uint tsIndex = (NumeroChroniquesTireesParPays[numSpace][index]).HydrauliquePowerCredits;
auto& maxgenmatrix = area.hydro.series->maxgen;
const auto& P = maxgenmatrix[tsIndex < maxgenmatrix.width ? tsIndex : 0];

Expand Down

0 comments on commit 04b6104

Please sign in to comment.