Output results : fix annual aggregation (#2580)

Fixes [ANT-2630](https://gopro-tickets.rte-france.com/browse/ANT-2630)
AntaresSimulatorTeam · Jan 15, 2025 · d11f5d2 · d11f5d2
1 parent 600b914
commit d11f5d2
Showing 1 changed file with 3 additions and 5 deletions.
diff --git 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()