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 #879

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

ThermalGrid integration test #879

wants to merge 168 commits into from
+1,336 −126

Commits on Jul 17, 2024

  1. add maybeThermalThreshold to nextActivationTicks

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

  2. changelog

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

  3. provide heat pump the latest entry of weather data

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

  4. adapt handleInfeed to check for lastState qDot

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

Commits on Jul 19, 2024

  1. fix energyDemand evaluation for demand only below target temperature

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

  2. format and exception

    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    374a2ee View commit details
    Browse the repository at this point in the history

  3. Revert "format and exception" 

    This reverts commit 374a2ee.
    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    280fed5 View commit details
    Browse the repository at this point in the history

  4. format and exception

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

  5. refactor handleInfeed to comply with case where thermal storage has b… 

    …een charged within the last state
    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    a297697 View commit details
    Browse the repository at this point in the history

  6. fix HpModelSpec to check for targetTemperature

    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    77941f9 View commit details
    Browse the repository at this point in the history

  7. adapt HpModelSpec to check for targetTemperature

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

  8. fmt

    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6244e79 View commit details
    Browse the repository at this point in the history

  9. refactor energyDemand

    @danielfeismann
    danielfeismann committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    81ef30d View commit details
    Browse the repository at this point in the history

  10. refactor EmAgentIT

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

Commits on Jul 22, 2024

  1. rollback HpModelSpec

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

  2. fix energyDemand

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

  3. update EmAgentIT

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

  4. adapt EmAgentIT

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

  5. Merge branch 'refs/heads/dev' into df/#827_fix_hp_overheating_house

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

  6. rollback EmAgentIT changes

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

  7. Revert "rollback EmAgentIT changes" 

    This reverts commit a3959cb.
    @danielfeismann
    danielfeismann committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    07574aa View commit details
    Browse the repository at this point in the history

  8. adapt EmAgentIT comments

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

  9. use actual state when determine energyDemand for next period

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

  10. only charge storage if it has still available capacity

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

  11. use the actual result tick for thermalhouse and thermal storage results

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

  12. use the actual result tick for thermalhouse and thermal storage resul… 

    …ts part 2
    @danielfeismann
    danielfeismann committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ae8185e View commit details
    Browse the repository at this point in the history

  13. fmt

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

Commits on Jul 23, 2024

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

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

  2. refactor determining the energyDemand to recharge storage

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

  3. split energyDemand of ThermalGrid into demand of house and of storage

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

  4. changelog

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

  5. fix condition for handleInfeed in case qdot should be used first for … 

    …storage
    @danielfeismann
    danielfeismann committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a65f25a View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Merge branch 'dev' into df/#827_fix_hp_overheating_house

    @danielfeismann
    danielfeismann authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    eb15119 View commit details
    Browse the repository at this point in the history

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

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

Commits on Jul 26, 2024

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

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

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

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

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

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

  4. Refactor ThermalGrid, distinguishes between house supply and storage

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

Commits on Jul 30, 2024

  1. fmt

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

Commits on Jul 31, 2024

  1. setup framework for ThermalGridIT

    @danielfeismann
    danielfeismann committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    59d70af View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. using updatedState for energyDemand

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

  2. fmt

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

  3. codacy

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

Commits on Aug 4, 2024

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

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

  2. create thermalGridIT testframe

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

  3. changelog

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

Commits on Aug 5, 2024

  1. Merge branch 'refs/heads/df/#827_fix_hp_storage_refill' into df/#878-… 

    …thermalGridIT

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

  2. Provide actual ambient temperature of tick to HpModel when calculate … 

    …state
    @danielfeismann
    danielfeismann committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    3635241 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/df/#882-ambient-temperature' into df/#878-th… 

    …ermalGridIT

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

  4. fmt

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

  5. introduce storage in HpInputTestData

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

  6. resolve merge conflict

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

  7. update ThermalGridIT

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

  8. further update ThermalGridIT

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

  9. Merge branch 'refs/heads/df/#827_fix_hp_overheating_house' into df/#878… 

    …-thermalGridIT

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

  10. Merge branch 'refs/heads/df/#882-ambient-temperature' into df/#878-th… 

    …ermalGridIT

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

  11. Merge branch 'refs/heads/df/#844_fix_thermal_house_results' into df/#878 

    -thermalGridIT

# Conflicts:
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
    @danielfeismann
    danielfeismann committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    3235e02 View commit details
    Browse the repository at this point in the history

  12. update changelog

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

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

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

  14. refactor tests for result events within ThermalGridIT

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

Commits on Aug 7, 2024

  1. fixed ThermalGridIT

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

  2. ThermalGridIT till tick 31106

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

  3. fix condition if hp should be turned on in next tick

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

  4. Merge branch 'refs/heads/df/#827_fix_hp_storage_refill' into df/#878-… 

    …thermalGridIT

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

  5. refator HpModel.operatesInNextState, enrich energyDemand method of Th… 

    …ermalGrid to deliver updatedThermalState
    @danielfeismann
    danielfeismann committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    97e3bd8 View commit details
    Browse the repository at this point in the history

  6. fmt

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

  7. handle case where thermal storage heat the house and we get activated… 

    … inbetween by new weather data
    @danielfeismann
    danielfeismann committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    6f220a9 View commit details
    Browse the repository at this point in the history

  8. adapt ThermalGridIT to changes for case storage heat house

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

Commits on Aug 8, 2024

  1. update tests to thermalStorage with zero storageMinimumLvl

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

  2. fix thermal storage recharging condition

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

  3. finalise ThermalGridIT

    @danielfeismann
    danielfeismann committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    14d2b05 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 8, 2024
    Configuration menu
    Copy the full SHA
    ca0179a View commit details
    Browse the repository at this point in the history

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

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

  6. Merge remote-tracking branch 'refs/remotes/origin/df/#894-storage-zer… 

    …oLvl' into df/#827_fix_hp_storage_refill

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

  7. finalise ThermalGridIT

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

  8. fmt

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

Commits on Aug 12, 2024

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

    # Conflicts:
#	CHANGELOG.md
#	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 12, 2024
    Configuration menu
    Copy the full SHA
    22a7bc9 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 Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b46f1e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

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

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

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

    @danielfeismann
    danielfeismann authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    625e46b View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

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

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

  2. add lastAmbientTemperature to energyDemandAndUpdateState

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

  3. change thermalDemands to boolean and introduce hp isRunning to therma… 

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

  4. missing thermalDemand changes and refactor logic for handling infeed … 

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

  5. provide lastAmbientTemperature to determineState

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

  6. provide lastAmbientTemperature as well to tests

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

  7. 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

  8. 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

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/#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

  6. 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

  7. 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

  8. 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

  9. 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

  10. 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

  11. 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

  12. 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

  13. 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

  14. 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

  15. 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

  16. 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

  17. 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/#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

  2. 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

  3. 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

  4. 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

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 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/#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

  8. 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

Commits on Sep 16, 2024

  1. 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

Commits on Sep 17, 2024

  1. 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

  2. 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
    3df14e4 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
#	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/#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

  2. 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

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 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

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/#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

  5. 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

  6. 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

  7. 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

  8. 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

  9. 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

  10. 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

  11. 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

  12. 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 '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

  10. 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