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

ThermalGrid integration test #879

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

Conversation

danielfeismann
Copy link
Member

@danielfeismann danielfeismann commented Aug 4, 2024

resolves #878

merge #860, #883, #873, #895, #931, #935, #1009 and #1044 first

merge #931 first

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
…efactor-handleInfeed

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
…hermalGridIT

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridSpec.scala
# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
# Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
em Related to Energy Management test Issues related to (unit) tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement ThermalGrid Integration test
1 participant