Adapt to changes in dev.

Author: staudtMarius

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

@@ -15,7 +15,6 @@
 import edu.ie3.datamodel.models.timeseries.repetitive.BdewLoadProfileTimeSeries;
 import edu.ie3.datamodel.models.timeseries.repetitive.LoadProfileEntry;
 import edu.ie3.datamodel.models.value.load.BdewLoadValues;
-import edu.ie3.util.quantities.PowerSystemUnits;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -83,9 +82,11 @@ public BdewLoadProfileTimeSeries build(
       LoadProfileMetaInformation metaInformation, Set<LoadProfileEntry<BdewLoadValues>> entries) {
 
     BdewStandardLoadProfile profile = parseProfile(metaInformation.getProfile());
-    Optional<ComparableQuantity<Power>> maxPower = calculateMaxPower(profile, entries);
+    ComparableQuantity<Power> maxPower = calculateMaxPower(profile, entries);
+    ComparableQuantity<Energy> profileEnergyScaling = getLoadProfileEnergyScaling(profile);
 
-    return new BdewLoadProfileTimeSeries(metaInformation.getUuid(), profile, entries, maxPower);
+    return new BdewLoadProfileTimeSeries(
+        metaInformation.getUuid(), profile, entries, maxPower, profileEnergyScaling);
   }
 
   @Override
@@ -98,7 +99,7 @@ public BdewStandardLoadProfile parseProfile(String profile) {
   }
 
   @Override
-  public Optional<ComparableQuantity<Power>> calculateMaxPower(
+  public ComparableQuantity<Power> calculateMaxPower(
       BdewStandardLoadProfile loadProfile, Set<LoadProfileEntry<BdewLoadValues>> entries) {
     Function<BdewLoadValues, Stream<Double>> valueExtractor;
 
@@ -112,16 +113,14 @@ public Optional<ComparableQuantity<Power>> calculateMaxPower(
     } else {
       valueExtractor = v -> v.values().stream();
     }
-    return entries.stream()
-        .map(TimeSeriesEntry::getValue)
-        .flatMap(valueExtractor)
-        .max(Comparator.naturalOrder())
-        .map(p -> Quantities.getQuantity(p, WATT));
-  }
 
-  @Override
-  public Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling(
-      BdewStandardLoadProfile loadProfile) {
-    return Optional.of(Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR));
+    double maxPower =
+        entries.stream()
+            .map(TimeSeriesEntry::getValue)
+            .flatMap(valueExtractor)
+            .max(Comparator.naturalOrder())
+            .orElse(0d);
+
+    return Quantities.getQuantity(maxPower, WATT);
   }
 }

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

@@ -55,6 +55,6 @@ public String getTimeFieldString() {
 
   /** Returns the load profile energy scaling. The default value is 1000 kWh */
   public ComparableQuantity<Energy> getLoadProfileEnergyScaling(P loadProfile) {
-    return Quantities.getQuantity(1000, PowerSystemUnits.KILOWATTHOUR);
+    return Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR);
   }
 }

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/BdewLoadProfileTimeSeries.java

@@ -7,14 +7,12 @@
 
 import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile;
 import edu.ie3.datamodel.models.value.load.BdewLoadValues;
-import edu.ie3.util.quantities.PowerSystemUnits;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import javax.measure.quantity.Energy;
 import javax.measure.quantity.Power;
 import tech.units.indriya.ComparableQuantity;
-import tech.units.indriya.quantity.Quantities;
 
 /**
  * Describes a bdew load profile time series with repetitive values that can be calculated from a
@@ -26,13 +24,9 @@ public BdewLoadProfileTimeSeries(
       UUID uuid,
       BdewStandardLoadProfile loadProfile,
       Set<LoadProfileEntry<BdewLoadValues>> values,
-      Optional<ComparableQuantity<Power>> maxPower) {
-    super(
-        uuid,
-        loadProfile,
-        values,
-        maxPower,
-        Optional.of(Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR)));
+      ComparableQuantity<Power> maxPower,
+      ComparableQuantity<Energy> profileEnergyScaling) {
+    super(uuid, loadProfile, values, maxPower, profileEnergyScaling);
   }
 
   @Override

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/BdewLoadProfileFactoryTest.groovy

@@ -148,16 +148,14 @@ class BdewLoadProfileFactoryTest extends Specification {
     def maxPower = factory.calculateMaxPower(BdewStandardLoadProfile.G0, allEntries)
 
     then:
-    maxPower.isPresent()
-    maxPower.get() == Quantities.getQuantity(77.7, PowerSystemUnits.WATT)
+    maxPower == Quantities.getQuantity(77.7, PowerSystemUnits.WATT)
   }
 
   def "A BDEWLoadProfileFactory does return an energy scaling correctly"() {
     when:
     def energyScaling = factory.getLoadProfileEnergyScaling(BdewStandardLoadProfile.G0)
 
     then:
-    energyScaling.isPresent()
-    energyScaling.get() == Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR)
+    energyScaling == Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR)
   }
 }

src/test/groovy/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessorTest.groovy

@@ -213,7 +213,7 @@ class TimeSeriesProcessorTest extends Specification implements TimeSeriesTestDat
 
   def "A TimeSeriesProcessors handles a complete LoadProfileTimeSeries correctly"() {
     given:
-    TimeSeriesProcessor<BdewLoadProfileTimeSeries, LoadProfileEntry, BdewLoadValues> processor = new TimeSeriesProcessor<>(BdewLoadProfileTimeSeries, LoadProfileEntry, BdewLoadValues)
+    TimeSeriesProcessor<BdewLoadProfileTimeSeries, LoadProfileEntry, BdewLoadValues, PValue> processor = new TimeSeriesProcessor<>(BdewLoadProfileTimeSeries, LoadProfileEntry, BdewLoadValues)
 
     when:
     Set<Map<String, String>> actual = processor.handleTimeSeries(loadProfileTimeSeries)

src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy

@@ -414,7 +414,8 @@ trait TimeSeriesTestData {
     new BdewLoadValues(53.5, 44.3, 46.0, 62.8, 56.9, 54.4, 69.2, 63.6, 58.4), 2
     ),
   ] as Set,
-  Optional.empty()
+  Quantities.getQuantity(80.6, WATT),
+  Quantities.getQuantity(1000d, KILOWATTHOUR)
   )
 
   Set<LinkedHashMap<String, String>> loadProfileTimeSeriesProcessed = [