Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chpmodelspec and cylindricalthermalstoragespec without storagevolumelvlmin #1046

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
+75 −63
Open

chpmodelspec and cylindricalthermalstoragespec without storagevolumelvlmin #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ceaefb2
Set StorageMinLvl zero
pierrepetersmeier Nov 5, 2024
cd258ef
CylindricalThermalStorageSpec Storage without storageVolumeLvlMin
pierrepetersmeier Nov 21, 2024
d1d2a63
set deprecated correctly
pierrepetersmeier Nov 22, 2024
9339ffc
Merge branch 'dev' into pp/#1012-chpmodelspec-and-cylindricalthermals…
pierrepetersmeier Nov 22, 2024
fbf8c4b
Merge branch 'dev' into pp/#1012-chpmodelspec-and-cylindricalthermals…
pierrepetersmeier Nov 22, 2024
75b1ac7
Merge branch 'dev' into pp/#1012-chpmodelspec-and-cylindricalthermals…
pierrepetersmeier Nov 27, 2024
f8adf3a
Try to fix ChpModelSpec and CylindricalThermalStorageSpec Part One
pierrepetersmeier Nov 27, 2024
40a3c93
change to table driven test
danielfeismann Nov 28, 2024
bd287d8
fix ChpModelSpec
danielfeismann Nov 28, 2024
19e32ef
proposal for CylindricalThermalStorageSpec to keep the thresholds fro…
danielfeismann Nov 28, 2024
e3aae40
fmt
danielfeismann Nov 28, 2024
bfcd012
Merge branch 'dev' into pp/#1012-chpmodelspec-and-cylindricalthermals…
danielfeismann Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/scala/edu/ie3/simona/model/thermal/MutableStorage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ trait MutableStorage {
* @return
* lack
*/
@deprecated("Use thermal storage state instead")
def tryToTakeAndReturnLack(
takenEnergy: Energy
): Option[Energy]
Expand Down
117 changes: 64 additions & 53 deletions src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ChpModelSpec
val chpStateNotRunning: ChpState =
ChpState(isRunning = false, 0, Kilowatts(0), KilowattHours(0))
val chpStateRunning: ChpState =
ChpState(isRunning = true, 0, Kilowatts(0), KilowattHours(0))
ChpState(isRunning = true, 0, Kilowatts(42), KilowattHours(42))

val (storageInput, chpInput) = setupSpec()

Expand All @@ -62,7 +62,7 @@ class ChpModelSpec
"ThermalStorage",
thermalBus,
getQuantity(100, StandardUnits.VOLUME),
getQuantity(20, StandardUnits.VOLUME),
getQuantity(0, StandardUnits.VOLUME),
getQuantity(30, StandardUnits.TEMPERATURE),
getQuantity(40, StandardUnits.TEMPERATURE),
getQuantity(1.15, StandardUnits.SPECIFIC_HEAT_CAPACITY),
Expand Down Expand Up @@ -145,26 +145,26 @@ class ChpModelSpec
"Check active power after calculating next state with #chpState and heat demand #heatDemand kWh:" in {
val testCases = Table(
("chpState", "storageLvl", "heatDemand", "expectedActivePower"),
(chpStateNotRunning, 90, 0, 0), // tests case (false, false, true)
(chpStateNotRunning, 70, 0, 0), // tests case (false, false, true)
(
chpStateNotRunning,
90,
70,
8 * 115,
95,
), // tests case (false, true, false)
(chpStateNotRunning, 90, 10, 0), // tests case (false, true, true)
(chpStateRunning, 90, 0, 95), // tests case (true, false, true)
(chpStateRunning, 90, 8 * 115, 95), // tests case (true, true, false)
(chpStateRunning, 90, 10, 95), // tests case (true, true, true)
(chpStateNotRunning, 70, 10, 0), // tests case (false, true, true)
(chpStateRunning, 70, 0, 95), // tests case (true, false, true)
(chpStateRunning, 70, 8 * 115, 95), // tests case (true, true, false)
(chpStateRunning, 70, 10, 95), // tests case (true, true, true)
(
chpStateRunning,
90,
70,
7 * 115 + 1,
95,
), // test case (_, true, false) and demand covered together with chp
(
chpStateRunning,
90,
70,
9 * 115,
95,
), // test case (_, true, false) and demand not covered together with chp
Expand All @@ -190,26 +190,28 @@ class ChpModelSpec
"Check total energy after calculating next state with #chpState and heat demand #heatDemand kWh:" in {
val testCases = Table(
("chpState", "storageLvl", "heatDemand", "expectedTotalEnergy"),
(chpStateNotRunning, 90, 0, 0), // tests case (false, false, true)
(chpStateNotRunning, 70, 0, 0), // tests case (false, false, true)
// Fixme Check this, why 100?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Fixme Check this, why 100?

Like I said, a fresh view the next day make things easier: 50 kW for TWO hours = 100 kWh :)

(
chpStateNotRunning,
90,
70,
8 * 115,
100,
), // tests case (false, true, false)
(chpStateNotRunning, 90, 10, 0), // tests case (false, true, true)
(chpStateRunning, 90, 0, 100), // tests case (true, false, true)
(chpStateRunning, 90, 8 * 115, 100), // tests case (true, true, false)
(chpStateRunning, 90, 10, 100), // tests case (true, true, true)
(chpStateNotRunning, 70, 10, 0), // tests case (false, true, true)
// Fixme Check this, why 100?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Fixme Check this, why 100?

see above

(chpStateRunning, 70, 0, 100), // tests case (true, false, true)
(chpStateRunning, 70, 8 * 115, 100), // tests case (true, true, false)
(chpStateRunning, 70, 10, 100), // tests case (true, true, true)
(
chpStateRunning,
90,
70,
7 * 115 + 1,
100,
), // test case (_, true, false) and demand covered together with chp
(
chpStateRunning,
90,
70,
9 * 115,
100,
), // test case (_, true, false) and demand not covered together with chp
Expand All @@ -236,29 +238,33 @@ class ChpModelSpec
"Check storage level after calculating next state with #chpState and heat demand #heatDemand kWh:" in {
val testCases = Table(
("chpState", "storageLvl", "heatDemand", "expectedStoredEnergy"),
(chpStateNotRunning, 90, 0, 1035), // tests case (false, false, true)
(chpStateNotRunning, 70, 0, 805), // tests case (false, false, true)
(
chpStateNotRunning,
90,
70,
// todo check this
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// todo check this

outdated imho

8 * 115,
230,
0,
), // tests case (false, true, false)
(chpStateNotRunning, 90, 10, 1025), // tests case (false, true, true)
(chpStateRunning, 90, 0, 1135), // tests case (true, false, true)
(chpStateRunning, 90, 8 * 115, 230), // tests case (true, true, false)
(chpStateRunning, 90, 10, 1125), // tests case (true, true, true)
(chpStateNotRunning, 70, 10, 795), // tests case (false, true, true)
// todo check this, why 1135?
(chpStateRunning, 70, 0, 905), // tests case (true, false, true)
(chpStateRunning, 70, 8 * 115, 0), // tests case (true, true, false)
(chpStateRunning, 70, 10, 895), // tests case (true, true, true)
// todo, why not +100?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// todo, why not +100?

demand is 806 kWh, chp will do 100 kWh, remaining demand is 706 kWh, storage contains 805 kWh so 99 will be in the end within the the storage. Or do I made any failure here?

(
chpStateRunning,
90,
70,
806,
329,
99,
), // test case (_, true, false) and demand covered together with chp
(
chpStateRunning,
90,
70,
9 * 115,
230,
0,
), // test case (_, true, false) and demand not covered together with chp
// todo check this, why 92?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imho: If the storage contains 92 m³ this represents 1058 kWh. + 100 kWh from Chp => 1158 which is more than 1150 of the storage volume. Thus explains in my opinion the comment below, (chp) test case AND storage volume exceeds maximum. Also I'm still not fully happy with the comment since it's hard to understand. If you agree or have a better formulation, please go ahead.

(
chpStateRunning,
92,
Expand All @@ -281,48 +287,54 @@ class ChpModelSpec
}

"Check time tick and running status after calculating next state with #chpState and heat demand #heatDemand kWh:" in {
val testCases = Seq(
// (ChpState, Storage Level, Heat Demand, Expected Time Tick, Expected Running Status)
val testCases = Table(
(
"chpState",
"storageLvl",
"heatDemand",
"expectedTick",
"expectedRunningStatus",
),
(
chpStateNotRunning,
90,
70,
0,
7200,
false,
), // Test case (false, false, true)
(
chpStateNotRunning,
90,
70,
8 * 115,
7200,
true,
), // Test case (false, true, false)
(
chpStateNotRunning,
90,
70,
10,
7200,
false,
), // Test case (false, true, true)
(chpStateRunning, 90, 0, 7200, true), // Test case (true, false, true)
(chpStateRunning, 70, 0, 7200, true), // Test case (true, false, true)
(
chpStateRunning,
90,
70,
8 * 115,
7200,
true,
), // Test case (true, true, false)
(chpStateRunning, 90, 10, 7200, true), // Test case (true, true, true)
(chpStateRunning, 70, 10, 7200, true), // Test case (true, true, true)
(
chpStateRunning,
90,
70,
806,
7200,
true,
), // Test case (_, true, false) and demand covered together with chp
(
chpStateRunning,
90,
70,
9 * 115,
7200,
true,
Expand All @@ -336,23 +348,22 @@ class ChpModelSpec
), // Test case (true, true, true) and storage volume exceeds maximum
)

for (
forAll(testCases) {
(
chpState,
storageLvl,
heatDemand,
expectedTimeTick,
expectedRunningStatus,
) <- testCases
) {
val chpData = buildChpRelevantData(chpState, heatDemand)
val thermalStorage = buildThermalStorage(storageInput, storageLvl)
val chpModel = buildChpModel(thermalStorage)
chpState,
storageLvl,
heatDemand,
expectedTick,
expectedRunningStatus,
) =>
val chpData = buildChpRelevantData(chpState, heatDemand)
val thermalStorage = buildThermalStorage(storageInput, storageLvl)
val chpModel = buildChpModel(thermalStorage)

val nextState = chpModel.calculateNextState(chpData)
val nextState = chpModel.calculateNextState(chpData)

nextState.lastTimeTick shouldEqual expectedTimeTick
nextState.isRunning shouldEqual expectedRunningStatus
nextState.lastTimeTick shouldEqual expectedTick
nextState.isRunning shouldEqual expectedRunningStatus
}
}

Expand Down
20 changes: 10 additions & 10 deletions src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class CylindricalThermalStorageSpec
"ThermalStorage",
null,
getQuantity(100, StandardUnits.VOLUME),
getQuantity(20, StandardUnits.VOLUME),
getQuantity(0, StandardUnits.VOLUME),
getQuantity(30, StandardUnits.TEMPERATURE),
getQuantity(40, StandardUnits.TEMPERATURE),
getQuantity(1.15, StandardUnits.SPECIFIC_HEAT_CAPACITY),
Expand Down Expand Up @@ -92,7 +92,7 @@ class CylindricalThermalStorageSpec
storage.tryToStoreAndReturnRemainder(vol2Energy(CubicMeters(55)))
val newLevel2 = storage._storedEnergy
val isCovering = storage.isDemandCoveredByStorage(KilowattHours(5))
val lack = storage.tryToTakeAndReturnLack(vol2Energy(CubicMeters(95)))
val lack = storage.tryToTakeAndReturnLack(vol2Energy(CubicMeters(115)))
val newLevel3 = storage._storedEnergy
val notCovering = storage.isDemandCoveredByStorage(KilowattHours(1))

Expand All @@ -101,7 +101,7 @@ class CylindricalThermalStorageSpec
surplus.value shouldBe vol2Energy(CubicMeters(5))
newLevel2 should approximate(vol2Energy(CubicMeters(100)))
lack.value shouldBe vol2Energy(CubicMeters(15))
newLevel3 should approximate(vol2Energy(CubicMeters(20)))
newLevel3 should approximate(vol2Energy(CubicMeters(0)))
isCovering shouldBe true
notCovering shouldBe false
}
Expand All @@ -110,7 +110,7 @@ class CylindricalThermalStorageSpec
val storage = buildThermalStorage(storageInput, CubicMeters(70))

val usableThermalEnergy = storage.usableThermalEnergy
usableThermalEnergy should approximate(KilowattHours(5 * 115))
usableThermalEnergy should approximate(KilowattHours(805))
}

"Apply, validation, and build method work correctly" in {
Expand Down Expand Up @@ -145,11 +145,11 @@ class CylindricalThermalStorageSpec
),
(
0L,
250.0,
20.0,
10.0,
3600L,
-42.0,
260.0,
30.0,
ThermalStorage.ThermalStorageThreshold.StorageEmpty(6171L),
),
(
Expand All @@ -163,11 +163,11 @@ class CylindricalThermalStorageSpec
),
(
0L,
250.0,
20.0,
-10.0,
3600L,
-42.0,
240.0,
10.0,
ThermalStorage.ThermalStorageThreshold.StorageEmpty(4457L),
),
(
Expand All @@ -181,11 +181,11 @@ class CylindricalThermalStorageSpec
),
(
0L,
240.0,
10.0,
-9.0,
3600L,
-5000.0,
231.0,
1.0,
ThermalStorage.ThermalStorageThreshold.StorageEmpty(3601L),
),
)
Expand Down