Revert "adapt condition for hasAdditionalDemand"

This reverts commit 441dfdb.
ie3-institute · Aug 21, 2024 · b07c1f8 · b07c1f8
1 parent 441dfdb
commit b07c1f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala b/src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
@@ -666,7 +666,7 @@ object ThermalGrid {
 
     def hasRequiredDemand: Boolean = required > zeroMWH
 
-    def hasAdditionalDemand: Boolean = possible > zeroMWH
+    def hasAdditionalDemand: Boolean = possible > required
   }
   object ThermalEnergyDemand {
 

diff --git a/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridSpec.scala b/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridSpec.scala
@@ -51,15 +51,6 @@ class ThermalGridSpec extends UnitSpec {
     }
 
     "checking for required and additional demand" should {
-      "return proper information, if no required and no additional demand is apparent" in {
-        val required = MegawattHours(0d)
-        val possible = MegawattHours(0d)
-
-        val energyDemand = ThermalEnergyDemand(required, possible)
-        energyDemand.hasRequiredDemand shouldBe false
-        energyDemand.hasAdditionalDemand shouldBe false
-      }
-
       "return proper information, if no required but additional demand is apparent" in {
         val required = MegawattHours(0d)
         val possible = MegawattHours(45d)
@@ -71,7 +62,7 @@ class ThermalGridSpec extends UnitSpec {
 
       "return proper information, if required but no additional demand is apparent" in {
         val required = MegawattHours(45d)
-        val possible = MegawattHours(0d)
+        val possible = MegawattHours(45d)
 
         val energyDemand = ThermalEnergyDemand(required, possible)
         energyDemand.hasRequiredDemand shouldBe true