Adapt to changes in dev.

Author: staudtMarius

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

@@ -14,7 +14,6 @@
 import edu.ie3.datamodel.models.value.load.RandomLoadValues;
 import edu.ie3.util.quantities.PowerSystemUnits;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import javax.measure.quantity.Energy;
 import javax.measure.quantity.Power;
@@ -74,7 +73,13 @@ protected List<Set<String>> getFields(Class<?> entityClass) {
   @Override
   public RandomLoadProfileTimeSeries build(
       LoadProfileMetaInformation metaInformation, Set<LoadProfileEntry<RandomLoadValues>> entries) {
-    return new RandomLoadProfileTimeSeries(metaInformation.getUuid(), RANDOM_LOAD_PROFILE, entries);
+    RandomLoadProfile profile = RANDOM_LOAD_PROFILE;
+
+    ComparableQuantity<Power> maxPower = calculateMaxPower(profile, entries);
+    ComparableQuantity<Energy> profileEnergyScaling = getLoadProfileEnergyScaling(profile);
+
+    return new RandomLoadProfileTimeSeries(
+        metaInformation.getUuid(), profile, entries, maxPower, profileEnergyScaling);
   }
 
   @Override
@@ -83,14 +88,13 @@ public RandomLoadProfile parseProfile(String profile) {
   }
 
   @Override
-  public Optional<ComparableQuantity<Power>> calculateMaxPower(
+  public ComparableQuantity<Power> calculateMaxPower(
       RandomLoadProfile loadProfile, Set<LoadProfileEntry<RandomLoadValues>> loadProfileEntries) {
-    return Optional.of(Quantities.getQuantity(159d, PowerSystemUnits.WATT));
+    return Quantities.getQuantity(159d, PowerSystemUnits.WATT);
   }
 
   @Override
-  public Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling(
-      RandomLoadProfile loadProfile) {
-    return Optional.of(Quantities.getQuantity(716.5416966513656, PowerSystemUnits.KILOWATTHOUR));
+  public ComparableQuantity<Energy> getLoadProfileEnergyScaling(RandomLoadProfile loadProfile) {
+    return Quantities.getQuantity(716.5416966513656, PowerSystemUnits.KILOWATTHOUR);
   }
 }

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

@@ -9,12 +9,14 @@
 import edu.ie3.datamodel.models.value.PValue;
 import edu.ie3.datamodel.models.value.load.LoadValues;
 import edu.ie3.datamodel.utils.TimeSeriesUtils;
+import edu.ie3.util.quantities.PowerSystemUnits;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.measure.quantity.Energy;
 import javax.measure.quantity.Power;
 import tech.units.indriya.ComparableQuantity;
+import tech.units.indriya.quantity.Quantities;
 
 /**
  * Describes a load profile time series with repetitive values that can be calculated from a pattern
@@ -25,8 +27,8 @@ public class LoadProfileTimeSeries<V extends LoadValues>
   private final Map<Integer, V> valueMapping;
 
   /**
-   * The maximum average power consumption per quarter-hour for a given calculated over all seasons
-   * and weekday types of given load profile.
+   * The maximum average power consumption per quarter-hour calculated over all seasons and weekday
+   * types of given load profile.
    */
   public final ComparableQuantity<Power> maxPower;
 
@@ -46,8 +48,13 @@ public LoadProfileTimeSeries(
             .collect(
                 Collectors.toMap(LoadProfileEntry::getQuarterHour, LoadProfileEntry::getValue));
 
-    this.maxPower = maxPower;
-    this.profileEnergyScaling = profileEnergyScaling;
+    // use default value is null value is given
+    this.maxPower =
+        Optional.ofNullable(maxPower)
+            .orElseGet(() -> Quantities.getQuantity(0d, PowerSystemUnits.KILOWATT));
+    this.profileEnergyScaling =
+        Optional.ofNullable(profileEnergyScaling)
+            .orElseGet(() -> Quantities.getQuantity(1000d, PowerSystemUnits.KILOWATTHOUR));
   }
 
   /** Returns the {@link LoadProfile}. */

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

@@ -8,12 +8,12 @@
 import de.lmu.ifi.dbs.elki.math.statistics.distribution.GeneralizedExtremeValueDistribution;
 import edu.ie3.datamodel.models.profile.LoadProfile;
 import edu.ie3.datamodel.models.value.load.RandomLoadValues;
-import edu.ie3.util.quantities.PowerSystemUnits;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import tech.units.indriya.quantity.Quantities;
+import javax.measure.quantity.Energy;
+import javax.measure.quantity.Power;
+import tech.units.indriya.ComparableQuantity;
 
 /**
  * Describes a random load profile time series based on a {@link
@@ -22,13 +22,12 @@
 public class RandomLoadProfileTimeSeries extends LoadProfileTimeSeries<RandomLoadValues> {
 
   public RandomLoadProfileTimeSeries(
-      UUID uuid, LoadProfile loadProfile, Set<LoadProfileEntry<RandomLoadValues>> entries) {
-    super(
-        uuid,
-        loadProfile,
-        entries,
-        Optional.empty(),
-        Optional.of(Quantities.getQuantity(716.5416966513656, PowerSystemUnits.KILOWATTHOUR)));
+      UUID uuid,
+      LoadProfile loadProfile,
+      Set<LoadProfileEntry<RandomLoadValues>> entries,
+      ComparableQuantity<Power> maxPower,
+      ComparableQuantity<Energy> profileEnergyScaling) {
+    super(uuid, loadProfile, entries, maxPower, profileEnergyScaling);
   }
 
   @Override

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

@@ -148,16 +148,14 @@ class RandomLoadProfileFactoryTest extends Specification {
     def maxPower = factory.calculateMaxPower(LoadProfile.RandomLoadProfile.RANDOM_LOAD_PROFILE, allEntries)
 
     then:
-    maxPower.isPresent()
-    maxPower.get() == Quantities.getQuantity(159d, PowerSystemUnits.WATT)
+    maxPower == Quantities.getQuantity(159d, PowerSystemUnits.WATT)
   }
 
   def "A RandomLoadProfileFactory does return an energy scaling correctly"() {
     when:
     def energyScaling = factory.getLoadProfileEnergyScaling(LoadProfile.RandomLoadProfile.RANDOM_LOAD_PROFILE)
 
     then:
-    energyScaling.isPresent()
-    energyScaling.get() == Quantities.getQuantity(716.5416966513656, PowerSystemUnits.KILOWATTHOUR)
+    energyScaling == Quantities.getQuantity(716.5416966513656, PowerSystemUnits.KILOWATTHOUR)
   }
 }