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

Refactoring of ThermalGrid.handleInfeed to fix thermal storage recharge correctly when empty #931

Open
wants to merge 35 commits into
base: dev
Choose a base branch
from
Open

Refactoring of ThermalGrid.handleInfeed to fix thermal storage recharge correctly when empty #931

wants to merge 35 commits into from
+368 −91

Commits on Aug 24, 2024

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

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

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

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

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

Commits on Aug 29, 2024

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

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

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 26, 2024

  1. 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/#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 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 Nov 1, 2024

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

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

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

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

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

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

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

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

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

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

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

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

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