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

# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
ie3-institute · Nov 1, 2024 · de52f6e · de52f6e
2 parents f522c82 + f51a719
commit de52f6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -126,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix scheduling at Evcs with more than one Ev at a time without Em [#787](https://github.com/ie3-institute/simona/issues/787)
 - Fix CheckWindow duration [#921](https://github.com/ie3-institute/simona/issues/921)
 - Fixed ThermalStorageResults having multiple entries [#924](https://github.com/ie3-institute/simona/issues/924)
+- Fix filter for thermal result checking for lastTick not for currentTick [#1008](https://github.com/ie3-institute/simona/issues/1008)
 - 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/model/participant/HpModel.scala b/src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
@@ -478,7 +478,7 @@ object HpModel {
     * temperature.
     *
     * @param isRunning
-    *   indicates if CHP is turned on
+    *   indicates if HP is turned on
     * @param tick
     *   the time tick of the HpState
     * @param ambientTemperature