Merge branch 'refs/heads/dev' into df/#894-storage-zeroLvl

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -77,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated AUTHORS.md [#904](https://github.com/ie3-institute/simona/issues/904)
 - Updated `Gradle` to version V8.10 [#829](https://github.com/ie3-institute/simona/issues/829)
 - Updated AUTHORS.md [#905](https://github.com/ie3-institute/simona/issues/905)
+- Rewrote BMModelTest from groovy to scala [#646](https://github.com/ie3-institute/simona/issues/646)
 - Prepare ThermalStorageTestData for Storage without storageVolumeLvlMin [#894](https://github.com/ie3-institute/simona/issues/894)
 
 ### Fixed
@@ -102,6 +103,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed FixedFeedModelSpec [#861](https://github.com/ie3-institute/simona/issues/861)
 - Fixing duration calculation in result events [#801](https://github.com/ie3-institute/simona/issues/801)
 - Handle MobSim requests for current prices [#892](https://github.com/ie3-institute/simona/issues/892)
+- Fix determineState of ThermalHouse [#926](https://github.com/ie3-institute/simona/issues/926)
+- Fix activation of Hp when not under control of an EM [#922](https://github.com/ie3-institute/simona/issues/922)
 
 ## [3.0.0] - 2023-08-07
 

build.gradle

@@ -29,7 +29,7 @@ ext {
   pekkoVersion = '1.0.3'
   jtsVersion = '1.19.0'
   confluentKafkaVersion = '7.4.0'
-  tscfgVersion = '1.0.0'
+  tscfgVersion = '1.1.3'
   scapegoatVersion = '3.0.0'
 
   testContainerVersion = '0.41.4'
@@ -103,7 +103,7 @@ dependencies {
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
   testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
-  testImplementation 'org.mockito:mockito-core:5.12.0' // mocking framework
+  testImplementation 'org.mockito:mockito-core:5.13.0' // mocking framework
   testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.19"
   testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output
   testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'

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 ++ Set(nextThreshold.tick),
+          )
+        case _ =>
+          baseStateData.copy(
+            stateDataStore = updatedStateDataStore
+          )
+      }
+    }
+
     updateValueStoresInformListenersAndGoToIdleWithUpdatedBaseStateData(
       scheduler,
       updatedBaseStateData,

src/main/scala/edu/ie3/simona/model/participant/BMModel.scala

@@ -52,7 +52,7 @@ final case class BMModel(
 
   /** Saves power output of last cycle. Needed for load gradient
     */
-  private var _lastPower: Option[Power] = None
+  var _lastPower: Option[Power] = None
 
   override def calculatePower(
       tick: Long,
@@ -73,7 +73,7 @@ final case class BMModel(
     * @return
     *   Active power
     */
-  override protected def calculateActivePower(
+  override def calculateActivePower(
       modelState: ConstantState.type,
       data: BMCalcRelevantData,
   ): Power = {
@@ -100,7 +100,7 @@ final case class BMModel(
     * @return
     *   factor k1
     */
-  private def calculateK1(time: ZonedDateTime): Double = {
+  def calculateK1(time: ZonedDateTime): Double = {
     val weekendCorr = Vector(0.98, 0.985, 0.982, 0.982, 0.97, 0.96, 0.95, 0.93,
       0.925, 0.95, 0.98, 1.01, 1.018, 1.01, 1.01, 0.995, 1, 0.995, 0.99, 0.985,
       0.99, 0.98, 0.975, 0.99)
@@ -120,7 +120,7 @@ final case class BMModel(
     * @return
     *   factor k2
     */
-  private def calculateK2(time: ZonedDateTime): Double = {
+  def calculateK2(time: ZonedDateTime): Double = {
     time.getDayOfYear match {
       case x if x < 150 || x > 243 =>
         1.03 // correction factor in heating season
@@ -138,7 +138,7 @@ final case class BMModel(
     * @return
     *   heat demand in Megawatt
     */
-  private def calculatePTh(
+  def calculatePTh(
       temp: Temperature,
       k1: Double,
       k2: Double,
@@ -158,7 +158,7 @@ final case class BMModel(
     * @return
     *   usage
     */
-  private def calculateUsage(pTh: Power): Double = {
+  def calculateUsage(pTh: Power): Double = {
     // if demand exceeds capacity -> activate peak load boiler (no effect on electrical output)
     val maxHeat = Megawatts(43.14)
     val usageUnchecked = pTh / maxHeat
@@ -173,7 +173,7 @@ final case class BMModel(
     * @return
     *   efficiency
     */
-  private def calculateEff(usage: Double): Double =
+  def calculateEff(usage: Double): Double =
     min(0.18 * pow(usage, 3) - 0.595 * pow(usage, 2) + 0.692 * usage + 0.724, 1)
 
   /** Calculates electrical output from usage and efficiency
@@ -184,7 +184,7 @@ final case class BMModel(
     * @return
     *   electrical output as Power
     */
-  private def calculateElOutput(
+  def calculateElOutput(
       usage: Double,
       eff: Double,
   ): Power = {
@@ -206,7 +206,7 @@ final case class BMModel(
     * @return
     *   electrical output after load gradient has been applied
     */
-  private def applyLoadGradient(
+  def applyLoadGradient(
       pEl: Power
   ): Power = {
     _lastPower match {

src/main/scala/edu/ie3/simona/model/participant/HpModel.scala

@@ -185,6 +185,7 @@ final case class HpModel(
         relevantData.currentTick,
         state.thermalGridState,
         state.ambientTemperature.getOrElse(relevantData.ambientTemperature),
+        relevantData.ambientTemperature,
         newThermalPower,
       )
 

src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala

@@ -105,8 +105,10 @@ final case class ThermalGrid(
     *   Instance in time
     * @param state
     *   Currently applicable state
+    * @param lastAmbientTemperature
+    *   Ambient temperature valid up until (not including) the current tick
     * @param ambientTemperature
-    *   Ambient temperature
+    *   Current ambient temperature
     * @param qDot
     *   Thermal energy balance
     * @return
@@ -115,19 +117,28 @@ final case class ThermalGrid(
   def updateState(
       tick: Long,
       state: ThermalGridState,
+      lastAmbientTemperature: Temperature,
       ambientTemperature: Temperature,
       qDot: Power,
   ): (ThermalGridState, Option[ThermalThreshold]) = if (qDot > zeroKW)
-    handleInfeed(tick, ambientTemperature, state, qDot)
+    handleInfeed(tick, lastAmbientTemperature, ambientTemperature, state, qDot)
   else
-    handleConsumption(tick, ambientTemperature, state, qDot)
+    handleConsumption(
+      tick,
+      lastAmbientTemperature,
+      ambientTemperature,
+      state,
+      qDot,
+    )
 
   /** Handles the case, when a grid has infeed. First, heat up all the houses to
     * their maximum temperature, then fill up the storages
     * @param tick
     *   Current tick
+    * @param lastAmbientTemperature
+    *   Ambient temperature valid up until (not including) the current tick
     * @param ambientTemperature
-    *   Ambient temperature
+    *   Current ambient temperature
     * @param state
     *   Current state of the houses
     * @param qDot
@@ -137,6 +148,7 @@ final case class ThermalGrid(
     */
   private def handleInfeed(
       tick: Long,
+      lastAmbientTemperature: Temperature,
       ambientTemperature: Temperature,
       state: ThermalGridState,
       qDot: Power,
@@ -163,6 +175,7 @@ final case class ThermalGrid(
           thermalHouse.determineState(
             tick,
             lastHouseState,
+            lastAmbientTemperature,
             ambientTemperature,
             qDot,
           )
@@ -177,6 +190,7 @@ final case class ThermalGrid(
             thermalHouse.determineState(
               tick,
               lastHouseState,
+              lastAmbientTemperature,
               ambientTemperature,
               zeroKW,
             )
@@ -248,8 +262,10 @@ final case class ThermalGrid(
     *
     * @param tick
     *   Current tick
+    * @param lastAmbientTemperature
+    *   Ambient temperature valid up until (not including) the current tick
     * @param ambientTemperature
-    *   Ambient temperature
+    *   Current ambient temperature
     * @param state
     *   Current state of the houses
     * @param qDot
@@ -259,6 +275,7 @@ final case class ThermalGrid(
     */
   private def handleConsumption(
       tick: Long,
+      lastAmbientTemperature: Temperature,
       ambientTemperature: Temperature,
       state: ThermalGridState,
       qDot: Power,
@@ -269,6 +286,7 @@ final case class ThermalGrid(
         house.determineState(
           tick,
           houseState,
+          lastAmbientTemperature,
           ambientTemperature,
           zeroMW,
         )
@@ -287,6 +305,7 @@ final case class ThermalGrid(
         maybeUpdatedStorageState,
         state.houseState,
         state.storageState,
+        lastAmbientTemperature,
         ambientTemperature,
         qDot,
       )
@@ -319,8 +338,10 @@ final case class ThermalGrid(
     *   Previous thermal house state before a first update was performed
     * @param formerStorageState
     *   Previous thermal storage state before a first update was performed
+    * @param lastAmbientTemperature
+    *   Ambient temperature valid up until (not including) the current tick
     * @param ambientTemperature
-    *   Ambient temperature
+    *   Current ambient temperature
     * @param qDot
     *   Thermal influx
     * @return
@@ -334,6 +355,7 @@ final case class ThermalGrid(
       ],
       formerHouseState: Option[ThermalHouseState],
       formerStorageState: Option[ThermalStorageState],
+      lastAmbientTemperature: Temperature,
       ambientTemperature: Temperature,
       qDot: Power,
   ): (
@@ -367,6 +389,7 @@ final case class ThermalGrid(
             "Impossible to find no house state"
           )
         ),
+        lastAmbientTemperature,
         ambientTemperature,
         thermalStorage.getChargingPower,
       )

src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala

@@ -298,19 +298,22 @@ final case class ThermalHouse(
   /** Update the current state of the house
     *
     * @param tick
-    *   current instance in time
+    *   Current instance in time
     * @param state
-    *   currently applicable state
+    *   Currently applicable state
+    * @param lastAmbientTemperature
+    *   Ambient temperature valid up until (not including) the current tick
     * @param ambientTemperature
-    *   Ambient temperature
+    *   Current ambient temperature
     * @param qDot
-    *   new thermal influx
+    *   New thermal influx
     * @return
     *   Updated state and the tick in which the next threshold is reached
     */
   def determineState(
       tick: Long,
       state: ThermalHouseState,
+      lastAmbientTemperature: Temperature,
       ambientTemperature: Temperature,
       qDot: Power,
   ): (ThermalHouseState, Option[ThermalThreshold]) = {
@@ -319,7 +322,7 @@ final case class ThermalHouse(
       state.qDot,
       duration,
       state.innerTemperature,
-      ambientTemperature,
+      lastAmbientTemperature,
     )
 
     /* Calculate the next given threshold */