Skip to content

Commit dbacf9e

Browse files
authored
Merge pull request #278 from ie3-institute/sb/#148-replacingInvalidGridException
Replaced InvalidGridException with a logger warning
2 parents ec7d2f3 + 1eb680e commit dbacf9e

File tree

2 files changed

+53
-3
lines changed

2 files changed

+53
-3
lines changed

src/main/java/edu/ie3/datamodel/models/input/container/JointGridContainer.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@
55
*/
66
package edu.ie3.datamodel.models.input.container;
77

8-
import edu.ie3.datamodel.exceptions.InvalidGridException;
98
import edu.ie3.datamodel.graph.SubGridTopologyGraph;
109
import edu.ie3.datamodel.utils.ContainerUtils;
1110
import java.util.Objects;
11+
import org.slf4j.Logger;
12+
import org.slf4j.LoggerFactory;
1213

1314
/** Model class to hold input models for more than one galvanically separated subnet */
1415
public class JointGridContainer extends GridContainer {
1516
/** A graph describing the subnet dependencies */
1617
private final SubGridTopologyGraph subGridTopologyGraph;
1718

19+
private static final Logger logger = LoggerFactory.getLogger(JointGridContainer.class);
20+
1821
public JointGridContainer(
1922
String gridName,
2023
RawGridElements rawGrid,
@@ -46,9 +49,10 @@ public JointGridContainer(
4649
* @param subGridTopologyGraph The graph to check
4750
*/
4851
private void checkSubGridTopologyGraph(SubGridTopologyGraph subGridTopologyGraph) {
49-
if (subGridTopologyGraph.vertexSet().size() == 1)
50-
throw new InvalidGridException(
52+
if (subGridTopologyGraph.vertexSet().size() == 1) {
53+
logger.warn(
5154
"This joint grid model only contains one single grid. Consider using SubGridContainer.");
55+
}
5256
}
5357

5458
public SubGridTopologyGraph getSubGridTopologyGraph() {
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* © 2021. TU Dortmund University,
3+
* Institute of Energy Systems, Energy Efficiency and Energy Economics,
4+
* Research group Distribution grid planning and operation
5+
*/
6+
package edu.ie3.datamodel.models.input.container
7+
8+
import edu.ie3.test.common.GridTestData
9+
import spock.lang.Specification
10+
11+
class JointGridContainerTest extends Specification {
12+
private static final GRID_NAME = "single_grid"
13+
14+
private static final RawGridElements RAW_GRID = new RawGridElements(
15+
[GridTestData.nodeA] as Set,
16+
[] as Set,
17+
[] as Set,
18+
[] as Set,
19+
[] as Set,
20+
[] as Set)
21+
22+
private static final SystemParticipants SYSTEM_PARTICIPANTS = new SystemParticipants(
23+
[] as Set,
24+
[] as Set,
25+
[] as Set,
26+
[] as Set,
27+
[] as Set,
28+
[] as Set,
29+
[] as Set,
30+
[] as Set,
31+
[] as Set,
32+
[] as Set)
33+
34+
private static final GraphicElements GRAPHIC_ELEMENTS = new GraphicElements(
35+
[] as Set,
36+
[] as Set)
37+
38+
def "A single subgrid can be used to build a JointGridContainer"() {
39+
when:
40+
def jointGridContainer = new JointGridContainer(GRID_NAME, RAW_GRID, SYSTEM_PARTICIPANTS, GRAPHIC_ELEMENTS)
41+
42+
then:
43+
noExceptionThrown()
44+
jointGridContainer.subGridTopologyGraph.vertexSet().size() == 1
45+
}
46+
}

0 commit comments

Comments
 (0)