Merge branch 'refs/heads/dev' into df/#856-tap-water

# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
ie3-institute · Aug 29, 2024 · a329610 · a329610
2 parents 18ff9b2 + 67ad290
commit a329610
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -105,6 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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)
 - Fixed Hp results leading to overheating house and other effects [#827](https://github.com/ie3-institute/simona/issues/827)
 - Fixed thermal storage getting recharged when empty [#827](https://github.com/ie3-institute/simona/issues/827)
 

diff --git a/src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
@@ -272,7 +272,7 @@ trait HpAgentFundamentals
           baseStateData.copy(
             stateDataStore = updatedStateDataStore,
             additionalActivationTicks =
-              baseStateData.additionalActivationTicks + nextThreshold.tick,
+              baseStateData.additionalActivationTicks ++ Set(nextThreshold.tick),
           )
         case _ =>
           baseStateData.copy(