Skip to content

Commit

Permalink
Update reference test
Browse files Browse the repository at this point in the history 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
  • Loading branch information
@tadam50
tadam50 committed Mar 6, 2024
1 parent e4f5fe0 commit bfdc273
Show file tree
Hide file tree
Showing 10 changed files with 1,496 additions and 1,496 deletions.
4 changes: 2 additions & 2 deletions ...gram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase13ZoneGraph.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ void testInvalidZoneGraphMatrix() {
SubstationLayoutFactory sFactory = new HorizontalSubstationLayoutFactory();
VoltageLevelLayoutFactory vFactory = new PositionVoltageLevelLayoutFactory();
MatrixZoneLayoutFactory mFactory = new MatrixZoneLayoutFactory(substationsIds);

PowsyblException e = assertThrows(PowsyblException.class, () -> mFactory.create(g, pFinderFactory, sFactory, vFactory));
Layout layout = mFactory.create(g, pFinderFactory, sFactory, vFactory);
PowsyblException e = assertThrows(PowsyblException.class, () -> layout.run(layoutParameters));
assertEquals("Substation 'A' was not found in zone graph 'B_C'", e.getMessage());
}
}
92 changes: 46 additions & 46 deletions ...le-line-diagram/single-line-diagram-core/src/test/resources/TestCase12ZoneGraphHHRaw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"name" : "vl1",
"nominalVoltage" : 380.0
},
"x" : 110.0,
"y" : 330.0,
"x" : 111.0,
"y" : 331.0,
"nodes" : [ {
"type" : "INTERNAL",
"id" : "INTERNAL_vl1_dgen1-bgen1",
Expand Down Expand Up @@ -2812,8 +2812,8 @@
"name" : "vl2",
"nominalVoltage" : 225.0
},
"x" : 1040.0,
"y" : 330.0,
"x" : 1041.0,
"y" : 331.0,
"nodes" : [ {
"type" : "INTERNAL",
"id" : "INTERNAL_vl2_dgen4-bgen4",
Expand Down Expand Up @@ -4464,8 +4464,8 @@
"name" : "vl3",
"nominalVoltage" : 225.0
},
"x" : 1690.0,
"y" : 330.0,
"x" : 1691.0,
"y" : 331.0,
"nodes" : [ {
"type" : "INTERNAL",
"id" : "INTERNAL_vl3_dload4-bload4",
Expand Down Expand Up @@ -5300,8 +5300,8 @@
"id" : "trf1",
"componentType" : "TWO_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 750.0,
"y" : 270.0,
"x" : 751.0,
"y" : 271.0,
"orientation" : "RIGHT",
"name" : "trf1",
"equipmentId" : "trf1",
Expand All @@ -5320,8 +5320,8 @@
"id" : "trf2",
"componentType" : "TWO_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 1020.0,
"y" : 499.5,
"x" : 1021.0,
"y" : 500.5,
"orientation" : "DOWN",
"name" : "trf2",
"equipmentId" : "trf2",
Expand All @@ -5340,8 +5340,8 @@
"id" : "trf3",
"componentType" : "TWO_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 975.0,
"y" : 789.0,
"x" : 976.0,
"y" : 790.0,
"orientation" : "RIGHT",
"name" : "trf3",
"equipmentId" : "trf3",
Expand All @@ -5360,8 +5360,8 @@
"id" : "trf4",
"componentType" : "TWO_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 990.0,
"y" : 514.5,
"x" : 991.0,
"y" : 515.5,
"name" : "trf4",
"equipmentId" : "trf4",
"voltageLevelInfosLeg1" : {
Expand All @@ -5379,8 +5379,8 @@
"id" : "trf5",
"componentType" : "TWO_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 1670.0,
"y" : 514.5,
"x" : 1671.0,
"y" : 515.5,
"orientation" : "DOWN",
"name" : "trf5",
"equipmentId" : "trf5",
Expand All @@ -5399,8 +5399,8 @@
"id" : "trf6",
"componentType" : "THREE_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 1415.0,
"y" : 150.0,
"x" : 1416.0,
"y" : 151.0,
"name" : "trf6",
"equipmentId" : "trf6",
"voltageLevelInfosLeg1" : {
Expand All @@ -5423,8 +5423,8 @@
"id" : "trf7",
"componentType" : "THREE_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 1365.0,
"y" : 120.0,
"x" : 1366.0,
"y" : 121.0,
"name" : "trf7",
"equipmentId" : "trf7",
"voltageLevelInfosLeg1" : {
Expand All @@ -5447,8 +5447,8 @@
"id" : "trf8",
"componentType" : "THREE_WINDINGS_TRANSFORMER",
"fictitious" : true,
"x" : 1465.0,
"y" : 909.0,
"x" : 1466.0,
"y" : 910.0,
"orientation" : "DOWN",
"name" : "trf8",
"equipmentId" : "trf8",
Expand All @@ -5474,133 +5474,133 @@
"node1" : "trf1_ONE",
"node2" : "trf1"
} ],
"snakeLine" : [ 285.0, 330.0, 285.0, 270.0, 750.0, 270.0 ]
"snakeLine" : [ 286.0, 331.0, 286.0, 271.0, 751.0, 271.0 ]
}, {
"id" : "EDGE_trf1_TWO",
"nodes" : [ {
"node1" : "trf1_TWO",
"node2" : "trf1"
} ],
"snakeLine" : [ 1215.0, 330.0, 1215.0, 270.0, 750.0, 270.0 ]
"snakeLine" : [ 1216.0, 331.0, 1216.0, 271.0, 751.0, 271.0 ]
}, {
"id" : "EDGE_trf2_ONE",
"nodes" : [ {
"node1" : "trf2_ONE",
"node2" : "trf2"
} ],
"snakeLine" : [ 835.0, 330.0, 835.0, 240.0, 1020.0, 240.0, 1020.0, 499.5 ]
"snakeLine" : [ 836.0, 331.0, 836.0, 241.0, 1021.0, 241.0, 1021.0, 500.5 ]
}, {
"id" : "EDGE_trf2_TWO",
"nodes" : [ {
"node1" : "trf2_TWO",
"node2" : "trf2"
} ],
"snakeLine" : [ 1515.0, 699.0, 1515.0, 759.0, 1020.0, 759.0, 1020.0, 499.5 ]
"snakeLine" : [ 1516.0, 700.0, 1516.0, 760.0, 1021.0, 760.0, 1021.0, 500.5 ]
}, {
"id" : "EDGE_trf3_ONE",
"nodes" : [ {
"node1" : "trf3_ONE",
"node2" : "trf3"
} ],
"snakeLine" : [ 385.0, 699.0, 385.0, 789.0, 975.0, 789.0 ]
"snakeLine" : [ 386.0, 700.0, 386.0, 790.0, 976.0, 790.0 ]
}, {
"id" : "EDGE_trf3_TWO",
"nodes" : [ {
"node1" : "trf3_TWO",
"node2" : "trf3"
} ],
"snakeLine" : [ 1565.0, 699.0, 1565.0, 789.0, 975.0, 789.0 ]
"snakeLine" : [ 1566.0, 700.0, 1566.0, 790.0, 976.0, 790.0 ]
}, {
"id" : "EDGE_trf4_ONE",
"nodes" : [ {
"node1" : "trf4_ONE",
"node2" : "trf4"
} ],
"snakeLine" : [ 785.0, 699.0, 785.0, 819.0, 990.0, 819.0, 990.0, 514.5 ]
"snakeLine" : [ 786.0, 700.0, 786.0, 820.0, 991.0, 820.0, 991.0, 515.5 ]
}, {
"id" : "EDGE_trf4_TWO",
"nodes" : [ {
"node1" : "trf4_TWO",
"node2" : "trf4"
} ],
"snakeLine" : [ 1315.0, 330.0, 1315.0, 210.0, 990.0, 210.0, 990.0, 514.5 ]
"snakeLine" : [ 1316.0, 331.0, 1316.0, 211.0, 991.0, 211.0, 991.0, 515.5 ]
}, {
"id" : "EDGE_trf5_ONE",
"nodes" : [ {
"node1" : "trf5_ONE",
"node2" : "trf5"
} ],
"snakeLine" : [ 435.0, 330.0, 435.0, 180.0, 1670.0, 180.0, 1670.0, 514.5 ]
"snakeLine" : [ 436.0, 331.0, 436.0, 181.0, 1671.0, 181.0, 1671.0, 515.5 ]
}, {
"id" : "EDGE_trf5_TWO",
"nodes" : [ {
"node1" : "trf5_TWO",
"node2" : "trf5"
} ],
"snakeLine" : [ 1765.0, 674.0, 1765.0, 849.0, 1670.0, 849.0, 1670.0, 514.5 ]
"snakeLine" : [ 1766.0, 675.0, 1766.0, 850.0, 1671.0, 850.0, 1671.0, 515.5 ]
}, {
"id" : "EDGE_trf6_ONE",
"nodes" : [ {
"node1" : "trf6_ONE",
"node2" : "trf6"
} ],
"snakeLine" : [ 485.0, 330.0, 485.0, 150.0, 1415.0, 150.0 ]
"snakeLine" : [ 486.0, 331.0, 486.0, 151.0, 1416.0, 151.0 ]
}, {
"id" : "EDGE_trf6_TWO",
"nodes" : [ {
"node1" : "trf6_TWO",
"node2" : "trf6"
} ],
"snakeLine" : [ 1415.0, 330.0, 1415.0, 150.0 ]
"snakeLine" : [ 1416.0, 331.0, 1416.0, 151.0 ]
}, {
"id" : "EDGE_trf6_THREE",
"nodes" : [ {
"node1" : "trf6_THREE",
"node2" : "trf6"
} ],
"snakeLine" : [ 1815.0, 330.0, 1815.0, 150.0, 1415.0, 150.0 ]
"snakeLine" : [ 1816.0, 331.0, 1816.0, 151.0, 1416.0, 151.0 ]
}, {
"id" : "EDGE_trf7_ONE",
"nodes" : [ {
"node1" : "trf7_ONE",
"node2" : "trf7"
} ],
"snakeLine" : [ 535.0, 699.0, 535.0, 879.0, 960.0, 879.0, 960.0, 120.0, 1365.0, 120.0 ]
"snakeLine" : [ 536.0, 700.0, 536.0, 880.0, 961.0, 880.0, 961.0, 121.0, 1366.0, 121.0 ]
}, {
"id" : "EDGE_trf7_TWO",
"nodes" : [ {
"node1" : "trf7_TWO",
"node2" : "trf7"
} ],
"snakeLine" : [ 1365.0, 330.0, 1365.0, 120.0 ]
"snakeLine" : [ 1366.0, 331.0, 1366.0, 121.0 ]
}, {
"id" : "EDGE_trf7_THREE",
"nodes" : [ {
"node1" : "trf7_THREE",
"node2" : "trf7"
} ],
"snakeLine" : [ 1865.0, 674.0, 1865.0, 879.0, 1640.0, 879.0, 1640.0, 120.0, 1365.0, 120.0 ]
"snakeLine" : [ 1866.0, 675.0, 1866.0, 880.0, 1641.0, 880.0, 1641.0, 121.0, 1366.0, 121.0 ]
}, {
"id" : "EDGE_trf8_ONE",
"nodes" : [ {
"node1" : "trf8_ONE",
"node2" : "trf8"
} ],
"snakeLine" : [ 735.0, 330.0, 735.0, 90.0, 930.0, 90.0, 930.0, 909.0, 1465.0, 909.0 ]
"snakeLine" : [ 736.0, 331.0, 736.0, 91.0, 931.0, 91.0, 931.0, 910.0, 1466.0, 910.0 ]
}, {
"id" : "EDGE_trf8_TWO",
"nodes" : [ {
"node1" : "trf8_TWO",
"node2" : "trf8"
} ],
"snakeLine" : [ 1465.0, 699.0, 1465.0, 909.0 ]
"snakeLine" : [ 1466.0, 700.0, 1466.0, 910.0 ]
}, {
"id" : "EDGE_trf8_THREE",
"nodes" : [ {
"node1" : "trf8_THREE",
"node2" : "trf8"
} ],
"snakeLine" : [ 1915.0, 330.0, 1915.0, 90.0, 1610.0, 90.0, 1610.0, 909.0, 1465.0, 909.0 ]
"snakeLine" : [ 1916.0, 331.0, 1916.0, 91.0, 1611.0, 91.0, 1611.0, 910.0, 1466.0, 910.0 ]
} ],
"lineEdges" : [ ]
}, {
Expand All @@ -5611,8 +5611,8 @@
"name" : "vlSubst2",
"nominalVoltage" : 380.0
},
"x" : 2070.0,
"y" : 267.0,
"x" : 2071.0,
"y" : 268.0,
"nodes" : [ {
"type" : "INTERNAL",
"id" : "INTERNAL_vlSubst2_dhvdc_lcc21_2-bhvdc_lcc21_2",
Expand Down Expand Up @@ -6128,20 +6128,20 @@
"node1" : "line1_ONE",
"node2" : "line1_TWO"
} ],
"snakeLine" : [ 585.0, 330.0, 585.0, 330.0, 585.0, 60.0, 2195.0, 60.0, 2195.0, 267.0, 2195.0, 267.0 ]
"snakeLine" : [ 586.0, 331.0, 586.0, 331.0, 586.0, 61.0, 2196.0, 61.0, 2196.0, 268.0, 2196.0, 268.0 ]
}, {
"id" : "hvdc_lcc",
"nodes" : [ {
"node1" : "hvdc_lcc_ONE",
"node2" : "hvdc_lcc_TWO"
} ],
"snakeLine" : [ 135.0, 330.0, 135.0, 330.0, 135.0, 30.0, 2095.0, 30.0, 2095.0, 267.0, 2095.0, 267.0 ]
"snakeLine" : [ 136.0, 331.0, 136.0, 331.0, 136.0, 31.0, 2096.0, 31.0, 2096.0, 268.0, 2096.0, 268.0 ]
}, {
"id" : "hvdc_vsc",
"nodes" : [ {
"node1" : "hvdc_vsc_ONE",
"node2" : "hvdc_vsc_TWO"
} ],
"snakeLine" : [ 185.0, 330.0, 185.0, 330.0, 185.0, 30.0, 2050.0, 30.0, 2050.0, 244.0, 2145.0, 244.0, 2145.0, 267.0, 2145.0, 267.0 ]
"snakeLine" : [ 186.0, 331.0, 186.0, 331.0, 186.0, 31.0, 2051.0, 31.0, 2051.0, 245.0, 2146.0, 245.0, 2146.0, 268.0, 2146.0, 268.0 ]
} ]
}
Loading

0 comments on commit bfdc273

Please sign in to comment.