Refactoring of ThermalGrid.handleInfeed to fix thermal storage recharge correctly when empty
#931
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…neState-of-ThermalHouse' into df/tmpHPmergeall
…ageResults-have-multiple-entries' into df/tmpHPmergeall # Conflicts: # CHANGELOG.md
…ion-of-Hp-when-not-under-control-of-an-EM' into df/tmpHPmergeall # Conflicts: # CHANGELOG.md
…ermalGird-energyDemand' into df/tmpHPmergeall
…ge correctly when empty
# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md # src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
…refactor-handleInfeed
This reverts commit a669b5b.
…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
…on-plausible behaviour till psdm release
…mum storage volume level
# 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
src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
Outdated
Show resolved
Hide resolved
# Conflicts: # CHANGELOG.md
# Conflicts: # src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala # src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves #930
merge #1052 and #1046 first