Refactor calculation of max power for BdewLoadValues.

Author: staudtMarius

src/main/java/edu/ie3/datamodel/io/factory/timeseries/BdewLoadProfileFactory.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Stream;
 import javax.measure.quantity.Energy;
 import javax.measure.quantity.Power;
 import tech.units.indriya.ComparableQuantity;
@@ -93,19 +92,19 @@ public BdewStandardLoadProfile parseProfile(String profile) {
   @Override
   public ComparableQuantity<Power> calculateMaxPower(
       BdewStandardLoadProfile loadProfile, Set<LoadProfileEntry<BdewLoadValues>> entries) {
-    Function<BdewLoadValues, Stream<Double>> valueExtractor =
+    Function<BdewLoadValues, Double> valueExtractor =
         switch (loadProfile) {
           case H0, H25, P25, S25 ->
           // maximum dynamization factor is on day 366 (leap year) or day 365 (regular year).
           // The difference between day 365 and day 366 is negligible, thus pick 366
-          v -> v.lastDayOfYearValues().map(p -> BdewLoadValues.dynamization(p, 366));
-          default -> BdewLoadValues::values;
+          v -> BdewLoadValues.dynamization(v.getMaxValue(true), 366);
+          default -> v -> v.getMaxValue(false);
         };
 
     double maxPower =
         entries.stream()
             .map(TimeSeriesEntry::getValue)
-            .flatMap(valueExtractor)
+            .map(valueExtractor)
             .max(Comparator.naturalOrder())
             .orElse(0d);
 

src/main/java/edu/ie3/datamodel/models/value/load/BdewLoadValues.java

@@ -70,26 +70,35 @@ public double get(BdewKey key) {
     return values.get(key);
   }
 
-  /** Returns the values, that may contain the last day of the year, as a stream. */
-  public Stream<Double> lastDayOfYearValues() {
-    Stream<BdewKey> keys =
-        switch (scheme) {
-          case BDEW1999 -> Stream.of(
-              new Bdew1999Key(WINTER, DayType.SATURDAY),
-              new Bdew1999Key(WINTER, DayType.SUNDAY),
-              new Bdew1999Key(WINTER, DayType.WEEKDAY));
-          case BDEW2025 -> Stream.of(
-              new Bdew2025Key(DECEMBER, DayType.SATURDAY),
-              new Bdew2025Key(DECEMBER, DayType.SUNDAY),
-              new Bdew2025Key(DECEMBER, DayType.WEEKDAY));
-        };
-
-    return keys.map(values::get);
-  }
+  /**
+   * Method to calculate the maximal value contained in this {@link BdewLoadValues}.
+   *
+   * @param lastDayOfYear if true, only the values, that could occur at the last day of a year, are
+   *     considered
+   * @return the maximal value
+   */
+  public double getMaxValue(boolean lastDayOfYear) {
+    Stream<Double> stream;
+
+    if (lastDayOfYear) {
+      Stream<BdewKey> keys =
+          switch (scheme) {
+            case BDEW1999 -> Stream.of(
+                new Bdew1999Key(WINTER, DayType.SATURDAY),
+                new Bdew1999Key(WINTER, DayType.SUNDAY),
+                new Bdew1999Key(WINTER, DayType.WEEKDAY));
+            case BDEW2025 -> Stream.of(
+                new Bdew2025Key(DECEMBER, DayType.SATURDAY),
+                new Bdew2025Key(DECEMBER, DayType.SUNDAY),
+                new Bdew2025Key(DECEMBER, DayType.WEEKDAY));
+          };
+
+      stream = keys.map(values::get);
+    } else {
+      stream = values.values().stream();
+    }
 
-  /** Returns the values as a stream. */
-  public Stream<Double> values() {
-    return values.values().stream();
+    return stream.max(Comparator.naturalOrder()).orElse(0.0);
   }
 
   @Override