Fix hp results leading to overheating house and other effects

CHANGELOG.md

@@ -82,6 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Finally fixing `RuntimeEventListenerSpec` [#849](https://github.com/ie3-institute/simona/issues/849)
 - Fixed result output for thermal houses and cylindrical storages [#844](https://github.com/ie3-institute/simona/issues/844)
 - Fixed FixedFeedModelSpec [#861](https://github.com/ie3-institute/simona/issues/861)
+- Fixed Hp results leading to overheating house and other effects [#827](https://github.com/ie3-institute/simona/issues/827)
 
 ## [3.0.0] - 2023-08-07
 

src/main/scala/edu/ie3/simona/agent/ValueStore.scala

@@ -22,7 +22,7 @@ import scala.collection.SortedMap
   */
 final case class ValueStore[+D](
     maxTickSpan: Long,
-    private val store: SortedMap[Long, D] = SortedMap.empty[Long, D],
+    store: SortedMap[Long, D] = SortedMap.empty[Long, D],
 ) {
 
   /** Determine the lastly known data tick, if available. Includes the given

src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala

@@ -261,8 +261,26 @@ trait HpAgentFundamentals
       currentTick,
       updatedState,
     )
-    val updatedBaseStateData =
-      baseStateData.copy(stateDataStore = updatedStateDataStore)
+
+    val updatedBaseStateData = {
+      updatedState.maybeThermalThreshold match {
+        case Some(nextThreshold)
+            if baseStateData.foreseenDataTicks.headOption.exists {
+              case (_, Some(tick)) => nextThreshold.tick < tick
+              case _               => false
+            } =>
+          baseStateData.copy(
+            stateDataStore = updatedStateDataStore,
+            additionalActivationTicks =
+              baseStateData.additionalActivationTicks + nextThreshold.tick,
+          )
+        case _ =>
+          baseStateData.copy(
+            stateDataStore = updatedStateDataStore
+          )
+      }
+    }
+
     updateValueStoresInformListenersAndGoToIdleWithUpdatedBaseStateData(
       scheduler,
       updatedBaseStateData,
@@ -385,25 +403,44 @@ trait HpAgentFundamentals
       tick: Long,
   ): HpRelevantData = {
     /* extract weather data from secondary data, which should have been requested and received before */
-    val weatherData =
-      baseStateData.receivedSecondaryDataStore
+    val weatherData = {
+      val currentWeatherData = baseStateData.receivedSecondaryDataStore
         .last(tick)
         .flatMap { case (receivedTick, receivedValues) =>
-          if (receivedTick != tick)
-            log.debug(
-              s"The model ${baseStateData.model.getUuid} needs to do calculations with values received " +
-                s"in tick $receivedTick, as no weather data has been received in tick $tick."
-            )
-          receivedValues.collectFirst {
-            // filter secondary data for weather data
-            case (_, data: WeatherData) => data
+          if (receivedTick == tick) {
+            receivedValues.collectFirst { case (_, data: WeatherData) =>
+              data
+            }
+          } else None
+        }
+
+      // If current weather data is not found, fallback to the latest entry where the map is not empty
+      currentWeatherData
+        .orElse {
+          val latestEntry =
+            baseStateData.receivedSecondaryDataStore.store.toSeq.findLast {
+              case (_, receivedValues) => receivedValues.nonEmpty
+            }
+
+          latestEntry.flatMap { case (receivedTick, receivedValues) =>
+            if (tick - receivedTick > 3600) {
+              log.warning(
+                s"The model ${baseStateData.model.getUuid} is using weather data from tick $receivedTick, " +
+                  s"but there is a discrepancy of ${tick - receivedTick} seconds compared to the current tick $tick."
+              )
+            }
+
+            receivedValues.collectFirst { case (_, data: WeatherData) =>
+              data
+            }
           }
         }
-        .getOrElse(
+        .getOrElse {
           throw new InconsistentStateException(
             s"The model ${baseStateData.model} was not provided with needed weather data."
           )
-        )
+        }
+    }
 
     HpRelevantData(
       tick,