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

ThermalGrid integration test (with Em) #1159

Draft
wants to merge 42 commits into
base: dev
Choose a base branch
from
Draft

ThermalGrid integration test (with Em) #1159

wants to merge 42 commits into from

Conversation

danielfeismann
Copy link
Member

@danielfeismann danielfeismann commented Feb 6, 2025 •
edited
Loading

@danielfeismann danielfeismann added test Issues related to (unit) tests em Related to Energy Management labels Feb 6, 2025
@danielfeismann danielfeismann self-assigned this Feb 6, 2025
danielfeismann and others added 23 commits February 7, 2025 12:45
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
85c8c7b 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
0d9ed7c 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
create unapply methods for EmResult and HpResult
bbfa620
@danielfeismann
update ThermalGridIt case with Em
6c38e52
@danielfeismann
Merge remote-tracking branch 'origin/df/#1146-thermalGridIT-with-EM' …
2e6c69b 
…into df/#1146-thermalGridIT-with-EM
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
84c93e2 
# Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
@danielfeismann
refactoring after merging dev
20bef9a
@danielfeismann
fix calcState
4f9b1f2
@danielfeismann
update ThermalGridIT with em a tiny bit
1528e9c
@danielfeismann
edge case continue heating till target temperature when surplus energ…
9d0a649 
…y is dropping
@danielfeismann
enhance thermal house doc
c942771
@danielfeismann
add links to thermal house doc
2cba091
@danielfeismann
update thermal house doc
0d156ed
@danielfeismann
Change thermal house behaviour to heat till targetTemperature
267c08d
@danielfeismann
use correct hp when applying for weather service within EmAgentIT
be2830f
@danielfeismann
fix to use correct temperature when checking if innerTemperature is t…
59e7bdf 
…oo high
@danielfeismann
introduce boolean whether the upper temp boundary should be used, use…
80218af 
… current thermal grid state for calculating new hpState, refactor temperature determination to calculate heat energy
@danielfeismann
refactor upper ThermalHouseThreshold
e7ee7f3
@danielfeismann
fix tests for thermal houses regarding change to reqDemand till targe…
3af85b8 
…t temperature
@danielfeismann
fix ThermalGridIT with Em
a6bfbf9
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
fdb48e0
@danielfeismann
Merge branch 'dev' into df/#1176-heat-pump-targetTemp
86e6d23
@danielfeismann
Merge branch 'df/#1176-heat-pump-targetTemp' into df/#1146-thermalGri…
4b7912f 
…dIT-with-EM

# Conflicts:
#	CHANGELOG.md
#	docs/readthedocs/models/thermal_house_model.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala
@danielfeismann
Updating some scalaDocs
48ab311
@danielfeismann
renaming ThermalHouse.determineState to ThermalHouse.updateState
e17101f
@danielfeismann
renaming actualTargetTemperature to actualTemperatureTarget
f2bdc8f
@danielfeismann
remove fixme regarding some issue to em reactive power
1779ecd
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
4a70c3f 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
fix EmAgentIT by adding the additional activation when thermal house …
f54def2 
…reaches target temperature
@danielfeismann
remove workaround of testdata for pvInput
4a72b0b
@danielfeismann
fix thermalGriIT without Em
3b101e6
@danielfeismann
update comments, fmt
c559368
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
db99720 
# Conflicts:
#	src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
@danielfeismann
more simplification
f36d6a9
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
9dbc73c 
# Conflicts:
#	CHANGELOG.md
@danielfeismann
remove calculation of innerHouseTemperature and directly take it from…
f774b9f 
… currentState
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
f0dc7d8 
# Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
@danielfeismann danielfeismann mentioned this pull request Feb 18, 2025
Draft
@danielfeismann
Merge branch 'dev' into df/#1146-thermalGridIT-with-EM
aee2678 
# Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@danielfeismann danielfeismann

Labels
em Related to Energy Management test Issues related to (unit) tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement ThermalGrid Integration test (with Em)
1 participant
@danielfeismann