Skip to content

Conversation

@sebastian-peter
Copy link
Member

@sebastian-peter sebastian-peter commented Dec 13, 2023

Resolves #957
Resolves #955 (documentation)

Also changed the type of controlStrategy to a simple String to allow for more flexible modeling

Merge first:

@sebastian-peter sebastian-peter added the model Related to the data model (conceptually, not to the implementation) label Dec 13, 2023
@sebastian-peter sebastian-peter added this to the Version 4.2 milestone Dec 13, 2023
@sebastian-peter sebastian-peter self-assigned this Dec 13, 2023
# Conflicts:
#	src/main/java/edu/ie3/datamodel/io/factory/input/participant/HpInputEntityData.java
Added em page
Added em attribute to participants
# Conflicts:
#	CHANGELOG.md
#	docs/readthedocs/models/input/participant/bm.rst
#	docs/readthedocs/models/input/participant/chp.rst
#	docs/readthedocs/models/input/participant/ev.rst
#	docs/readthedocs/models/input/participant/fixedfeedin.rst
#	docs/readthedocs/models/input/participant/hp.rst
#	docs/readthedocs/models/input/participant/load.rst
#	docs/readthedocs/models/input/participant/pv.rst
#	docs/readthedocs/models/input/participant/storage.rst
#	docs/readthedocs/models/input/participant/wec.rst
#	src/main/java/edu/ie3/datamodel/io/factory/input/participant/EmInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/source/EnergyManagementSource.java
#	src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy
@sebastian-peter sebastian-peter marked this pull request as ready for review January 17, 2024 14:42
Copy link
Contributor

@jo-bao jo-bao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Well and clean coded!

@sebastian-peter sebastian-peter merged commit ab133b3 into dev Feb 2, 2024
@sebastian-peter sebastian-peter deleted the sp/#957-spi-em branch February 2, 2024 15:30
@sebastian-peter sebastian-peter modified the milestones: Version 4.2, Version 5.0 Feb 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

model Related to the data model (conceptually, not to the implementation)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Have system participants reference the em entity EmInput should not be connected to the grid

2 participants