From 219ece97a7b9be52842fe5a295e72110c806c69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Omn=C3=A8s?= Date: Wed, 20 Apr 2022 15:17:29 +0200 Subject: [PATCH] [solver] Remove useless parentheses (#652) find -type f | xargs sed -E -i 's/\((.+)\)->/\1->/g' --- src/solver/hydro/daily/h2o_j_free.c | 33 ++++++++------- src/solver/hydro/daily2/h2o2_j_free.cpp | 32 +++++++-------- src/solver/hydro/monthly/h2o_m_free.c | 40 +++++++++---------- .../opt_appel_solveur_lineaire.cpp | 10 ++--- .../opt_liberation_problemes_simplexe.cpp | 4 +- .../opt_optimisation_lineaire.cpp | 6 +-- .../opt_restaurer_les_donnees.cpp | 2 +- .../simulation/sim_alloc_probleme_hebdo.cpp | 4 +- src/solver/simulation/solver.hxx | 4 +- .../variable/surveyresults/surveyresults.cpp | 2 +- 10 files changed, 68 insertions(+), 69 deletions(-) diff --git a/src/solver/hydro/daily/h2o_j_free.c b/src/solver/hydro/daily/h2o_j_free.c index a819c83c8c..f9370e7566 100644 --- a/src/solver/hydro/daily/h2o_j_free.c +++ b/src/solver/hydro/daily/h2o_j_free.c @@ -53,33 +53,32 @@ void H2O_J_Free(DONNEES_MENSUELLES* DonneesMensuelles) for (i = 0; i < NombreDeProblemes; i++) { - free((ProblemeHydraulique->CorrespondanceDesVariables[i])->NumeroDeVariableTurbine); + free(ProblemeHydraulique->CorrespondanceDesVariables[i]->NumeroDeVariableTurbine); free(ProblemeHydraulique->CorrespondanceDesVariables[i]); - free((ProblemeHydraulique->CorrespondanceDesContraintes[i])->NumeroDeContrainteSurXi); + free(ProblemeHydraulique->CorrespondanceDesContraintes[i]->NumeroDeContrainteSurXi); free(ProblemeHydraulique->CorrespondanceDesContraintes[i]); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->CoutLineaire); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->TypeDeVariable); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->Sens); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->IndicesDebutDeLigne); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->NombreDeTermesDesLignes); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->CoutLineaire); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->TypeDeVariable); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->Sens); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->IndicesDebutDeLigne); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->NombreDeTermesDesLignes); free((ProblemeHydraulique->ProblemeLineairePartieFixe[i]) ->CoefficientsDeLaMatriceDesContraintes); - free((ProblemeHydraulique->ProblemeLineairePartieFixe[i])->IndicesColonnes); + free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]->IndicesColonnes); free(ProblemeHydraulique->ProblemeLineairePartieFixe[i]); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->Xmin); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->Xmax); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->SecondMembre); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->Xmin); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->Xmax); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->SecondMembre); free((ProblemeHydraulique->ProblemeLineairePartieVariable[i]) ->AdresseOuPlacerLaValeurDesVariablesOptimisees); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->X); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->PositionDeLaVariable); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->ComplementDeLaBase); - free((ProblemeHydraulique->ProblemeLineairePartieVariable[i])->CoutsReduits); - free( - (ProblemeHydraulique->ProblemeLineairePartieVariable[i])->CoutsMarginauxDesContraintes); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->X); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->PositionDeLaVariable); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->ComplementDeLaBase); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->CoutsReduits); + free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]->CoutsMarginauxDesContraintes); free(ProblemeHydraulique->ProblemeLineairePartieVariable[i]); ProbSpx = (PROBLEME_SPX*)ProblemeHydraulique->ProblemeSpx[i]; diff --git a/src/solver/hydro/daily2/h2o2_j_free.cpp b/src/solver/hydro/daily2/h2o2_j_free.cpp index f32871c7d7..1d07e3fb5a 100644 --- a/src/solver/hydro/daily2/h2o2_j_free.cpp +++ b/src/solver/hydro/daily2/h2o2_j_free.cpp @@ -53,35 +53,35 @@ void H2O2_J_Free(DONNEES_MENSUELLES_ETENDUES* DonneesMensuelles) for (i = 0; i < NombreDeProblemes; i++) { - free((ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i])->NumeroVar_Turbine); - free((ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i])->NumeroVar_niveauxFinJours); - free((ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i])->NumeroVar_overflow); - free((ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i])->NumeroVar_deviations); - free((ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i])->NumeroVar_violations); + free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]->NumeroVar_Turbine); + free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]->NumeroVar_niveauxFinJours); + free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]->NumeroVar_overflow); + free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]->NumeroVar_deviations); + free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]->NumeroVar_violations); free(ProblemeHydrauliqueEtendu->CorrespondanceDesVariables[i]); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i])->CoutLineaire); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i])->TypeDeVariable); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i])->Sens); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i])->IndicesDebutDeLigne); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]->CoutLineaire); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]->TypeDeVariable); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]->Sens); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]->IndicesDebutDeLigne); free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]) ->NombreDeTermesDesLignes); free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]) ->CoefficientsDeLaMatriceDesContraintes); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i])->IndicesColonnes); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]->IndicesColonnes); free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieFixe[i]); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->Xmin); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->Xmax); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->SecondMembre); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->Xmin); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->Xmax); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->SecondMembre); free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]) ->AdresseOuPlacerLaValeurDesVariablesOptimisees); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->X); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->X); free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]) ->PositionDeLaVariable); free( - (ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->ComplementDeLaBase); - free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i])->CoutsReduits); + ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->ComplementDeLaBase); + free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]->CoutsReduits); free((ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]) ->CoutsMarginauxDesContraintes); free(ProblemeHydrauliqueEtendu->ProblemeLineaireEtenduPartieVariable[i]); diff --git a/src/solver/hydro/monthly/h2o_m_free.c b/src/solver/hydro/monthly/h2o_m_free.c index 06a219597e..a04e8969a7 100644 --- a/src/solver/hydro/monthly/h2o_m_free.c +++ b/src/solver/hydro/monthly/h2o_m_free.c @@ -49,36 +49,36 @@ void H2O_M_Free(DONNEES_ANNUELLES* DonneesAnnuelles) ProblemeHydraulique = DonneesAnnuelles->ProblemeHydraulique; - free((ProblemeHydraulique->CorrespondanceDesVariables)->NumeroDeVariableVolume); - free((ProblemeHydraulique->CorrespondanceDesVariables)->NumeroDeVariableTurbine); - free((ProblemeHydraulique->CorrespondanceDesVariables)->NumeroDeVariableDepassementVolumeMax); - free((ProblemeHydraulique->CorrespondanceDesVariables)->NumeroDeVariableDepassementVolumeMin); + free(ProblemeHydraulique->CorrespondanceDesVariables->NumeroDeVariableVolume); + free(ProblemeHydraulique->CorrespondanceDesVariables->NumeroDeVariableTurbine); + free(ProblemeHydraulique->CorrespondanceDesVariables->NumeroDeVariableDepassementVolumeMax); + free(ProblemeHydraulique->CorrespondanceDesVariables->NumeroDeVariableDepassementVolumeMin); free((ProblemeHydraulique->CorrespondanceDesVariables) ->NumeroDeVariableDEcartPositifAuTurbineCible); free((ProblemeHydraulique->CorrespondanceDesVariables) ->NumeroDeVariableDEcartNegatifAuTurbineCible); free(ProblemeHydraulique->CorrespondanceDesVariables); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->CoutLineaire); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->CoutLineaireBruite); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->TypeDeVariable); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->Sens); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->IndicesDebutDeLigne); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->NombreDeTermesDesLignes); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->CoefficientsDeLaMatriceDesContraintes); - free((ProblemeHydraulique->ProblemeLineairePartieFixe)->IndicesColonnes); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->CoutLineaire); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->CoutLineaireBruite); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->TypeDeVariable); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->Sens); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->IndicesDebutDeLigne); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->NombreDeTermesDesLignes); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->CoefficientsDeLaMatriceDesContraintes); + free(ProblemeHydraulique->ProblemeLineairePartieFixe->IndicesColonnes); free(ProblemeHydraulique->ProblemeLineairePartieFixe); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->Xmin); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->Xmax); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->SecondMembre); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->Xmin); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->Xmax); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->SecondMembre); free((ProblemeHydraulique->ProblemeLineairePartieVariable) ->AdresseOuPlacerLaValeurDesVariablesOptimisees); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->X); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->PositionDeLaVariable); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->ComplementDeLaBase); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->CoutsReduits); - free((ProblemeHydraulique->ProblemeLineairePartieVariable)->CoutsMarginauxDesContraintes); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->X); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->PositionDeLaVariable); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->ComplementDeLaBase); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->CoutsReduits); + free(ProblemeHydraulique->ProblemeLineairePartieVariable->CoutsMarginauxDesContraintes); free(ProblemeHydraulique->ProblemeLineairePartieVariable); for (i = 0; i < ProblemeHydraulique->NombreDeReservoirs; i++) diff --git a/src/solver/optimisation/opt_appel_solveur_lineaire.cpp b/src/solver/optimisation/opt_appel_solveur_lineaire.cpp index 770c163b80..6bc9abbaf8 100644 --- a/src/solver/optimisation/opt_appel_solveur_lineaire.cpp +++ b/src/solver/optimisation/opt_appel_solveur_lineaire.cpp @@ -114,8 +114,8 @@ bool OPT_AppelDuSimplexe(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace, int NumIn PremierPassage = OUI_ANTARES; MPSolver* solver; - ProbSpx = (PROBLEME_SPX*)((ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[(int)NumIntervalle]); - solver = (MPSolver*)((ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[(int)NumIntervalle]); + ProbSpx = (PROBLEME_SPX*)(ProblemeAResoudre->ProblemesSpx->ProblemeSpx[(int)NumIntervalle]); + solver = (MPSolver*)(ProblemeAResoudre->ProblemesSpx->ProblemeSpx[(int)NumIntervalle]); auto& study = *Data::Study::Current::Get(); bool ortoolsUsed = study.parameters.ortoolsUsed; @@ -139,7 +139,7 @@ bool OPT_AppelDuSimplexe(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace, int NumIn { SPX_LibererProbleme(ProbSpx); } - (ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[NumIntervalle] = NULL; + ProblemeAResoudre->ProblemesSpx->ProblemeSpx[NumIntervalle] = NULL; ProbSpx = NULL; solver = NULL; @@ -244,7 +244,7 @@ bool OPT_AppelDuSimplexe(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace, int NumIn solver = ORTOOLS_Simplexe(&Probleme, solver); if (solver != NULL) { - (ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[NumIntervalle] = (void*)solver; + ProblemeAResoudre->ProblemesSpx->ProblemeSpx[NumIntervalle] = (void*)solver; } } else @@ -252,7 +252,7 @@ bool OPT_AppelDuSimplexe(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace, int NumIn ProbSpx = SPX_Simplexe(&Probleme, ProbSpx); if (ProbSpx != NULL) { - (ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[NumIntervalle] = (void*)ProbSpx; + ProblemeAResoudre->ProblemesSpx->ProblemeSpx[NumIntervalle] = (void*)ProbSpx; } } measure.tick(); diff --git a/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp b/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp index 647fd73eb8..5af6e39e7e 100644 --- a/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp +++ b/src/solver/optimisation/opt_liberation_problemes_simplexe.cpp @@ -76,8 +76,8 @@ void OPT_LiberationProblemesSimplexe(PROBLEME_HEBDO* ProblemeHebdo) for (NumIntervalle = 0; NumIntervalle < NbIntervalles; NumIntervalle++) { ProbSpx - = (PROBLEME_SPX*)((ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[NumIntervalle]); - solver = (MPSolver*)((ProblemeAResoudre->ProblemesSpx)->ProblemeSpx[NumIntervalle]); + = (PROBLEME_SPX*)(ProblemeAResoudre->ProblemesSpx->ProblemeSpx[NumIntervalle]); + solver = (MPSolver*)(ProblemeAResoudre->ProblemesSpx->ProblemeSpx[NumIntervalle]); if (ortoolsUsed && solver != NULL) { diff --git a/src/solver/optimisation/opt_optimisation_lineaire.cpp b/src/solver/optimisation/opt_optimisation_lineaire.cpp index 5bd45f666a..71fc14bf4e 100644 --- a/src/solver/optimisation/opt_optimisation_lineaire.cpp +++ b/src/solver/optimisation/opt_optimisation_lineaire.cpp @@ -63,7 +63,7 @@ bool OPT_OptimisationLineaire(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace) NombreDePasDeTempsPourUneOptimisation = ProblemeHebdo->NombreDePasDeTempsPourUneOptimisation; - (ProblemeHebdo->ProblemeAResoudre)->NumeroDOptimisation = PREMIERE_OPTIMISATION; + ProblemeHebdo->ProblemeAResoudre->NumeroDOptimisation = PREMIERE_OPTIMISATION; OPT_NumeroDeJourDuPasDeTemps(ProblemeHebdo); @@ -105,7 +105,7 @@ bool OPT_OptimisationLineaire(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace) ProblemeHebdo->numeroOptimisation[NumeroDeLIntervalle] = 0; } - if ((ProblemeHebdo->ProblemeAResoudre)->NumeroDOptimisation == PREMIERE_OPTIMISATION) + if (ProblemeHebdo->ProblemeAResoudre->NumeroDOptimisation == PREMIERE_OPTIMISATION) { if (ProblemeHebdo->OptimisationAvecCoutsDeDemarrage == NON_ANTARES) { @@ -119,7 +119,7 @@ bool OPT_OptimisationLineaire(PROBLEME_HEBDO* ProblemeHebdo, uint numSpace) printf("BUG: l'indicateur ProblemeHebdo->OptimisationAvecCoutsDeDemarrage doit etre " "initialise a OUI_ANTARES ou NON_ANTARES\n"); - (ProblemeHebdo->ProblemeAResoudre)->NumeroDOptimisation = DEUXIEME_OPTIMISATION; + ProblemeHebdo->ProblemeAResoudre->NumeroDOptimisation = DEUXIEME_OPTIMISATION; if (ProblemeHebdo->Expansion == NON_ANTARES) goto OptimisationHebdo; diff --git a/src/solver/optimisation/opt_restaurer_les_donnees.cpp b/src/solver/optimisation/opt_restaurer_les_donnees.cpp index bd7184859e..ed29044b7b 100644 --- a/src/solver/optimisation/opt_restaurer_les_donnees.cpp +++ b/src/solver/optimisation/opt_restaurer_les_donnees.cpp @@ -107,7 +107,7 @@ void OPT_RestaurerLesDonnees(PROBLEME_HEBDO* ProblemeHebdo) } if (ProblemeHebdo->YaDeLaReserveJmoins1 == OUI_ANTARES - && (ProblemeHebdo->ProblemeAResoudre)->NumeroDOptimisation == PREMIERE_OPTIMISATION) + && ProblemeHebdo->ProblemeAResoudre->NumeroDOptimisation == PREMIERE_OPTIMISATION) { for (Pdt = 0; Pdt < DernierPasDeTemps; Pdt++) { diff --git a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp index 275036eabe..eaa911af10 100644 --- a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp +++ b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp @@ -378,7 +378,7 @@ void SIM_AllocationProblemeHebdo(PROBLEME_HEBDO& problem, int NombreDePasDeTemps for (k = 0; k < (int)nbPays; k++) { - const uint nbPaliers = (study.areas.byIndex[k])->thermal.list.size(); + const uint nbPaliers = study.areas.byIndex[k]->thermal.list.size(); problem.PaliersThermiquesDuPays[k] = (PALIERS_THERMIQUES*)MemAlloc(sizeof(PALIERS_THERMIQUES)); @@ -758,7 +758,7 @@ void SIM_DesallocationProblemeHebdo(PROBLEME_HEBDO& problem) for (int k = 0; k < (int)nbPays; ++k) { - const uint nbPaliers = (study.areas.byIndex[k])->thermal.list.size(); + const uint nbPaliers = study.areas.byIndex[k]->thermal.list.size(); MemFree(problem.PaliersThermiquesDuPays[k]->PminDuPalierThermiquePendantUneHeure); MemFree(problem.PaliersThermiquesDuPays[k]->PminDuPalierThermiquePendantUneSemaine); diff --git a/src/solver/simulation/solver.hxx b/src/solver/simulation/solver.hxx index 91192abdec..d8497a81e5 100644 --- a/src/solver/simulation/solver.hxx +++ b/src/solver/simulation/solver.hxx @@ -639,7 +639,7 @@ void ISimulation::estimateMemoryForWeeklyPb(Antares::Data::StudyMemoryUsag for (int k = 0; k < (int)nbAreas; k++) { - const uint nbPaliers = (study.areas.byIndex[k])->thermal.list.size(); + const uint nbPaliers = study.areas.byIndex[k]->thermal.list.size(); requiredMemoryForWeeklyPb += 10 * NombreDePasDeTemps * sizeof(double); requiredMemoryForWeeklyPb += NombreDePasDeTemps * sizeof(void*); @@ -676,7 +676,7 @@ void ISimulation::estimateMemoryForWeeklyPb(Antares::Data::StudyMemoryUsag for (int k = 0; k < (int)nbAreas; k++) { - const uint nbPaliers = (study.areas.byIndex[k])->thermal.list.size(); + const uint nbPaliers = study.areas.byIndex[k]->thermal.list.size(); requiredMemoryForWeeklyPb += sizeof(PALIERS_THERMIQUES); requiredMemoryForWeeklyPb += sizeof(ENERGIES_ET_PUISSANCES_HYDRAULIQUES); diff --git a/src/solver/variable/surveyresults/surveyresults.cpp b/src/solver/variable/surveyresults/surveyresults.cpp index 76c978f83f..42ba0e1fca 100644 --- a/src/solver/variable/surveyresults/surveyresults.cpp +++ b/src/solver/variable/surveyresults/surveyresults.cpp @@ -159,7 +159,7 @@ void ExportGridInfosAreas(const Data::Study& study, const String& folder) { auto end = area.links.end(); for (auto i = area.links.begin(); i != end; ++i) - outLinks << area.id << '\t' << (i->second)->with->id << '\n'; + outLinks << area.id << '\t' << i->second->with->id << '\n'; } // Thermal clusters