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.

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

Fix hp results leading to overheating house and other effects #853

Draft
wants to merge 50 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
891ab88
add maybeThermalThreshold to nextActivationTicks
danielfeismann Jul 17, 2024
5b9f652
changelog
danielfeismann Jul 17, 2024
989b7b6
provide heat pump the latest entry of weather data
danielfeismann Jul 17, 2024
8b41023
adapt handleInfeed to check for lastState qDot
danielfeismann Jul 17, 2024
e4457dc
fix energyDemand evaluation for demand only below target temperature
danielfeismann Jul 19, 2024
374a2ee
format and exception
danielfeismann Jul 19, 2024
280fed5
Revert "format and exception"
danielfeismann Jul 19, 2024
f51dd61
format and exception
danielfeismann Jul 19, 2024
a297697
refactor handleInfeed to comply with case where thermal storage has b…
danielfeismann Jul 19, 2024
77941f9
fix HpModelSpec to check for targetTemperature
danielfeismann Jul 19, 2024
cde52e4
adapt HpModelSpec to check for targetTemperature
danielfeismann Jul 19, 2024
6244e79
fmt
danielfeismann Jul 19, 2024
81ef30d
refactor energyDemand
danielfeismann Jul 19, 2024
ab0806c
refactor EmAgentIT
danielfeismann Jul 19, 2024
8c6aed6
rollback HpModelSpec
danielfeismann Jul 22, 2024
44873d2
fix energyDemand
danielfeismann Jul 22, 2024
ec7d3f7
update EmAgentIT
danielfeismann Jul 22, 2024
5dcc230
adapt EmAgentIT
danielfeismann Jul 22, 2024
3cc1aa6
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Jul 22, 2024
a3959cb
rollback EmAgentIT changes
danielfeismann Jul 22, 2024
07574aa
Revert "rollback EmAgentIT changes"
danielfeismann Jul 22, 2024
1d7ae94
adapt EmAgentIT comments
danielfeismann Jul 22, 2024
fd1630e
use actual state when determine energyDemand for next period
danielfeismann Jul 22, 2024
9cd94e8
only charge storage if it has still available capacity
danielfeismann Jul 22, 2024
a001dc0
use the actual result tick for thermalhouse and thermal storage results
danielfeismann Jul 22, 2024
ae8185e
use the actual result tick for thermalhouse and thermal storage resul…
danielfeismann Jul 22, 2024
43d114b
fmt
danielfeismann Jul 22, 2024
eb15119
Merge branch 'dev' into df/#827_fix_hp_overheating_house
danielfeismann Jul 25, 2024
08499be
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Jul 26, 2024
5349900
using updatedState for energyDemand
danielfeismann Aug 1, 2024
ad2bac9
fmt
danielfeismann Aug 1, 2024
d85279a
codacy
danielfeismann Aug 1, 2024
2c9f44c
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 5, 2024
de0d415
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 8, 2024
62b0f7a
Merge branch 'dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 13, 2024
658cb24
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 20, 2024
650c6f9
provide correct ambientTemperature when determining energyDemand of T…
danielfeismann Aug 20, 2024
1abf675
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 20, 2024
f7256ae
add scaladoc
danielfeismann Aug 21, 2024
a9a6296
split handleInfeed into different methods to reduce complexity
danielfeismann Aug 21, 2024
550b5b2
fmt
danielfeismann Aug 21, 2024
afe0572
improve imports
danielfeismann Aug 21, 2024
cbb75d0
Merge branch 'dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 21, 2024
bbc3a73
Merge branch 'dev' into df/#827_fix_hp_overheating_house
danielfeismann Aug 23, 2024
452f6c1
introduce updated HpModelSpec
danielfeismann Aug 23, 2024
020caf0
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Sep 19, 2024
d049e65
rollback change to fallback to latest weatherData
danielfeismann Sep 19, 2024
52e1f58
fmt
danielfeismann Sep 19, 2024
c93dee0
fix method inputs
danielfeismann Sep 19, 2024
6747d86
Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house
danielfeismann Sep 26, 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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improve code quality in fixedloadmodelspec and other tests [#919](https://github.com/ie3-institute/simona/issues/919)
- Fix power flow calculation with em agents [#962](https://github.com/ie3-institute/simona/issues/962)
- Fix scheduling at Evcs with more than one Ev at a time without Em [#787](https://github.com/ie3-institute/simona/issues/787)
- Fixed Hp results leading to overheating house and other effects [#827](https://github.com/ie3-institute/simona/issues/827)

## [3.0.0] - 2023-08-07

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/edu/ie3/simona/agent/ValueStore.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import scala.collection.SortedMap
*/
final case class ValueStore[+D](
maxTickSpan: Long,
private val store: SortedMap[Long, D] = SortedMap.empty[Long, D],
store: SortedMap[Long, D] = SortedMap.empty[Long, D],
) {

/** Determine the lastly known data tick, if available. Includes the given
Expand Down
2 changes: 2 additions & 0 deletions src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ final case class HpModel(
): Boolean = {
val demand = thermalGrid.energyDemand(
relevantData.currentTick,
state.ambientTemperature.getOrElse(relevantData.ambientTemperature),
relevantData.ambientTemperature,
state.thermalGridState,
)
Expand Down Expand Up @@ -210,6 +211,7 @@ final case class HpModel(
/* Determine the options we have */
val thermalEnergyDemand = thermalGrid.energyDemand(
data.currentTick,
lastState.ambientTemperature.getOrElse(data.ambientTemperature),
data.ambientTemperature,
lastState.thermalGridState,
)
Expand Down
Loading