Merge branch 'dev' into df/#930-refactor-handleInfeed

# Conflicts: # src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala # src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
ie3-institute · Dec 11, 2024 · 8ad45f3 · 8ad45f3
2 parents cae9db3 + a7271a7
commit 8ad45f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -110,6 +110,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactoring to only use 'lastHpState' and 'relevantData' for 'ThermalGrid' calculations [#916](https://github.com/ie3-institute/simona/issues/916)
 - Refactor thermal calcRelevantData [#1051](https://github.com/ie3-institute/simona/issues/1051)
 - Removed Deployment stage from Jenkinsfile [#1063](https://github.com/ie3-institute/simona/issues/1063)
+- Prepare 'ChpModelSpec' and 'CylindricalThermalStorageSpec' for Storage without storageVolumeLvlMin [#1012](https://github.com/ie3-institute/simona/issues/1012)
 
 ### Fixed
 - Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)

diff --git a/src/main/scala/edu/ie3/simona/model/thermal/MutableStorage.scala b/src/main/scala/edu/ie3/simona/model/thermal/MutableStorage.scala
@@ -53,6 +53,7 @@ trait MutableStorage {
     * @return
     *   lack
     */
+  @deprecated("Use thermal storage state instead")
   def tryToTakeAndReturnLack(
       takenEnergy: Energy
   ): Option[Energy]

diff --git a/src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala b/src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala
@@ -264,7 +264,7 @@ class ChpModelSpec
           92,
           1,
           1150,
-        ), // test case (true, true, true) and storage volume exceeds maximum
+        ), // test case (true, true, true) CHP running, storage at lvl 92 (1058 kWh) + 100 kWh from CHP exceeds max capacity (1150 kWh).
       )
 
       forAll(testCases) {

diff --git a/src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala b/src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
@@ -110,7 +110,7 @@ class CylindricalThermalStorageSpec
       val storage = buildThermalStorage(storageInput, CubicMeters(70))
 
       val usableThermalEnergy = storage.usableThermalEnergy
-      usableThermalEnergy should approximate(KilowattHours(5 * 115 + 230))
+      usableThermalEnergy should approximate(KilowattHours(805))
     }
 
     "Apply, validation, and build method work correctly" in {
@@ -232,7 +232,7 @@ class CylindricalThermalStorageSpec
           "expectedStoredEnergy",
         ),
         (0L, 250.0, 10.0, 3600L, 0.0, 260.0),
-        (0L, 250.0, -10.0, 3600L, 0.0, 240.0),
+        (0L, 20.0, -10.0, 3600L, 0.0, 10.0),
       )
 
       forAll(cases) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,7 +264,7 @@ class ChpModelSpec @@
 ,
 ,
 ,
-            ), // test case (true, true, true) and storage volume exceeds maximum
+            ), // test case (true, true, true) CHP running, storage at lvl 92 (1058 kWh) + 100 kWh from CHP exceeds max capacity (1150 kWh).
           )
           forAll(testCases) {
@@ Expand Down @@