From d11f5d2c4bcd99226c53bf5fede5f433a7d0b55b Mon Sep 17 00:00:00 2001 From: guilpier-code <62292552+guilpier-code@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:21:56 +0100 Subject: [PATCH] Output results : fix annual aggregation (#2580) Fixes [ANT-2630](https://gopro-tickets.rte-france.com/browse/ANT-2630) --- src/solver/variable/storage/intermediate.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/solver/variable/storage/intermediate.cpp b/src/solver/variable/storage/intermediate.cpp index a796b9676d..14a76bbc77 100644 --- a/src/solver/variable/storage/intermediate.cpp +++ b/src/solver/variable/storage/intermediate.cpp @@ -273,13 +273,11 @@ void IntermediateValues::computeMonthlyAveragesForCurrentYear() void IntermediateValues::computeYearlyAveragesForCurrentYear() { year = 0.; // Re-initialization (a previous MC year could have left a non-nil value) - - // Compute current year average - for (uint w = pRange->week[Data::rangeBegin]; w <= pRange->week[Data::rangeEnd]; ++w) + for (uint d = pRange->day[Data::rangeBegin]; d <= pRange->day[Data::rangeEnd]; ++d) { - year += week[w]; + year += day[d]; } - year /= pRange->week[Data::rangeCount]; + year *= HOURS_PER_DAY / (double)pRange->hour[Data::rangeCount]; } void IntermediateValues::computeProbabilitiesForTheCurrentYear()