further changes for domestic hot water storage

Author: danielfeismann

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

@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -124,8 +125,14 @@ public Map<UUID, ThermalBusInput> getThermalBuses(Map<UUID, OperatorInput> opera
    * @return a map of UUID to object- and uuid-unique {@link ThermalStorageInput} entities
    */
   public Map<UUID, ThermalStorageInput> getThermalStorages() throws SourceException {
-    return getCylindricalStorages().stream().collect(toMap());
-    // FIXME
+    return Stream.concat(
+                    getCylindricalStorages().stream(),
+                    getDomesticHotWaterStorages().stream()
+            )
+            .collect(Collectors.toMap(
+                    ThermalStorageInput::getUuid,
+                    storage -> storage
+            ));
   }
 
   /**
@@ -150,7 +157,14 @@ public Map<UUID, ThermalStorageInput> getThermalStorages() throws SourceExceptio
   public Map<UUID, ThermalStorageInput> getThermalStorages(
       Map<UUID, OperatorInput> operators, Map<UUID, ThermalBusInput> thermalBuses)
       throws SourceException {
-    return getCylindricalStorages(operators, thermalBuses).stream().collect(toMap());
+    return Stream.concat(
+                    getCylindricalStorages(operators, thermalBuses).stream(),
+                    getDomesticHotWaterStorages(operators, thermalBuses).stream()
+            )
+            .collect(Collectors.toMap(
+                    ThermalStorageInput::getUuid,
+                    storage -> storage
+            ));
   }
 
   /**

src/main/java/edu/ie3/datamodel/models/input/thermal/DomesticHotWaterStorageInput.java

@@ -32,7 +32,7 @@ public class DomesticHotWaterStorageInput extends ThermalStorageInput {
   private final ComparableQuantity<Power> pThermalMax;
 
   /**
-   * @param uuid Unique identifier of a cylindrical storage
+   * @param uuid Unique identifier of a domestic hot water storage
    * @param id Identifier of the thermal unit
    * @param operator operator of the asset
    * @param operationTime operation time of the asset
@@ -66,7 +66,7 @@ public DomesticHotWaterStorageInput(
   }
 
   /**
-   * @param uuid Unique identifier of a cylindrical storage
+   * @param uuid Unique identifier of a domestic hot water storage
    * @param id Identifier of the thermal unit
    * @param bus Thermal bus, a thermal unit is connected to
    * @param storageVolumeLvl Available storage volume