diff --git a/src/libs/antares/study/area/list.cpp b/src/libs/antares/study/area/list.cpp index 868c3d5490..153ff7c19b 100644 --- a/src/libs/antares/study/area/list.cpp +++ b/src/libs/antares/study/area/list.cpp @@ -1201,7 +1201,7 @@ bool AreaList::loadFromFolder(const StudyLoadOptions& options) ret; const auto constraints_folder = stsFolder / "constraints" / area->id.c_str(); - ret = area->shortTermStorage.LoadConstraintsFromIniFile(cluster_folder) && ret; + ret = area->shortTermStorage.LoadConstraintsFromIniFile(constraints_folder) && ret; } } else diff --git a/src/libs/antares/study/parts/short-term-storage/container.cpp b/src/libs/antares/study/parts/short-term-storage/container.cpp index 1e46be0a5f..25077864b5 100644 --- a/src/libs/antares/study/parts/short-term-storage/container.cpp +++ b/src/libs/antares/study/parts/short-term-storage/container.cpp @@ -149,13 +149,13 @@ bool STStorageInput::LoadConstraintsFromIniFile(const fs::path& parent_path) ++localIndex; } } - - // try to read the rhs - loadFile(parent_path / ("rhs_" + additional_constraints.name + ".txt"), - additional_constraints.rhs); - fillIfEmpty(additional_constraints.rhs, 0.0); } + // try to read the rhs + loadFile(parent_path / ("rhs_" + additional_constraints.name + ".txt"), + additional_constraints.rhs); + fillIfEmpty(additional_constraints.rhs, 0.0); + if (auto [ok, error_msg] = additional_constraints.validate(); !ok) { logs.error() << "Invalid constraint in section: " << section->name; @@ -229,8 +229,19 @@ std::size_t STStorageInput::cumulativeConstraintCount() const return std::accumulate(storagesByIndex.begin(), storagesByIndex.end(), 0, - [](int acc, const auto& cluster) - { return acc + cluster.additional_constraints.size(); }); + [](size_t outer_constraint_count, const auto& cluster) + { + return outer_constraint_count + std::accumulate( + cluster.additional_constraints.begin(), + cluster.additional_constraints.end(), + 0, + [](size_t inner_constraint_count, + const auto& additional_constraints) + { + return inner_constraint_count + + additional_constraints.constraints.size(); + }); + }); } std::size_t STStorageInput::count() const