From e31dd05e62dbfbffcab0e2e9aef03d1f2a4befe0 Mon Sep 17 00:00:00 2001 From: ahamshubham Date: Thu, 18 Feb 2021 10:55:11 +0100 Subject: [PATCH 1/3] #148 Replaced InvalidGridException with a logger warning --- .../models/input/container/JointGridContainer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java b/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java index 65bca70c0..93c673289 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java @@ -5,16 +5,19 @@ */ package edu.ie3.datamodel.models.input.container; -import edu.ie3.datamodel.exceptions.InvalidGridException; import edu.ie3.datamodel.graph.SubGridTopologyGraph; import edu.ie3.datamodel.utils.ContainerUtils; import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** Model class to hold input models for more than one galvanically separated subnet */ public class JointGridContainer extends GridContainer { /** A graph describing the subnet dependencies */ private final SubGridTopologyGraph subGridTopologyGraph; + private static final Logger logger = LoggerFactory.getLogger(JointGridContainer.class); + public JointGridContainer( String gridName, RawGridElements rawGrid, @@ -47,7 +50,7 @@ public JointGridContainer( */ private void checkSubGridTopologyGraph(SubGridTopologyGraph subGridTopologyGraph) { if (subGridTopologyGraph.vertexSet().size() == 1) - throw new InvalidGridException( + logger.warn( "This joint grid model only contains one single grid. Consider using SubGridContainer."); } From 66c5a61b952ff54202426522cc4f2e9b4aeb9a52 Mon Sep 17 00:00:00 2001 From: ahamshubham Date: Mon, 22 Feb 2021 19:07:22 +0100 Subject: [PATCH 2/3] #278 Tests added for checking creation of a JointGridContainer with a single subgrid --- .../input/container/JointGridContainer.java | 3 +- .../container/JointGridContainerTest.groovy | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy diff --git a/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java b/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java index 93c673289..022c9d202 100644 --- a/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java +++ b/src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java @@ -49,9 +49,10 @@ public JointGridContainer( * @param subGridTopologyGraph The graph to check */ private void checkSubGridTopologyGraph(SubGridTopologyGraph subGridTopologyGraph) { - if (subGridTopologyGraph.vertexSet().size() == 1) + if (subGridTopologyGraph.vertexSet().size() == 1) { logger.warn( "This joint grid model only contains one single grid. Consider using SubGridContainer."); + } } public SubGridTopologyGraph getSubGridTopologyGraph() { diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy new file mode 100644 index 000000000..e7841d4c8 --- /dev/null +++ b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy @@ -0,0 +1,46 @@ +/* + * © 2021. TU Dortmund University, + * Institute of Energy Systems, Energy Efficiency and Energy Economics, + * Research group Distribution grid planning and operation + */ +package edu.ie3.datamodel.models.input.container + +import edu.ie3.test.common.GridTestData +import spock.lang.Specification + +class JointGridContainerTest extends Specification { + public static final gridName = "single_grid" + + private static final RawGridElements rawGrid = new RawGridElements( + [GridTestData.nodeA] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set) + + private static final SystemParticipants systemParticipants = new SystemParticipants( + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set, + [] as Set) + + private static final GraphicElements graphicElements = new GraphicElements( + [] as Set, + [] as Set) + + def "A single subgrid can be used to build a JointGridContainer"() { + when: + def jointGridContainer = new JointGridContainer(gridName, rawGrid, systemParticipants, graphicElements) + + then: + noExceptionThrown() + jointGridContainer.subGridTopologyGraph.vertexSet().size() == 1 + } +} From 1a0b9b060cd37ce5b5f8ad79a94484f7e32360a6 Mon Sep 17 00:00:00 2001 From: ahamshubham Date: Mon, 22 Feb 2021 19:16:40 +0100 Subject: [PATCH 3/3] #278 Changed fieldnames for static final fields --- .../input/container/JointGridContainerTest.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy index e7841d4c8..24859f48d 100644 --- a/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy @@ -9,9 +9,9 @@ import edu.ie3.test.common.GridTestData import spock.lang.Specification class JointGridContainerTest extends Specification { - public static final gridName = "single_grid" + private static final GRID_NAME = "single_grid" - private static final RawGridElements rawGrid = new RawGridElements( + private static final RawGridElements RAW_GRID = new RawGridElements( [GridTestData.nodeA] as Set, [] as Set, [] as Set, @@ -19,7 +19,7 @@ class JointGridContainerTest extends Specification { [] as Set, [] as Set) - private static final SystemParticipants systemParticipants = new SystemParticipants( + private static final SystemParticipants SYSTEM_PARTICIPANTS = new SystemParticipants( [] as Set, [] as Set, [] as Set, @@ -31,13 +31,13 @@ class JointGridContainerTest extends Specification { [] as Set, [] as Set) - private static final GraphicElements graphicElements = new GraphicElements( + private static final GraphicElements GRAPHIC_ELEMENTS = new GraphicElements( [] as Set, [] as Set) def "A single subgrid can be used to build a JointGridContainer"() { when: - def jointGridContainer = new JointGridContainer(gridName, rawGrid, systemParticipants, graphicElements) + def jointGridContainer = new JointGridContainer(GRID_NAME, RAW_GRID, SYSTEM_PARTICIPANTS, GRAPHIC_ELEMENTS) then: noExceptionThrown()