Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT

# Conflicts: # src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
ie3-institute · Nov 22, 2024 · 752f755 · 752f755
2 parents a0e95af + a07b626
commit 752f755
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala b/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
@@ -192,7 +192,9 @@ final case class HpModel(
 
     val turnHpOn =
       (demandHouse.hasRequiredDemand && noThermalStorageOrThermalStorageIsEmpty) ||
-    demandThermalStorage.hasRequiredDemand || (demandThermalStorage.hasAdditionalDemand && lastState.isRunning)
+    (demandHouse.hasAdditionalDemand && lastState.isRunning) ||
+        demandThermalStorage.hasRequiredDemand ||
+        (demandThermalStorage.hasAdditionalDemand && lastState.isRunning)
 
     val canOperate =
       demandHouse.hasRequiredDemand || demandHouse.hasAdditionalDemand ||