Adapting LoadProfileSources.

Author: staudtMarius

src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java

@@ -83,10 +83,10 @@ protected Try<LoadProfileEntry<V>, FactoryException> createEntries(
   public abstract P getLoadProfile();
 
   /** Returns the maximal power value of the time series */
-  public abstract ComparableQuantity<Power> getMaxPower();
+  public abstract Optional<ComparableQuantity<Power>> getMaxPower();
 
   /** Returns the load profile energy scaling for this load profile time series. */
-  public abstract ComparableQuantity<Energy> getLoadProfileEnergyScaling();
+  public abstract Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling();
 
   /**
    * Method to read in the build-in {@link BdewStandardLoadProfile}s.

src/main/java/edu/ie3/datamodel/io/source/csv/CsvLoadProfileSource.java

@@ -83,13 +83,13 @@ public P getLoadProfile() {
   }
 
   @Override
-  public ComparableQuantity<Power> getMaxPower() {
-    return loadProfileTimeSeries.maxPower;
+  public Optional<ComparableQuantity<Power>> getMaxPower() {
+    return loadProfileTimeSeries.maxPower();
   }
 
   @Override
-  public ComparableQuantity<Energy> getLoadProfileEnergyScaling() {
-    return loadProfileTimeSeries.profileEnergyScaling;
+  public Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling() {
+    return loadProfileTimeSeries.loadProfileScaling();
   }
 
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-

src/main/java/edu/ie3/datamodel/io/source/sql/SqlLoadProfileSource.java

@@ -126,13 +126,14 @@ public P getLoadProfile() {
   }
 
   @Override
-  public ComparableQuantity<Power> getMaxPower() {
-    return entryFactory.calculateMaxPower(loadProfile, getEntries(queryFull, ps -> {}));
+  public Optional<ComparableQuantity<Power>> getMaxPower() {
+    return Optional.ofNullable(
+        entryFactory.calculateMaxPower(loadProfile, getEntries(queryFull, ps -> {})));
   }
 
   @Override
-  public ComparableQuantity<Energy> getLoadProfileEnergyScaling() {
-    return entryFactory.getLoadProfileEnergyScaling(loadProfile);
+  public Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling() {
+    return Optional.ofNullable(entryFactory.getLoadProfileEnergyScaling(loadProfile));
   }
 
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-