Bump powsybl-core to 5.3.0 (#523)

* integration of new powsybl-core version 5.3.0-alpha-2 * deal with tie lines in network-area diagrams * update test references for NAD * manage tie lines in single-line diagrams Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
powsybl · Jun 7, 2023 · 1a28286 · 1a28286
1 parent a9ef6b6
commit 1a28286
Show file tree

Hide file tree

Showing 58 changed files with 1,706 additions and 69 deletions.
diff --git a/diagram-test/src/main/java/com/powsybl/diagram/test/Networks.java b/diagram-test/src/main/java/com/powsybl/diagram/test/Networks.java
@@ -1942,4 +1942,35 @@ private static void addThreeFeedersPosition(Extendable<?> extendable,
  feederAdder3.withName(feederName3).withDirection(direction3).add();
  extensionAdder.add();
  }
+
+ public static Network createNetworkWithTieLineInVoltageLevel() {
+ Network network = createBusBreakerNetworkWithInternalBranches("tieLineWithinVoltageLevel", "test");
+ network.getLine("L11").remove();
+ String tieLineId = "B11_B12_1";
+ String xnodeId = "XNODE1";
+ DanglingLine b11xnode1 = network.getVoltageLevel("VL1").newDanglingLine().setId("B11_XNODE1").setR(1.5).setX(20.0).setG(0.0).setB(1.93E-4).setBus("B11").setUcteXnodeCode(xnodeId).add();
+ DanglingLine xnode1b12 = network.getVoltageLevel("VL1").newDanglingLine().setId("XNODE1_B12").setR(1.5).setX(13.0).setG(0.0).setB(1.93E-4).setBus("B12").setUcteXnodeCode(xnodeId).add();
+ network.newTieLine().setId(tieLineId).setDanglingLine1(b11xnode1.getId()).setDanglingLine2(xnode1b12.getId()).add();
+ network.getTieLine(tieLineId).getDanglingLine1().getTerminal().setP(302.4440612792969).setQ(98.74027252197266);
+ network.getTieLine(tieLineId).getDanglingLine2().getTerminal().setP(-300.43389892578125).setQ(-137.18849182128906);
+
+ return network;
+
+ }
+
+ public static Network createNetworkWithTieLineInSubstation() {
+ Network network = createBusBreakerNetworkWithInternalBranches("tieLineWithinSubstation", "test");
+ network.getLine("L12").remove();
+ String tieLineId = "B11_B21_1";
+ String xnodeId = "XNODE1";
+ DanglingLine b11xnode1 = network.getVoltageLevel("VL1").newDanglingLine().setId("B11_XNODE1").setR(1.5).setX(20.0).setG(0.0).setB(1.93E-4).setBus("B11").setUcteXnodeCode(xnodeId).add();
+ DanglingLine xnode1b21 = network.getVoltageLevel("VL2").newDanglingLine().setId("XNODE1_B21").setR(1.5).setX(13.0).setG(0.0).setB(1.93E-4).setBus("B21").setUcteXnodeCode(xnodeId).add();
+ network.newTieLine().setId(tieLineId).setDanglingLine1(b11xnode1.getId()).setDanglingLine2(xnode1b21.getId()).add();
+ network.getTieLine(tieLineId).getDanglingLine1().getTerminal().setP(302.4440612792969).setQ(98.74027252197266);
+ network.getTieLine(tieLineId).getDanglingLine2().getTerminal().setP(-300.43389892578125).setQ(-137.18849182128906);
+
+ return network;
+
+ }
+
 }
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/build/iidm/NetworkGraphBuilder.java b/network-area-diagram/src/main/java/com/powsybl/nad/build/iidm/NetworkGraphBuilder.java
@@ -111,11 +111,19 @@ private void visitThreeWindingsTransformer(VoltageLevel vl, ThreeWindingsTransfo
  }
 
  private void visitDanglingLine(DanglingLine dl, Graph graph) {
- BoundaryNode boundaryNode = new BoundaryNode(idProvider.createId(dl), dl.getId(), dl.getNameOrId());
- BusNode boundaryBusNode = new BoundaryBusNode(idProvider.createId(dl), dl.getId());
- boundaryNode.addBusNode(boundaryBusNode);
- graph.addNode(boundaryNode);
- addEdge(graph, dl, boundaryNode, boundaryBusNode);
+ if (!dl.isPaired()) {
+ BoundaryNode boundaryNode = new BoundaryNode(idProvider.createId(dl), dl.getId(), dl.getNameOrId());
+ BusNode boundaryBusNode = new BoundaryBusNode(idProvider.createId(dl), dl.getId());
+ boundaryNode.addBusNode(boundaryBusNode);
+ graph.addNode(boundaryNode);
+ addEdge(graph, dl, boundaryNode, boundaryBusNode);
+ } else {
+ dl.getTieLine().ifPresent(tieLine -> visitTieLine(tieLine, dl, graph));
+ }
+ }
+
+ private void visitTieLine(TieLine tieLine, DanglingLine dl, Graph graph) {
+ addEdge(graph, tieLine, dl.getTerminal().getVoltageLevel(), BranchEdge.TIE_LINE_EDGE);
  }
 
  private void visitHvdcConverterStation(HvdcConverterStation<?> converterStation, Graph graph) {

diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/model/BranchEdge.java b/network-area-diagram/src/main/java/com/powsybl/nad/model/BranchEdge.java
@@ -33,6 +33,7 @@ public int getNum() {
  public static final String LINE_EDGE = "LineEdge";
  public static final String HVDC_LINE_EDGE = "HvdcLineEdge";
  public static final String DANGLING_LINE_EDGE = "DanglingLineEdge";
+ public static final String TIE_LINE_EDGE = "TieLineEdge";
 
  private List<Point> points1 = Collections.emptyList();
  private List<Point> points2 = Collections.emptyList();

diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/StyleProvider.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/StyleProvider.java
@@ -25,6 +25,7 @@ public interface StyleProvider {
  String HVDC_EDGE_CLASS = CLASSES_PREFIX + "hvdc-edge";
  String THREE_WT_EDGES_CLASS = CLASSES_PREFIX + "3wt-edges";
  String DANGLING_LINE_EDGE_CLASS = CLASSES_PREFIX + "dangling-line-edge";
+ String TIE_LINE_EDGE_CLASS = CLASSES_PREFIX + "tie-line-edge";
  String TEXT_EDGES_CLASS = CLASSES_PREFIX + "text-edges";
  String EDGE_INFOS_CLASS = CLASSES_PREFIX + "edge-infos";
  String EDGE_LABEL_CLASS = CLASSES_PREFIX + "edge-label";

diff --git a/...ork-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/AbstractVoltageStyleProvider.java b/...ork-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/AbstractVoltageStyleProvider.java
@@ -104,6 +104,8 @@ protected Optional<String> getBaseVoltageStyle(Edge edge) {
  return Optional.of(HVDC_EDGE_CLASS);
  } else if (branchType.equals(BranchEdge.DANGLING_LINE_EDGE)) {
  return Optional.of(DANGLING_LINE_EDGE_CLASS);
+ } else if (branchType.equals(BranchEdge.TIE_LINE_EDGE)) {
+ return Optional.of(TIE_LINE_EDGE_CLASS);
  }
  } else if (edge instanceof ThreeWtEdge) {
  Terminal terminal = network.getThreeWindingsTransformer(edge.getEquipmentId())

diff --git a/network-area-diagram/src/main/resources/nominalStyle.css b/network-area-diagram/src/main/resources/nominalStyle.css
@@ -5,7 +5,7 @@
 .nad-vl-nodes .nad-busnode {fill: var(--nad-vl-color, lightblue)}
 .nad-vl-nodes circle.nad-unknown-busnode {stroke: lightgrey; stroke-width: 5; stroke-dasharray: 5,5; fill: none}
 .nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 40}
-.nad-dangling-line-edge {fill: var(--nad-vl-color, lighgrey)}
+.nad-branch-edges .nad-tie-line-edge .nad-edge-path {stroke-width: 7}
 .nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}
 .nad-state-out .nad-arrow-in {visibility: hidden}
 .nad-state-in .nad-arrow-out {visibility: hidden}

diff --git a/network-area-diagram/src/main/resources/topologicalStyle.css b/network-area-diagram/src/main/resources/topologicalStyle.css
@@ -5,7 +5,7 @@
 .nad-vl-nodes .nad-busnode {fill: var(--nad-vl-color, lightgrey)}
 .nad-vl-nodes circle.nad-unknown-busnode {stroke: var(--nad-vl-color, #808080); stroke-width: 5; stroke-dasharray: 5,5; fill: none}
 .nad-hvdc-edge polyline.nad-hvdc {stroke: grey; stroke-width: 40}
-.nad-dangling-line-edge {stroke: var(--nad-vl-color, lightgrey); stroke-width: 1; fill: none}
+.nad-branch-edges .nad-tie-line-edge .nad-edge-path {stroke-width: 7}
 .nad-pst-arrow {stroke: #6a6a6a; stroke-width: 4; stroke-linecap: round; fill: none}
 .nad-state-out .nad-arrow-in {visibility: hidden}
 .nad-state-in .nad-arrow-out {visibility: hidden}

diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/TieLineTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/TieLineTest.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package com.powsybl.nad.svg;
+
+import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
+import com.powsybl.nad.AbstractTest;
+import com.powsybl.nad.layout.LayoutParameters;
+import com.powsybl.nad.svg.iidm.DefaultLabelProvider;
+import com.powsybl.nad.svg.iidm.NominalVoltageStyleProvider;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Sophie Frasnedo <sophie.frasnedo at rte-france.com>
+ */
+class TieLineTest extends AbstractTest {
+
+ @BeforeEach
+ void setup() {
+ setLayoutParameters(new LayoutParameters());
+ setSvgParameters(new SvgParameters()
+ .setSvgWidthAndHeightAdded(true)
+ .setFixedWidth(800));
+ }
+
+ @Override
+ protected StyleProvider getStyleProvider(Network network) {
+ return new NominalVoltageStyleProvider(network);
+ }
+
+ @Override
+ protected LabelProvider getLabelProvider(Network network) {
+ return new DefaultLabelProvider(network, getSvgParameters()) {
+ };
+ }
+
+ @Test
+ void testTieLine() {
+ Network network = EurostagTutorialExample1Factory.createWithTieLine();
+ assertEquals(toString("/tie_line.svg"), generateSvgString(network, "/tie_line.svg"));
+ }
+
+}
diff --git a/network-area-diagram/src/test/resources/3wt.svg b/network-area-diagram/src/test/resources/3wt.svg
diff --git a/network-area-diagram/src/test/resources/3wt_disconnected.svg b/network-area-diagram/src/test/resources/3wt_disconnected.svg
diff --git a/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg b/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg
diff --git a/network-area-diagram/src/test/resources/3wt_partial.svg b/network-area-diagram/src/test/resources/3wt_partial.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus.svg b/network-area-diagram/src/test/resources/IEEE_118_bus.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg b/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg b/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus.svg b/network-area-diagram/src/test/resources/IEEE_14_bus.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg b/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_24_bus.svg b/network-area-diagram/src/test/resources/IEEE_24_bus.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_30_bus.svg b/network-area-diagram/src/test/resources/IEEE_30_bus.svg
diff --git a/network-area-diagram/src/test/resources/IEEE_57_bus.svg b/network-area-diagram/src/test/resources/IEEE_57_bus.svg
diff --git a/network-area-diagram/src/test/resources/current_limits.svg b/network-area-diagram/src/test/resources/current_limits.svg
diff --git a/network-area-diagram/src/test/resources/dangling_line_connected.svg b/network-area-diagram/src/test/resources/dangling_line_connected.svg
diff --git a/network-area-diagram/src/test/resources/dangling_line_disconnected.svg b/network-area-diagram/src/test/resources/dangling_line_disconnected.svg
diff --git a/network-area-diagram/src/test/resources/detailed_text_node.svg b/network-area-diagram/src/test/resources/detailed_text_node.svg
diff --git a/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg b/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg