Merge pull request #1044 from ie3-institute/df/#1042-Fix-implausible-…

…test-cases-of-HpModelSpec Fix implausible test cases of HpModelSpec
ie3-institute · Nov 22, 2024 · e097e44 · e097e44
2 parents 8c44761 + 6c43715
commit e097e44
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactoring to use zeroKW and zeroKWH in thermal grid unit tests [#1023](https://github.com/ie3-institute/simona/issues/1023)
 - Refactor `ResultFileHierarchy` [#1031](https://github.com/ie3-institute/simona/issues/1031)
 - Removing logs in `logs/simona` [#1017](https://github.com/ie3-institute/simona/issues/1017)
+- Fix implausible test cases of HpModelSpec [#1042](https://github.com/ie3-institute/simona/issues/1042)
 
 ### Fixed
 - Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)

diff --git a/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala b/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
@@ -55,7 +55,7 @@ class HpModelSpec
             true,
             95,
             15.6,
-            Some(HouseTemperatureUpperBoundaryReached(31711L)),
+            Some(HouseTemperatureUpperBoundaryReached(31711)),
           ),
           (
             HpState(
@@ -70,7 +70,7 @@ class HpModelSpec
             true,
             95,
             16.4,
-            Some(HouseTemperatureUpperBoundaryReached(30642L)),
+            Some(HouseTemperatureUpperBoundaryReached(30642)),
           ),
           (
             HpState(
@@ -85,7 +85,7 @@ class HpModelSpec
             true,
             95,
             18.0,
-            Some(HouseTemperatureUpperBoundaryReached(27771L)),
+            Some(HouseTemperatureUpperBoundaryReached(27771)),
           ),
           (
             HpState(
@@ -100,7 +100,7 @@ class HpModelSpec
             false,
             0,
             19.6,
-            Some(HouseTemperatureLowerBoundaryReached(13200L)),
+            Some(HouseTemperatureLowerBoundaryReached(13200)),
           ),
           (
             HpState(
@@ -115,7 +115,7 @@ class HpModelSpec
             false,
             0,
             20.4,
-            Some(HouseTemperatureLowerBoundaryReached(15508L)),
+            Some(HouseTemperatureLowerBoundaryReached(15508)),
           ),
           (
             HpState(
@@ -124,13 +124,13 @@ class HpModelSpec
               Some(hpData.ambientTemperature),
               Kilowatts(95d),
               Kilowatts(80d),
-              thermalState(Celsius(17)),
+              thermalState(Celsius(17), Kilowatts(80d)),
               None,
             ),
-            true,
-            95,
-            15.6,
-            Some(HouseTemperatureUpperBoundaryReached(31711L)),
+            false,
+            0,
+            31.6,
+            Some(HouseTemperatureLowerBoundaryReached(29867)),
           ),
           (
             HpState(
@@ -139,13 +139,13 @@ class HpModelSpec
               Some(hpData.ambientTemperature),
               Kilowatts(95d),
               Kilowatts(80d),
-              thermalState(Celsius(18)),
+              thermalState(Celsius(18), Kilowatts(80d)),
               None,
             ),
-            true,
-            95,
-            16.4,
-            Some(HouseTemperatureUpperBoundaryReached(30642L)),
+            false,
+            0,
+            32.4,
+            Some(HouseTemperatureLowerBoundaryReached(30343)),
           ),
           (
             HpState(
@@ -154,13 +154,13 @@ class HpModelSpec
               Some(hpData.ambientTemperature),
               Kilowatts(95d),
               Kilowatts(80d),
-              thermalState(Celsius(20)),
+              thermalState(Celsius(20), Kilowatts(80d)),
               None,
             ),
-            true,
-            95,
-            18.0,
-            Some(HouseTemperatureUpperBoundaryReached(27771L)),
+            false,
+            0,
+            34.0,
+            Some(HouseTemperatureLowerBoundaryReached(31200)),
           ),
           (
             HpState(
@@ -169,13 +169,13 @@ class HpModelSpec
               Some(hpData.ambientTemperature),
               Kilowatts(95d),
               Kilowatts(80d),
-              thermalState(Celsius(22)),
+              thermalState(Celsius(22), Kilowatts(80d)),
               None,
             ),
-            true,
-            95,
-            19.6,
-            Some(HouseTemperatureUpperBoundaryReached(23200L)),
+            false,
+            0,
+            35.6,
+            Some(HouseTemperatureLowerBoundaryReached(31950)),
           ),
           (
             HpState(
@@ -184,13 +184,13 @@ class HpModelSpec
               Some(hpData.ambientTemperature),
               Kilowatts(95d),
               Kilowatts(80d),
-              thermalState(Celsius(25)),
+              thermalState(Celsius(25), Kilowatts(80d)),
               None,
             ),
             false,
             0,
-            22.0,
-            Some(HouseTemperatureLowerBoundaryReached(19200L)),
+            38.0,
+            Some(HouseTemperatureLowerBoundaryReached(32914)),
           ),
         )