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

Introducing energy demand for warm water heating #865

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

Introducing energy demand for warm water heating #865

wants to merge 389 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 20, 2024

  1. fmt

    @danielfeismann
    danielfeismann committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    7812aeb View commit details
    Browse the repository at this point in the history

  2. update ThermalGridIT to last changes

    @danielfeismann
    danielfeismann committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    0c36ce5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/df/#878-thermalGridIT' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	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/ThermalGridTestData.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c584f84 View commit details
    Browse the repository at this point in the history

  4. fix conflicts after merging

    @danielfeismann
    danielfeismann committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    be1b45a View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. rollback unnecessary change

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    188418f View commit details
    Browse the repository at this point in the history

  2. adapt EmAgentIT

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3405e78 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/dev' into df/#827_fix_hp_storage_refill 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    6c9e988 View commit details
    Browse the repository at this point in the history

  4. remove unneccessary imports

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    9da307e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/df/#729-additional-… 

    …tests-thermal-house' into df/#856-tap-water

# Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    feefb09 View commit details
    Browse the repository at this point in the history

  6. cherrypick EmAgentIT from ThermalGridIT pull request

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    49bb285 View commit details
    Browse the repository at this point in the history

  7. start fixing determineFlexOptions

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    a6b5031 View commit details
    Browse the repository at this point in the history

  8. start adapting HpModelSpec

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    bd92823 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'refs/remotes/origin/df/#729-additional-… 

    …tests-thermal-house' into df/#827_fix_hp_storage_refill

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    fe7f1b2 View commit details
    Browse the repository at this point in the history

  10. fix merge conflict

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    95d4907 View commit details
    Browse the repository at this point in the history

  11. remove storage min lvl in HpInputTestData

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    c1891a0 View commit details
    Browse the repository at this point in the history

  12. move operation conditions of hp into operatesInNextState and adapt Hp… 

    …ModelSpec cases
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    0886111 View commit details
    Browse the repository at this point in the history

  13. adapt condition for hasAdditionalDemand

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    441dfdb View commit details
    Browse the repository at this point in the history

  14. refactor ThermalEnergyDemand

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8ee3b77 View commit details
    Browse the repository at this point in the history

  15. fmt

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ced3b55 View commit details
    Browse the repository at this point in the history

  16. Revert "adapt condition for hasAdditionalDemand" 

    This reverts commit 441dfdb.
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    b07c1f8 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'refs/remotes/origin/df/#917-Refactor-Th… 

    …ermalEnergyDemand' into df/#827_fix_hp_storage_refill
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3696479 View commit details
    Browse the repository at this point in the history

  18. remove broken test

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8321411 View commit details
    Browse the repository at this point in the history

  19. remove demand of heat storage from condtion for checking when hp can … 

    …be out of operation
    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3ed4fed View commit details
    Browse the repository at this point in the history

  20. fix HpModelSpec

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    a4895ae View commit details
    Browse the repository at this point in the history

  21. codacy

    @danielfeismann
    danielfeismann committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    1f829e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'refs/heads/dev' into df/#856-tap-water

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    6dd24a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d2c433b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/df/#827_fix_hp_stor… 

    …age_refill' into df/#878-thermalGridIT

# Conflicts:
#	CHANGELOG.md
#	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
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    25de224 View commit details
    Browse the repository at this point in the history

  4. adaptions after merging thermal storage refill PR

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    882d8fb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/df/#878-thermalGridIT' into df/#856-tap-water 

    # 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/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala
    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    7455b80 View commit details
    Browse the repository at this point in the history

  6. adaptions after merging thermal storage refill PR

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    38f84e4 View commit details
    Browse the repository at this point in the history

  7. fmt

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    ebdc0dc View commit details
    Browse the repository at this point in the history

  8. adapt HpModel and HpModelSpec to domestic hot water storage

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d03ad49 View commit details
    Browse the repository at this point in the history

  9. format and code quality

    @danielfeismann
    danielfeismann committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    606893f View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. fmt

    @danielfeismann
    danielfeismann committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    8466c48 View commit details
    Browse the repository at this point in the history

  2. add domesticHotWaterStorageInput to HpInputTestData

    @danielfeismann
    danielfeismann committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    744154c View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    07e5825 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/df/#926-Fix-determi… 

    …neState-of-ThermalHouse' into df/tmpHPmergeall
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    baabf85 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/df/#924-ThermalStor… 

    …ageResults-have-multiple-entries' into df/tmpHPmergeall

# Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    7659750 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'refs/remotes/origin/df/#922-Fix-activat… 

    …ion-of-Hp-when-not-under-control-of-an-EM' into df/tmpHPmergeall

# Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    0b1868d View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/df/#928-Refactor-Th… 

    …ermalGird-energyDemand' into df/tmpHPmergeall
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    e2d7133 View commit details
    Browse the repository at this point in the history

  6. Refactoring of ThermalGrid.handleInfeed to fix thermal storage rechar… 

    …ge correctly when empty
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    64a67ec View commit details
    Browse the repository at this point in the history

  7. small changes and fmt

    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    1d17e18 View commit details
    Browse the repository at this point in the history

  8. fmt

    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    d815763 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    80b88af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#856-tap-water

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    bcc486e View commit details
    Browse the repository at this point in the history

  3. remove type specs for testCases table

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4ba4dff View commit details
    Browse the repository at this point in the history

  4. refactor handleInfeed

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    395ce15 View commit details
    Browse the repository at this point in the history

  5. scalaDoc, fmt, renamings etc

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    748d8f3 View commit details
    Browse the repository at this point in the history

  6. refactor determineMostRecentThreshold

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    d467581 View commit details
    Browse the repository at this point in the history

  7. fix handleInfeedStorage

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    52f4342 View commit details
    Browse the repository at this point in the history

  8. fmt

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    f120f54 View commit details
    Browse the repository at this point in the history

  9. remove redundant headOption

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    a9c267e View commit details
    Browse the repository at this point in the history

  10. fix tests ThermalGridWith..

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    2f35b84 View commit details
    Browse the repository at this point in the history

  11. adapt test since the conditions doesnt realy make sense

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4d35214 View commit details
    Browse the repository at this point in the history

  12. harmonise InputTestData

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    d6b2b3a View commit details
    Browse the repository at this point in the history

  13. enrich thermalResults by results of domestic hot water storage

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    9d69563 View commit details
    Browse the repository at this point in the history

  14. fmt

    @danielfeismann
    danielfeismann committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6e72130 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. change to thermalDemands in tests

    @danielfeismann
    danielfeismann committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    9a287f6 View commit details
    Browse the repository at this point in the history

  2. change to thermalDemands in HpModel and coresponting refactoring in T… 

    …hermalGrid
    @danielfeismann
    danielfeismann committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    9538580 View commit details
    Browse the repository at this point in the history

  3. format and coding styles

    @danielfeismann
    danielfeismann committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    88a7b8e View commit details
    Browse the repository at this point in the history

  4. updating ThermalGridIT to include domestic hot water storage first part

    @danielfeismann
    danielfeismann committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    a14178e View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. typo

    @danielfeismann
    danielfeismann committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    0062712 View commit details
    Browse the repository at this point in the history

  2. refactor discharging power of domestic hot water storage to match pre… 

    …cisely the energyDemand
    @danielfeismann
    danielfeismann committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    a38f814 View commit details
    Browse the repository at this point in the history

  3. fmt

    @danielfeismann
    danielfeismann committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    91873b9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.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
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    5ebc65d View commit details
    Browse the repository at this point in the history

  2. fixing merge conflicts

    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6c5477a View commit details
    Browse the repository at this point in the history

  3. remove changelog entry that is no longer valid

    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    bbe4c0a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    5e5b5c1 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/df/#878-thermalGridIT' into df/#878 

    -thermalGridIT
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    d5c0195 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    cb34618 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.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
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6ae74f2 View commit details
    Browse the repository at this point in the history

  8. fmt

    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    994b7cc View commit details
    Browse the repository at this point in the history

  9. fixing some tests

    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    18ff9b2 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    9ce13f9 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    0333902 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a329610 View commit details
    Browse the repository at this point in the history

  13. fixing more tests

    @danielfeismann
    danielfeismann committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6559093 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. fix calcuation of energy demand for hot water for the hours between t… 

    …wo activations
    @danielfeismann
    danielfeismann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    10f9fba View commit details
    Browse the repository at this point in the history

  2. fix threshold calculation of domestic hot water storage

    @danielfeismann
    danielfeismann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    e2e2b9b View commit details
    Browse the repository at this point in the history

  3. use wildcard for unneccessary vals

    @danielfeismann
    danielfeismann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    9aba960 View commit details
    Browse the repository at this point in the history

  4. fixing tests

    @danielfeismann
    danielfeismann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    d1e50c9 View commit details
    Browse the repository at this point in the history

  5. updating parts of ThermalGridIT

    @danielfeismann
    danielfeismann committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    c0c2042 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    547534c View commit details
    Browse the repository at this point in the history

  2. update ThermalGridIT till tick 45000

    @danielfeismann
    danielfeismann committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7f46a28 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. update rtd

    @danielfeismann
    danielfeismann committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    5ab69b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. declare demand for recharing domestic hot water storage below 20 perc… 

    …ent soc
    @danielfeismann
    danielfeismann committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    7f2945c View commit details
    Browse the repository at this point in the history

  2. fix qDot for domestic hot water storage

    @danielfeismann
    danielfeismann committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    e33796b View commit details
    Browse the repository at this point in the history

  3. fix ThermalGridIT

    @danielfeismann
    danielfeismann committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    221e389 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    1573bcc View commit details
    Browse the repository at this point in the history

  5. adapt comments

    @danielfeismann
    danielfeismann committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    abd820d View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. comments for remaining ticks in ThermalGridIT

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f8ac1ff View commit details
    Browse the repository at this point in the history

  2. fmt

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    199f7b9 View commit details
    Browse the repository at this point in the history

  3. fix some tests

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    eca2902 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f915164 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/HpInputTestData.scala
    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e2b7cd1 View commit details
    Browse the repository at this point in the history

  6. fmt

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    6b30a5d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    355d765 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'refs/heads/dev' into df/#856-tap-water

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    77fba08 View commit details
    Browse the repository at this point in the history

  9. adapt EmAgentIT

    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    df2153a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c1e37ee View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. rollback change to fallback to latest weatherData

    @danielfeismann
    danielfeismann committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9c1334a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    a45a7b1 View commit details
    Browse the repository at this point in the history

  3. rollback change to fallback to latest weatherData

    @danielfeismann
    danielfeismann committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    3df14e4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ae87f53 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    1d1355e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    350e904 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    47e4052 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    e9a590f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    de1b0c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/dev' into df/#856-tap-water

    @danielfeismann
    danielfeismann committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    fe470ca View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'refs/heads/dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    392d040 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b6c596f View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e3807b8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'df/#1008-thermalResultsFilter' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2ed6f02 View commit details
    Browse the repository at this point in the history

  3. rename lastTimeTick into tick and use updatedState for thermalResults

    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5500119 View commit details
    Browse the repository at this point in the history

  4. make store of ValueStore non-private

    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    393d19f View commit details
    Browse the repository at this point in the history

  5. adapt ThermalGridIT to results processed in the currentTick

    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    099838a View commit details
    Browse the repository at this point in the history

  6. rollback changes at ThermalGrid.results()

    @danielfeismann
    danielfeismann committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0e28577 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. override def getTimeKeysAfter in WeatherSourceWrapperSpec

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    611b701 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ce64339 View commit details
    Browse the repository at this point in the history

  3. resolve merge conflicts in ThermalGrid

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9c742de View commit details
    Browse the repository at this point in the history

  4. fmt

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    509b6db View commit details
    Browse the repository at this point in the history

  5. pick changes from pr 1009 to fix filter ThermalGridResults

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    c892eea View commit details
    Browse the repository at this point in the history

  6. fix for psdm changes on thermal storages

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a4e6fd4 View commit details
    Browse the repository at this point in the history

  7. fix after merging ThermalGrid

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    cfac4cc View commit details
    Browse the repository at this point in the history

  8. adapting ThermalGridIT to changes in thermal grid result calculation

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    cc2f566 View commit details
    Browse the repository at this point in the history

  9. adapt scala doc of DomesticHotWaterStorage

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e03d0ad View commit details
    Browse the repository at this point in the history

  10. fix initial stored energy of DomesticHotWaterStorage

    @danielfeismann
    danielfeismann committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f522c82 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    2bc339e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    e1df392 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    de52f6e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    339a020 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    20664ab View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    165371d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'df/#928-Refactor-ThermalGird-energyDemand' into df/#930-… 

    …refactor-handleInfeed
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    ba6b581 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b40cfe0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    d3357f6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into df/#930-refactor-handleInfeed

    @danielfeismann
    danielfeismann authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    441359c View commit details
    Browse the repository at this point in the history

  6. remove double entry in changelog

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    a669b5b View commit details
    Browse the repository at this point in the history

  7. Revert "remove double entry in changelog" 

    This reverts commit a669b5b.
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    7884541 View commit details
    Browse the repository at this point in the history

  8. remove correct double entry in changelog

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    86b3256 View commit details
    Browse the repository at this point in the history

  9. reintroduce demand booleans indicating demand when handle thermal infeed

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    f4fa810 View commit details
    Browse the repository at this point in the history

  10. add some scala doc

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    963670c View commit details
    Browse the repository at this point in the history

  11. handle sonar code smell

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    bfd633b View commit details
    Browse the repository at this point in the history

  12. Revert "handle sonar code smell" 

    This reverts commit bfd633b.
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    9eee886 View commit details
    Browse the repository at this point in the history

  13. handle sonar code smell

    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    122cb69 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. fmt

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    eba3b89 View commit details
    Browse the repository at this point in the history

  2. fix scala doc

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    1f6311f View commit details
    Browse the repository at this point in the history

  3. refactor demand booleans of thermal units into ThermalDemandIndicator… 

    … class
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    95d0562 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f33fc1a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/df/#930-refactor-handleInfeed' into df/#878-… 

    …thermalGridIT

# Conflicts:
#	CHANGELOG.md
#	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/ThermalGridTestData.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6b74778 View commit details
    Browse the repository at this point in the history

  6. fmt

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    96a7dfb View commit details
    Browse the repository at this point in the history

  7. Merge branch 'df/#934-thermalHouseResults' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/event/ResultEvent.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b7ebbe2 View commit details
    Browse the repository at this point in the history

  8. remove comment from merge conflict

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6631b67 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'df/#1023-zeroKW-and-kWh-in-test' into df/#930-refactor-… 

    …handleInfeed

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    30e4318 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into df/#930-refactor-handleInfeed

    @danielfeismann
    danielfeismann authored Nov 15, 2024
    Configuration menu
    Copy the full SHA
    9fb1523 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'df/#1023-zeroKW-and-kWh-in-test' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/event/ResultEvent.scala
#	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/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    378f2f6 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'df/#1023-zeroKW-and-kWh-in-test' into df/#856-tap-water 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    29dedaa View commit details
    Browse the repository at this point in the history

  13. resolving merge conflict

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e5702c1 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'dev' into df/#856-tap-water

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    ab42b3c View commit details
    Browse the repository at this point in the history

  15. Merge branch 'dev' into df/#930-refactor-handleInfeed

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    94397ee View commit details
    Browse the repository at this point in the history

  16. remove unnecessary value

    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    7341e10 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    97b4a15 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    b69dd06 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	docs/readthedocs/models/cts_model.md
#	docs/readthedocs/models/thermal_house_model.md
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    15f2f59 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    98d7511 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    36ce30a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    0d40632 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    05bebe4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    aa2db68 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    41e2441 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    7292171 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    85c0fc1 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. fix import

    @danielfeismann
    danielfeismann committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    04f0207 View commit details
    Browse the repository at this point in the history

  2. fix thermal demand determination

    @danielfeismann
    danielfeismann committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    d44e19f View commit details
    Browse the repository at this point in the history

  3. simplify methods to compare temperatures

    @danielfeismann
    danielfeismann committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    a567d0b View commit details
    Browse the repository at this point in the history

  4. fmt

    @danielfeismann
    danielfeismann committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    3cccc33 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. correct test cases of HpModelSpec

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    995818e View commit details
    Browse the repository at this point in the history

  2. refactoring thermal demand indicators

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    1b9375f View commit details
    Browse the repository at this point in the history

  3. fix turnHpOn determination

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    be2452a View commit details
    Browse the repository at this point in the history

  4. fix comment in HpModelSpec

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    1e25d3b View commit details
    Browse the repository at this point in the history

  5. fix turnHpOn in HpModel

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    135ea15 View commit details
    Browse the repository at this point in the history

  6. refactoring thermal demand indicators

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    debae48 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'refs/heads/dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a95a242 View commit details
    Browse the repository at this point in the history

  8. fix thermalPower determination in calcState of HpModel

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    5c00a89 View commit details
    Browse the repository at this point in the history

  9. fix EmAgentIT

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    cbd997e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a0e95af View commit details
    Browse the repository at this point in the history

  11. also turn Hp on in case house has additional demand and the Hp was ru… 

    …nning in the last state
    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a07b626 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    752f755 View commit details
    Browse the repository at this point in the history

  13. fmt

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    7516d7b View commit details
    Browse the repository at this point in the history

  14. fix handleInfeed of thermal energy

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    31c73d9 View commit details
    Browse the repository at this point in the history

  15. correct direction of thermal power of thermal heat storage

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    85594d3 View commit details
    Browse the repository at this point in the history

  16. fix ThermalGridWithStorageOnlySpec test where putting energy into sto… 

    …rage
    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    391b49d View commit details
    Browse the repository at this point in the history

  17. add ThermalGridWithStorageOnlySpec test where taking energy from storage

    @danielfeismann
    danielfeismann committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    ba9aeea View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2024

  1. fix ThermalGridWithHouseAndStorageSpec

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    f7b1c1d View commit details
    Browse the repository at this point in the history

  2. fmt

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    bdd63f6 View commit details
    Browse the repository at this point in the history

  3. adapt EmAgentIT

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    aac4297 View commit details
    Browse the repository at this point in the history

  4. fmt

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    092a6c9 View commit details
    Browse the repository at this point in the history

  5. fix EmAgentIT

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    92e6c51 View commit details
    Browse the repository at this point in the history

  6. fmt

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    481da32 View commit details
    Browse the repository at this point in the history

  7. correct direction of thermal power of thermal heat storage

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    b03b576 View commit details
    Browse the repository at this point in the history

  8. fix handleInfeed of thermal energy

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    7b58297 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into df/#930-refactor-handleInfeed 

    # Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    c763b72 View commit details
    Browse the repository at this point in the history

  10. enhance ThermalGridSpec when checking for required and additional demand

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    8d452ec View commit details
    Browse the repository at this point in the history

  11. fix inputs for thermalGridWith specs plus add another test case

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    07746a4 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    da0dd0b View commit details
    Browse the repository at this point in the history

  13. remove unused parameter

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    aa9ffc9 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'df/#878-thermalGridIT' into df/#856-tap-water 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/event/ResultEvent.scala
#	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/agent/em/EmAgentIT.scala
#	src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridTestData.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    e6b831c View commit details
    Browse the repository at this point in the history

  15. solving some merge conflicts

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    1d3eaa4 View commit details
    Browse the repository at this point in the history

  16. fix some tests after merge conflicts

    @danielfeismann
    danielfeismann committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    31e6c21 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2024

  1. fix ChpModelSpec and CylindricalThermalStorageSpec due to new storage… 

    … min level
    @danielfeismann
    danielfeismann committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    ad18a71 View commit details
    Browse the repository at this point in the history

  2. correct tests after merge conflict

    @danielfeismann
    danielfeismann committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    d5a24c4 View commit details
    Browse the repository at this point in the history

  3. adapt tests to input requirements

    @danielfeismann
    danielfeismann committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    f575af1 View commit details
    Browse the repository at this point in the history

  4. fmt

    @danielfeismann
    danielfeismann committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    921c18d View commit details
    Browse the repository at this point in the history

  5. add case to handleInfeed

    @danielfeismann
    danielfeismann committed Nov 24, 2024
    Configuration menu
    Copy the full SHA
    c765a82 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2024

  1. Merge branch 'dev' into df/#878-thermalGridIT 

    # Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    8115cf2 View commit details
    Browse the repository at this point in the history

  2. fix after merge conflict

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    07503fa View commit details
    Browse the repository at this point in the history

  3. fix ThermalGridWithHouseAndStorageSpec after merging dev

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    8c005bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'df/#1049-Introduce-ThermalDemandWrapper' into df/#930-r… 

    …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
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    6dabaf7 View commit details
    Browse the repository at this point in the history

  5. fix after merging

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    0d157db View commit details
    Browse the repository at this point in the history

  6. Merge branch 'df/#1049-Introduce-ThermalDemandWrapper' into df/#878-t… 

    …hermalGridIT

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridSpec.scala
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    e059f31 View commit details
    Browse the repository at this point in the history

  7. fmt

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    9a9096d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into df/#930-refactor-handleInfeed

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    7e8afb0 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into df/#878-thermalGridIT

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    6ec32b8 View commit details
    Browse the repository at this point in the history

  10. adapt ChpModelSpec and CylindricalThermalStorageSpec to zero for mini… 

    …mum storage volume level
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    51741cc View commit details
    Browse the repository at this point in the history

  11. hard fix for zero values as minimum storage volume level to prevent n… 

    …on-plausible behaviour till psdm release
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    8e19705 View commit details
    Browse the repository at this point in the history

  12. adapt cases for handling thermal infeed into ThermalGrid

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    d567b81 View commit details
    Browse the repository at this point in the history

  13. fmt

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    0ab7ade View commit details
    Browse the repository at this point in the history

  14. hard fix for zero values as minimum storage volume level to prevent n… 

    …on-plausible behaviour till psdm release
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    81694cc View commit details
    Browse the repository at this point in the history

  15. adapt ChpModelSpec and CylindricalThermalStorageSpec to zero for mini… 

    …mum storage volume level
    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    d9f859c View commit details
    Browse the repository at this point in the history

  16. adapt cases for handling thermal infeed into ThermalGrid

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    bed4f7b View commit details
    Browse the repository at this point in the history

  17. fix consider qDot as heat result of hp only when hp is running

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    badd6d9 View commit details
    Browse the repository at this point in the history

  18. fmt

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    ae84f16 View commit details
    Browse the repository at this point in the history

  19. fix consider qDot as heat result of hp only when hp is running

    @danielfeismann
    danielfeismann committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    f371e2e View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. fmt

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    6bb59f9 View commit details
    Browse the repository at this point in the history

  2. fix wrong case within thermalGrid

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    02edbf5 View commit details
    Browse the repository at this point in the history

  3. split handleInfeed method a tiny bit

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    6051f39 View commit details
    Browse the repository at this point in the history

  4. fix wrong case within thermalGrid

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    dab5a85 View commit details
    Browse the repository at this point in the history

  5. split handleInfeed method a tiny bit

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    0adc6c9 View commit details
    Browse the repository at this point in the history

  6. fmt

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    1586bd3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'df/#878-thermalGridIT' into df/#856-tap-water 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/model/participant/ChpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    4d2213b View commit details
    Browse the repository at this point in the history

  8. resolve conflicts after merge

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    11e00dd View commit details
    Browse the repository at this point in the history

  9. split handleInfeed and introduce logic table as scalaDoc

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    577bd3a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into df/#930-refactor-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/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    88c6e3a View commit details
    Browse the repository at this point in the history

  11. fix after merging dev

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    be3b094 View commit details
    Browse the repository at this point in the history

  12. fix tests after merging dev

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    6163afd View commit details
    Browse the repository at this point in the history

  13. Merge branch 'df/#930-refactor-handleInfeed' into df/#878-thermalGridIT 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    b90144d View commit details
    Browse the repository at this point in the history

  14. Merge branch 'df/#878-thermalGridIT' into df/#856-tap-water 

    # Conflicts:
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalHouse.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala
    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    5688a65 View commit details
    Browse the repository at this point in the history

  15. make more use of HpRelevantData

    @danielfeismann
    danielfeismann committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    3b2ddc7 View commit details
    Browse the repository at this point in the history