Fix DanglingLine ID in Eurostag example network with tie-lines

Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
powsybl · Sep 24, 2024 · 988ca38 · 988ca38
1 parent d7bdbb4
commit 988ca38
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt b/ampl-converter/src/test/resources/inputs/eurostag-tutorial-example1-branches-tl.txt
@@ -2,7 +2,7 @@
 #"variant" "num" "bus1" "bus2" "3wt num" "sub.1" "sub.2" "r (pu)" "x (pu)" "g1 (pu)" "g2 (pu)" "b1 (pu)" "b2 (pu)" "cst ratio (pu)" "ratio tc" "phase tc" "p1 (MW)" "p2 (MW)" "q1 (MVar)" "q2 (MVar)" "patl1 (A)" "patl2 (A)" "merged" "fault" "curative" "id" "description"
 1 2 2 5 -1 2 5 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NHV1_XNODE1" "NHV1_XNODE1"
 1 3 5 3 -1 5 3 0.00103878 0.00900277 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 301.782 -300.434 116.442 -137.188 -99999.0 100.000 false 0 0 "XNODE1_NHV2" "XNODE1_NHV2"
-1 5 2 6 -1 2 6 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NVH1_XNODE2" "NVH1_XNODE2"
+1 5 2 6 -1 2 6 0.00103878 0.0138504 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 302.444 -301.316 98.7403 -116.525 100.000 -99999.0 false 0 0 "NHV1_XNODE2" "NHV1_XNODE2"
 1 6 6 3 -1 6 3 0.00103878 0.00900277 0.000722000 0.000722000 0.139346 0.139346 1.00000 -1 -1 301.782 -300.434 116.442 -137.188 -99999.0 100.000 false 0 0 "XNODE2_NHV2" "XNODE2_NHV2"
 1 7 1 2 -1 1 2 0.000184615 0.00769009 0.00000 0.00000 0.00000 0.00000 1.05263 -1 -1 605.558 -604.891 225.283 -197.480 -99999.0 -99999.0 false 0 0 "NGEN_NHV1" "NGEN_NHV1"
 1 8 3 4 -1 3 4 0.000210000 0.0179988 0.00000 0.00000 0.00000 0.00000 1.00067 1 -1 600.868 -600.000 274.377 -200.000 -99999.0 -99999.0 false 0 0 "NHV2_NLOAD" "NHV2_NLOAD"
diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml
@@ -14,7 +14,7 @@
                 <iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
             </iidm:busBreakerTopology>
             <iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
-            <iidm:danglingLine id="NVH1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
+            <iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
         </iidm:voltageLevel>
         <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
     </iidm:substation>
@@ -41,7 +41,7 @@
             </iidm:ratioTapChanger>
         </iidm:twoWindingsTransformer>
     </iidm:substation>
-    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NVH1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
+    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NHV1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
     <iidm:extension id="XNODE1_NHV2">
         <cdlbn:cgmesDanglingLineBoundaryNode isHvdc="false"/>
     </iidm:extension>

diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml
@@ -14,7 +14,7 @@
                 <iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
             </iidm:busBreakerTopology>
             <iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
-            <iidm:danglingLine id="NVH1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
+            <iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
         </iidm:voltageLevel>
         <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
     </iidm:substation>
@@ -42,7 +42,7 @@
         </iidm:twoWindingsTransformer>
     </iidm:substation>
     <iidm:tieLine id="NHV1_NHV2_1" danglingLineId1="NHV1_XNODE1" danglingLineId2="XNODE1_NHV2"/>
-    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NVH1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
+    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NHV1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
     <iidm:extension id="NHV1_NHV2_2">
         <clbn:cgmesLineBoundaryNode isHvdc="true"/>
     </iidm:extension>

diff --git a/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml b/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml
@@ -55,7 +55,7 @@
     </iidm:line>
     <iidm:line id="NHV1_NHV2_2" r="2.999999999999999" x="33.0" g1="1.0000000000005664E-6" b1="1.930000000000022E-4" g2="2.000000000000699E-6" b2="1.9300000000000567E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2" p1="302.4440612792969" q1="98.74027252197266" p2="-300.43389892578125" q2="-137.18849182128906">
         <iidm:alias type="pairingKey">XNODE2</iidm:alias>
+        <iidm:alias type="danglingLine1Id">NHV1_XNODE2</iidm:alias>
         <iidm:alias type="danglingLine2Id">XNODE2_NHV2</iidm:alias>
-        <iidm:alias type="danglingLine1Id">NVH1_XNODE2</iidm:alias>
     </iidm:line>
 </iidm:network>
diff --git a/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java b/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/TieLineReductionTest.java
@@ -41,7 +41,7 @@ void testOneSideTieLineReduction() {
         assertEquals(0, observer.getTieLineRemovedCount());
         reducer.reduce(network);
         assertEquals(2, observer.getTieLineRemovedCount());
-        assertEquals(List.of("P1", "P2", "VLGEN", "LOAD", "NGEN", "NGEN_NHV1", "NHV2_NLOAD", "sim1", "VLLOAD", "NHV1", "GEN", "VLHV1", "NHV1_XNODE1", "NLOAD", "NVH1_XNODE2"),
+        assertEquals(List.of("P1", "P2", "VLGEN", "LOAD", "NGEN", "NGEN_NHV1", "NHV2_NLOAD", "sim1", "VLLOAD", "NHV1", "GEN", "VLHV1", "NHV1_XNODE2", "NHV1_XNODE1", "NLOAD"),
                 network.getIdentifiables().stream().map(Identifiable::getId).toList());
     }
 

diff --git a/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_11/tieLineTerminalRefBug.xml
@@ -15,7 +15,7 @@
                 <iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
             </iidm:busBreakerTopology>
             <iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
-            <iidm:danglingLine id="NVH1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
+            <iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
         </iidm:voltageLevel>
         <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
     </iidm:substation>
@@ -43,5 +43,5 @@
         </iidm:twoWindingsTransformer>
     </iidm:substation>
     <iidm:tieLine id="NHV1_NHV2_1" danglingLineId1="NHV1_XNODE1" danglingLineId2="XNODE1_NHV2"/>
-    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NVH1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
+    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NHV1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
 </iidm:network>
diff --git a/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_12/tieLineTerminalRefBug.xml
@@ -15,7 +15,7 @@
                 <iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
             </iidm:busBreakerTopology>
             <iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
-            <iidm:danglingLine id="NVH1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
+            <iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
         </iidm:voltageLevel>
         <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
     </iidm:substation>
@@ -43,5 +43,5 @@
         </iidm:twoWindingsTransformer>
     </iidm:substation>
     <iidm:tieLine id="NHV1_NHV2_1" danglingLineId1="NHV1_XNODE1" danglingLineId2="XNODE1_NHV2"/>
-    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NVH1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
+    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NHV1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
 </iidm:network>
diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml
@@ -15,7 +15,7 @@
                 <iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
             </iidm:busBreakerTopology>
             <iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
-            <iidm:danglingLine id="NVH1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
+            <iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
         </iidm:voltageLevel>
         <iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
     </iidm:substation>
@@ -43,5 +43,5 @@
         </iidm:twoWindingsTransformer>
     </iidm:substation>
     <iidm:tieLine id="NHV1_NHV2_1" danglingLineId1="NHV1_XNODE1" danglingLineId2="XNODE1_NHV2"/>
-    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NVH1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
+    <iidm:tieLine id="NHV1_NHV2_2" danglingLineId1="NHV1_XNODE2" danglingLineId2="XNODE2_NHV2"/>
 </iidm:network>
diff --git a/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java b/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractAreaTest.java
@@ -56,7 +56,7 @@ void setUp() {
         vlload = network.getVoltageLevel("VLLOAD");
         dlXnode1A = network.getDanglingLine("NHV1_XNODE1");
         dlXnode1B = network.getDanglingLine("XNODE1_NHV2");
-        dlXnode2A = network.getDanglingLine("NVH1_XNODE2");
+        dlXnode2A = network.getDanglingLine("NHV1_XNODE2");
         dlXnode2B = network.getDanglingLine("XNODE2_NHV2");
         tieLine1 = network.getTieLine("NHV1_NHV2_1");
         tieLine2 = network.getTieLine("NHV1_NHV2_2");
@@ -449,7 +449,7 @@ public void removeEquipmentRemovesAreaBoundaryMergeAndDetach() {
         network = network.detach();
         controlAreaA = network.getArea("ControlArea_A");
         controlAreaB = network.getArea("ControlArea_B");
-        dlXnode2A = network.getDanglingLine("NVH1_XNODE2");
+        dlXnode2A = network.getDanglingLine("NHV1_XNODE2");
         tieLine2 = network.getTieLine("NHV1_NHV2_2");
 
         // Verify the cleanup listener is now effective on the detached network
@@ -480,7 +480,7 @@ public void mergeAndFlatten() {
         controlAreaB = network0.getArea("ControlArea_B");
         checkAreas(network0, network0, network0);
 
-        dlXnode2A = network0.getDanglingLine("NVH1_XNODE2");
+        dlXnode2A = network0.getDanglingLine("NHV1_XNODE2");
         tieLine2 = network0.getTieLine("NHV1_NHV2_2");
 
         // Verify the cleanup listener is always effective

diff --git a/...idm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java b/...idm-test/src/main/java/com/powsybl/iidm/network/test/EurostagTutorialExample1Factory.java
@@ -23,7 +23,7 @@ public final class EurostagTutorialExample1Factory {
     public static final String CASE_DATE = "2018-01-01T11:00:00+01:00";
     public static final String DANGLING_LINE_XNODE1_1 = "NHV1_XNODE1";
     public static final String DANGLING_LINE_XNODE1_2 = "XNODE1_NHV2";
-    public static final String DANGLING_LINE_XNODE2_1 = "NVH1_XNODE2";
+    public static final String DANGLING_LINE_XNODE2_1 = "NHV1_XNODE2";
     public static final String DANGLING_LINE_XNODE2_2 = "XNODE2_NHV2";
     public static final String VLHV1 = "VLHV1";
     public static final String VLHV2 = "VLHV2";
@@ -243,7 +243,7 @@ public static Network createWithTieLines(NetworkFactory networkFactory) {
                 .setDanglingLine1(nhv1xnode1.getId())
                 .setDanglingLine2(xnode1nhv2.getId())
                 .add();
-        DanglingLine nvh1xnode2 = network.getVoltageLevel(VLHV1).newDanglingLine()
+        DanglingLine nhv1xnode2 = network.getVoltageLevel(VLHV1).newDanglingLine()
                 .setId(DANGLING_LINE_XNODE2_1)
                 .setP0(0.0)
                 .setQ0(0.0)
@@ -267,7 +267,7 @@ public static Network createWithTieLines(NetworkFactory networkFactory) {
                 .add();
         network.newTieLine()
                 .setId(NHV1_NHV2_2)
-                .setDanglingLine1(nvh1xnode2.getId())
+                .setDanglingLine1(nhv1xnode2.getId())
                 .setDanglingLine2(xnode2nhv2.getId())
                 .add();
         network.getTieLine(NHV1_NHV2_1).getDanglingLine1().getTerminal()