diff --git a/src/libs/antares/study/area/list.cpp b/src/libs/antares/study/area/list.cpp index 153ff7c19b..eee3eff996 100644 --- a/src/libs/antares/study/area/list.cpp +++ b/src/libs/antares/study/area/list.cpp @@ -1197,8 +1197,8 @@ bool AreaList::loadFromFolder(const StudyLoadOptions& options) for (const auto& area: areas | std::views::values) { fs::path cluster_folder = stsFolder / "clusters" / area->id.c_str(); - ret = area->shortTermStorage.createSTStorageClustersFromIniFile(cluster_folder) && - ret; + ret = area->shortTermStorage.createSTStorageClustersFromIniFile(cluster_folder) + && ret; const auto constraints_folder = stsFolder / "constraints" / area->id.c_str(); ret = area->shortTermStorage.LoadConstraintsFromIniFile(constraints_folder) && ret; diff --git a/src/libs/antares/study/parts/short-term-storage/series.cpp b/src/libs/antares/study/parts/short-term-storage/series.cpp index 4ee93d8a73..a8694e967b 100644 --- a/src/libs/antares/study/parts/short-term-storage/series.cpp +++ b/src/libs/antares/study/parts/short-term-storage/series.cpp @@ -113,7 +113,7 @@ void fillIfEmpty(std::vector& v, double value) { v.resize(HOURS_PER_YEAR, value); } -}; +} void Series::fillDefaultSeriesIfEmpty() { diff --git a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp index 7de6203d69..239797bbf6 100644 --- a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp +++ b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp @@ -250,7 +250,7 @@ int OPT_DecompteDesVariablesEtDesContraintesDuProblemeAOptimiser(PROBLEME_HEBDO* for (const auto& additional_constraints: storage.additional_constraints) { ProblemeAResoudre->NombreDeContraintes += additional_constraints.constraints - .size(); + .size(); } } } diff --git a/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp b/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp index c3d0d16f95..adbccd8f3d 100644 --- a/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp +++ b/src/solver/optimisation/opt_gestion_second_membre_cas_lineaire.cpp @@ -61,19 +61,14 @@ static void shortTermStorageCumulationRHS( for (const auto& constraint: additional_constraints.constraints) { const int cnt = CorrespondancesDesContraintesHebdomadaires - .ShortTermStorageCumulation[constraint.globalIndex]; - - SecondMembre[cnt] = std::accumulate(constraint.hours.begin(), - constraint.hours.end(), - 0.0, - [weekFirstHour, &additional_constraints - ]( - const double sum, - const int hour) - { - return sum + additional_constraints.rhs[ - weekFirstHour + hour - 1]; - }); + .ShortTermStorageCumulation[constraint.globalIndex]; + + SecondMembre[cnt] = std::accumulate( + constraint.hours.begin(), + constraint.hours.end(), + 0.0, + [weekFirstHour, &additional_constraints](const double sum, const int hour) + { return sum + additional_constraints.rhs[weekFirstHour + hour - 1]; }); } } }