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

Refactor thermal grid energy demand #929

Merged
merged 37 commits into from
Nov 14, 2024
Merged

Refactor thermal grid energy demand #929

merged 37 commits into from
Nov 14, 2024

Commits on Aug 24, 2024

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

    …oLvl' into df/#000-Refactor-ThermalGird-energyDemand
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    2cf55aa View commit details
    Browse the repository at this point in the history

  2. Refactoring of ThermalGrid.energyGrid to distinguish between demand o… 

    …f house and storage
    @danielfeismann
    danielfeismann committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    6e9b40f View commit details
    Browse the repository at this point in the history

  3. fmt

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

Commits on Aug 26, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Aug 29, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand

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

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

    @danielfeismann
    danielfeismann authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    07a80ec 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/#928-Refactor-ThermalGird-energ… 

    …yDemand

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

Commits on Sep 17, 2024

  1. Merge branch 'refs/heads/dev' into df/#928-Refactor-ThermalGird-energ… 

    …yDemand

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

  2. Merge branch 'refs/heads/dev' into df/#928-Refactor-ThermalGird-energ… 

    …yDemand

# Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f2e8f1d 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/#928-Refactor-ThermalGird-energ… 

    …yDemand

# Conflicts:
#	CHANGELOG.md
    @danielfeismann
    danielfeismann committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    476686c 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/#928-Refactor-ThermalGird-energ… 

    …yDemand

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

Commits on Oct 15, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Oct 22, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Oct 25, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Oct 26, 2024

  1. remove unused parameter

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

Commits on Oct 28, 2024

  1. remove unused parameter

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

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

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

  3. fix scapegoat code smell because of unnecessary store before return

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

  4. Proposal for separating state and operation point calculation

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

  5. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Oct 29, 2024

  1. aligning states of HpModel

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

  2. add scala doc

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

Commits on Nov 1, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

  2. merging dev

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

Commits on Nov 5, 2024

  1. remove not necessary headOption

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

  2. break long line

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

  3. use wildcard for not used val

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

  4. rollback currentThermalGridState to thermalGridState

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

  5. scala doc format

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

Commits on Nov 7, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

Commits on Nov 13, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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

  2. Tiny bit of code cleanup

    @sebastian-peter
    sebastian-peter committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    f819146 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand

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

  2. Merge remote-tracking branch 'origin/df/#928-Refactor-ThermalGird-ene… 

    …rgyDemand' into df/#928-Refactor-ThermalGird-energyDemand
    @danielfeismann
    danielfeismann committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    4e8d348 View commit details
    Browse the repository at this point in the history

  3. grammar

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

  4. update scalaDoc

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

  5. Merge branch 'dev' into df/#928-Refactor-ThermalGird-energyDemand 

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