Skip to content

Updated DataSourceClassDiagram.puml and DataSourceClassDiagram_draft.puml #312

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

Merged
merged 3 commits into from
Mar 30, 2021
Merged

Updated DataSourceClassDiagram.puml and DataSourceClassDiagram_draft.puml #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
247bb95
#286 Corrected some errors in DataSourceClassDiagram and removed impl…
avgprog Mar 27, 2021
4d3068a
Merge branch 'dev' into sb/#286-refactoringDataSourceClassDiagram
ckittl Mar 30, 2021
eed20af
Merge branch 'dev' into sb/#286-refactoringDataSourceClassDiagram
ckittl Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions docs/uml/main/DataSourceClassDiagram.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ interface ThermalSource {
{abstract} Set<ThermalStorageInput> getThermalStorages()
{abstract} Set<ThermalStorageInput> getThermalStorages(Set<OperatorInput>, Set<ThermalBusInput>)
{abstract} Set<ThermalHouseInput> getThermalHouses()
{abstract} Set<ThermalHouseInput> getThermalHouses(Set<OperatorInput> operators, Set<ThermalBusInput>)
{abstract} Set<ThermalHouseInput> getThermalHouses(Set<OperatorInput>, Set<ThermalBusInput>)
{abstract} Set<CylindricalStorageInput> getCylindricStorages()
{abstract} Set<CylindricalStorageInput> getCylindricStorages(Set<OperatorInput>, Set<ThermalBusInput>)
}
Expand All @@ -47,7 +47,7 @@ interface RawGridSource {
}
DataSource <|-- RawGridSource

interface SystemParticipantsSource{
interface SystemParticipantSource{
{abstract} Optional<SystemParticipants> getSystemParticipants()
{abstract} Set<BmInput> getBmPlants()
{abstract} Set<BmInput> getBmPlants(Set<NodeInput>, Set<OperatorInput>, Set<BmTypeInput>)
Expand All @@ -60,7 +60,7 @@ interface SystemParticipantsSource{
{abstract} Set<FixedFeedInInput> getFixedFeedIns()
{abstract} Set<FixedFeedInInput> getFixedFeedIns(Set<NodeInput>, Set<OperatorInput>)
{abstract} Set<HpInput> getHeatPumps()
{abstract} Set<HpInput> getHeatPumps(nodes, Set<OperatorInput>, Set<HpTypeInput>, Set<ThermalBusInput>)
{abstract} Set<HpInput> getHeatPumps(Set<NodeInput>, Set<OperatorInput>, Set<HpTypeInput>, Set<ThermalBusInput>)
{abstract} Set<LoadInput> getLoads()
{abstract} Set<LoadInput> getLoads(Set<NodeInput>, Set<OperatorInput>)
{abstract} Set<PvInput> getPvPlants()
Expand All @@ -70,7 +70,7 @@ interface SystemParticipantsSource{
{abstract} Set<WecInput> getWecPlants()
{abstract} Set<WecInput> getWecPlants(Set<NodeInput>, Set<OperatorInput>, Set<WecTypeInput>)
}
DataSource <|-- SystemParticipantsSource
DataSource <|-- SystemParticipantSource

interface GraphicSource {
{abstract} Optional<GraphicElements> getGraphicElements()
Expand Down Expand Up @@ -99,24 +99,24 @@ class CsvTimeSeriesMappingSource {
- TimeSeriesMappingFactory mappingFactory
- Map<UUID, UUID> mapping
}
CsvTimeSeriesMappingSource <|.. TimeSeriesMappingSource
CsvTimeSeriesMappingSource <|-- CsvDataSource
TimeSeriesMappingSource <|.. CsvTimeSeriesMappingSource
CsvDataSource <|-- CsvTimeSeriesMappingSource

interface TimeSeriesSource<V extends Value> {
{abstract} IndividualTimeSeries<V> getTimeSeries()
{abstract} IndividualTimeSeries<V> getTimeSeries(ClosedInterval<ZonedDateTime>))
{abstract} Optional<V> getValue(ZonedDateTime)
}
TimeSeriesSource <|-- DataSource
DataSource <|-- TimeSeriesSource

class CsvTimeSeriesSource<V extends Value> {
- IndividualTimeSeries<V> timeSeries
+ {static} CsvTimeSeriesSource<? extends Value> getSource(\n\tString,\n\tString,\n\tFileNamingStrategy,\n\tsvFileConnector.CsvIndividualTimeSeriesMetaInformation)
- IndividualTimeSeries<V> buildIndividualTimeSeries(\n\tUUID,\n\tfilePath,\n\tFunction<Map<String, String>,\n\tOptional<TimeBasedValue<V>>>)
- Optional<TimeBasedValue<V>> buildTimeBasedValue(\n\tMap<String, String>,\n\tClass<V>,\n\tTimeBasedSimpleValueFactory<V>)
}
CsvTimeSeriesSource <|.. TimeSeriesSource
CsvTimeSeriesSource <|-- CsvDataSource
TimeSeriesSource <|.. CsvTimeSeriesSource
CsvDataSource <|-- CsvTimeSeriesSource

interface DataConnector {
{abstract} shutdown()
Expand Down Expand Up @@ -178,9 +178,10 @@ Class CsvSystemParticipantSource {
- PvInputFactory pvInputFactory
- StorageInputFactory storageInputFactory
- WecInputFactory wecInputFactory
- EvcsInputFactory evcsInputFactory
+ CsvSystemParticipantSource(String, String, FileNamingStrategy, TypeSource, ThermalSource, RawGridSource)
}
SystemParticipantsSource <|.. CsvSystemParticipantSource
SystemParticipantSource <|.. CsvSystemParticipantSource
CsvDataSource <|-- CsvSystemParticipantSource

Class CsvGraphicSource {
Expand All @@ -197,7 +198,7 @@ Class CsvFileConnector {
- Map<Class<? extends UniqueEntity>, BufferedCsvWriter> entityWriters
- Map<UUID, BufferedCsvWriter> timeSeriesWriters
- FileNamingStrategy fileNamingStrategy
- String baseFolderName
- String baseDirectoryName
- {static} String FILE_ENDING
+ CsvFileConnector(String, FileNamingStrategy)
+ BufferedCsvWriter getOrInitWriter(Class<? extends UniqueEntity>, String[], String)
Expand Down
3 changes: 0 additions & 3 deletions docs/uml/main/DataSourceClassDiagram_draft.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ interface AssetDataSource {
}
AssetDataSource ..|> DataSource

interface ThermalSource
ThermalSource ..|> DataSource

interface TypeDataSource {
{abstract}Future<TypeData> fetchTypeData()
{abstract}Future<List<EVTypeModel>> fetchEvTypes()
Expand Down