Skip to content

Conversation

@sebastian-peter
Copy link
Member

@sebastian-peter sebastian-peter commented Jan 3, 2024

Resolves #969, as preparation for #962
Resolves #830

Merge first:

@sebastian-peter sebastian-peter added the code quality Code readability or structure is improved label Jan 3, 2024
@sebastian-peter sebastian-peter added this to the Version 4.2 milestone Jan 3, 2024
@sebastian-peter sebastian-peter self-assigned this Jan 3, 2024
# Conflicts:
#	CHANGELOG.md
#	src/main/java/edu/ie3/datamodel/io/factory/input/OperatorInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/input/participant/SystemParticipantInputEntityFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/ConnectorResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/FlexOptionsResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/NodeResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/SwitchResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/SystemParticipantResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/result/ThermalResultFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeSeriesMappingFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeSeriesMetaInformationFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer2WTypeInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactory.java
#	src/main/java/edu/ie3/datamodel/io/source/EntitySource.java
#	src/main/java/edu/ie3/datamodel/io/source/RawGridSource.java
#	src/main/java/edu/ie3/datamodel/io/source/ResultEntitySource.java
#	src/main/java/edu/ie3/datamodel/io/source/SystemParticipantSource.java
#	src/main/java/edu/ie3/datamodel/io/source/ThermalSource.java
#	src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java
#	src/main/java/edu/ie3/datamodel/io/source/TypeSource.java
#	src/main/java/edu/ie3/datamodel/io/source/csv/CsvJointGridContainerSource.java
#	src/test/groovy/edu/ie3/datamodel/io/factory/result/FlexOptionsResultFactoryTest.groovy
#	src/test/groovy/edu/ie3/datamodel/io/factory/result/NodeResultFactoryTest.groovy
#	src/test/groovy/edu/ie3/datamodel/io/factory/result/SystemParticipantResultFactoryTest.groovy
#	src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
#	src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy
@sebastian-peter sebastian-peter marked this pull request as ready for review January 5, 2024 21:00
Copy link
Contributor

@t-ober t-ober left a comment

Choose a reason for hiding this comment

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

Did a quick review, looks good to me. If you are fine with a more superficial review, feel free to merge the PR 🙂

@sebastian-peter sebastian-peter merged commit 6c4aab0 into dev Jan 17, 2024
@sebastian-peter sebastian-peter deleted the sp/#969-EntitySource-refactor branch January 17, 2024 14:27
@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

code quality Code readability or structure is improved

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Refactor and abstract EntitySources and EntityData creation Find a common way to build typed grid elements and system participants?

2 participants