From 36ab512f9557c8a24da4559a473633ffabc0241c Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 19 Sep 2022 08:10:23 +0200 Subject: [PATCH 1/6] persist em input --- src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java | 4 +++- .../datamodel/models/input/container/SystemParticipants.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java b/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java index 399f33e3a..46839c364 100644 --- a/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java +++ b/src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java @@ -192,6 +192,7 @@ public void persistJointGrid(JointGridContainer jointGridContainer) { Set pvPlants = systemParticipants.getPvPlants(); Set storages = systemParticipants.getStorages(); Set wecPlants = systemParticipants.getWecPlants(); + Set emSystems = systemParticipants.getEmSystems(); // get graphic elements (just for better readability, we could also just get them directly // below) @@ -231,7 +232,8 @@ public void persistJointGrid(JointGridContainer jointGridContainer) { loads, pvPlants, storages, - wecPlants) + wecPlants, + emSystems) .flatMap(Collection::stream) .map(Extractor::extractOperator) .flatMap(Optional::stream) diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java index f08be2cd3..9cf96d239 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java @@ -106,7 +106,7 @@ public SystemParticipants(Collection systemParticipants) { /** * Create an instance based on a list of {@link SystemParticipantInput} entities * - * @param systemParticipants list of system participants this container instance should created + * @param systemParticipants list of system participants this container instance should be created * from */ public SystemParticipants(List systemParticipants) { @@ -182,6 +182,7 @@ public final List allEntitiesAsList() { allEntities.addAll(pvPlants); allEntities.addAll(storages); allEntities.addAll(wecPlants); + allEntities.addAll(emSystems); return Collections.unmodifiableList(allEntities); } @@ -205,7 +206,7 @@ public Set getEvs() { return evs; } - /** @return unmodifiable Set of all fixed feed in in this grid */ + /** @return unmodifiable Set of all fixed feed in this grid */ public Set getFixedFeedIns() { return Collections.unmodifiableSet(fixedFeedIns); } From 492fdfeccf773e0c533498d267e3dadadb90a2d3 Mon Sep 17 00:00:00 2001 From: t-ober <63147366+t-ober@users.noreply.github.com> Date: Mon, 19 Sep 2022 08:21:03 +0200 Subject: [PATCH 2/6] s Co-authored-by: sonatype-lift[bot] <37194012+sonatype-lift[bot]@users.noreply.github.com> --- .../datamodel/models/input/container/SystemParticipants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java index 9cf96d239..95d7d9e4f 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java @@ -206,7 +206,7 @@ public Set getEvs() { return evs; } - /** @return unmodifiable Set of all fixed feed in this grid */ + /** Returns unmodifiable Set of all fixed feed in this grid. public Set getFixedFeedIns() { return Collections.unmodifiableSet(fixedFeedIns); } From 864b981cc0664aa5b5a637e8978784b203055088 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 20 Sep 2022 15:36:57 +0200 Subject: [PATCH 3/6] fmt --- .../models/input/container/SystemParticipants.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java index 95d7d9e4f..7cd151c95 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java @@ -206,12 +206,12 @@ public Set getEvs() { return evs; } - /** Returns unmodifiable Set of all fixed feed in this grid. - public Set getFixedFeedIns() { - return Collections.unmodifiableSet(fixedFeedIns); - } - - /** @return unmodifiable Set of all heat pumps in this grid */ + /** + * Returns unmodifiable Set of all fixed feed in this grid. public Set + * getFixedFeedIns() { return Collections.unmodifiableSet(fixedFeedIns); } + * + *

/** @return unmodifiable Set of all heat pumps in this grid + */ public Set getHeatPumps() { return Collections.unmodifiableSet(heatPumps); } From b13024f0519faa1c09263dbba740aabab9b2e4a2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 20 Sep 2022 15:46:12 +0200 Subject: [PATCH 4/6] Revert "s" This reverts commit 492fdfec --- .../models/input/container/SystemParticipants.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java index 7cd151c95..9cf96d239 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java @@ -206,12 +206,12 @@ public Set getEvs() { return evs; } - /** - * Returns unmodifiable Set of all fixed feed in this grid. public Set - * getFixedFeedIns() { return Collections.unmodifiableSet(fixedFeedIns); } - * - *

/** @return unmodifiable Set of all heat pumps in this grid - */ + /** @return unmodifiable Set of all fixed feed in this grid */ + public Set getFixedFeedIns() { + return Collections.unmodifiableSet(fixedFeedIns); + } + + /** @return unmodifiable Set of all heat pumps in this grid */ public Set getHeatPumps() { return Collections.unmodifiableSet(heatPumps); } From c4dc520e5dccff0d3a5677fc78bce5d1a84f3874 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 21 Sep 2022 19:28:04 +0200 Subject: [PATCH 5/6] Added to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da28d1870..e46e25bc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cleaned up `IndividualTimeSeriesMetaInformation`-related methods in `CsvFileConnector` [#544](https://github.com/ie3-institute/PowerSystemDataModel/issues/544) - Fixed spotlessApply handling for `.groovy` files [#637](https://github.com/ie3-institute/PowerSystemDataModel/issues/637) - Re-using SQL connection per default [#653](https://github.com/ie3-institute/PowerSystemDataModel/issues/653) +- Persisting EmInputs [#665](https://github.com/ie3-institute/PowerSystemDataModel/issues/665) ### Changed - BREAKING: PvInput Model parameter name height changed to elevationAngle [#393](https://github.com/ie3-institute/PowerSystemDataModel/issues/393) :warning: From 6c86c8c9d0c127339c070e8dd1139961af1d95c5 Mon Sep 17 00:00:00 2001 From: Sebastian Peter Date: Wed, 21 Sep 2022 19:43:12 +0200 Subject: [PATCH 6/6] Fixing test --- .../io/source/csv/CsvSystemParticipantSourceTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy index 81ac6e7a9..cb3a28799 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy @@ -44,7 +44,7 @@ class CsvSystemParticipantSourceTest extends Specification implements CsvTestDat then: systemParticipantsOpt.present systemParticipantsOpt.ifPresent({ systemParticipants -> - assert (systemParticipants.allEntitiesAsList().size() == 10) + assert (systemParticipants.allEntitiesAsList().size() == 11) assert (systemParticipants.getPvPlants().first().uuid == sptd.pvInput.uuid) assert (systemParticipants.getBmPlants().first().uuid == sptd.bmInput.uuid) assert (systemParticipants.getChpPlants().first().uuid == sptd.chpInput.uuid)