Voltage and angle by bus in node/breaker topology #1170

annetill · 2020-02-21T15:07:58Z

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

I need to update the documentation.

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest

Yes, fix issue #735

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

Voltage and angle are no longer attached to bus bar sections in IIDM serialization. We introduce bus at node/breaker level with voltage, angle and the list of nodes that belong to this bus.

What is the current behavior? (You can also link to an open issue here)

Voltage and angle are attached to a bus bar section.

What is the new behavior (if this is a feature change)?

There are attached to bus in the node/breaker topology.

Does this PR introduce a breaking change or deprecate an API? If yes, check the following:

The Breaking Change or Deprecated label has been added
The migration guide has been updated in the github wiki (What changes might users need to make in their application due to this PR?)

Other information:

(if any of the questions/checkboxes don't apply, please delete them entirely)

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

…opology during the XIIDM import. Signed-off-by: Anne Tilloy <atilloy@gmail.com>

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

…leUntilMaximumVersion Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

…Version Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

annetill · 2020-02-21T15:10:09Z

Hi ! For the moment, when no voltage and no angle are defined for a given bus, we read/write the list of nodes only. I am not sure that it is what you expected. What do you think ?

iidm/iidm-xml-converter/src/main/java/com/powsybl/iidm/xml/VoltageLevelXml.java

mathbagu · 2020-02-24T08:29:15Z

iidm/iidm-xml-converter/src/test/resources/V1_1/LccRoundTripRef.xml

@@ -20,8 +20,9 @@
                <iidm:switch id="BK2" name="Breaker" kind="BREAKER" retained="true" open="false" node1="3" node2="4"/>
                <iidm:switch id="DISC_BBS1_BK3" name="Disconnector" kind="DISCONNECTOR" retained="false" open="false" node1="0" node2="5"/>
                <iidm:switch id="BK3" name="Breaker" kind="BREAKER" retained="true" open="false" node1="5" node2="6"/>
+                <iidm:bus nodes="0,1,2,3,4,5,6"/>


If there is no V and/or theta, should we serialize buses?

Line deleted.

mathbagu · 2020-02-24T08:29:39Z

iidm/iidm-xml-converter/src/test/resources/V1_1/VscRoundTripRef.xml

@@ -5,7 +5,7 @@
            <iidm:busBreakerTopology>
                <iidm:bus id="B1"/>
            </iidm:busBreakerTopology>
-            <iidm:vscConverterStation id="C1" name="Converter1" lossFactor="0.011" voltageRegulatorOn="true" voltageSetpoint="405.0" bus="B1" connectableBus="B1" p="100.0" q="50.0">
+            <iidm:vscConverterStation id="C1" name="Converter1" voltageRegulatorOn="true" lossFactor="0.011" voltageSetpoint="405.0" bus="B1" connectableBus="B1" p="100.0" q="50.0">


It's strange that the order of the two attributes is changing

mathbagu · 2020-02-24T08:30:00Z

iidm/iidm-xml-converter/src/test/resources/V1_1/VscRoundTripRef.xml

            </iidm:nodeBreakerTopology>
-            <iidm:vscConverterStation id="C2" name="Converter2" lossFactor="0.011" voltageRegulatorOn="false" reactivePowerSetpoint="123.0" node="2">
+            <iidm:vscConverterStation id="C2" name="Converter2" voltageRegulatorOn="false" lossFactor="0.011" reactivePowerSetpoint="123.0" node="2">


Same remark here

mathbagu · 2020-02-24T08:30:12Z

iidm/iidm-xml-converter/src/test/resources/V1_1/fictitiousSwitchRef.xml

@@ -45,6 +46,8 @@
                <iidm:switch id="BV" name="BW" kind="BREAKER" retained="true" open="false" node1="17" node2="18"/>
                <iidm:switch id="BX" name="BY" kind="BREAKER" retained="true" open="false" node1="19" node2="20"/>
                <iidm:switch id="BZ" name="CA" kind="BREAKER" retained="true" open="false" node1="21" node2="22"/>
+                <iidm:bus v="236.44736" angle="15.250391" nodes="0,1,6,7,8,9,10,15,16,17,18,19,20,21,22"/>
+                <iidm:bus nodes="3,4,5"/>


Same remark here

Line deleted.

mathbagu · 2020-02-24T08:30:24Z

iidm/iidm-xml-converter/src/test/resources/V1_1/internalConnections.xiidm

@@ -7,6 +7,7 @@
                <iidm:switch id="br1" kind="BREAKER" retained="false" open="false" node1="1" node2="2"/>
                <iidm:internalConnection node1="0" node2="1"/>
                <iidm:internalConnection node1="3" node2="4"/>
+                <iidm:bus nodes="0,1,2"/>


Same remark here

Line deleted.

mathbagu · 2020-02-24T08:30:31Z

iidm/iidm-xml-converter/src/test/resources/V1_1/internalConnections.xiidm

@@ -20,6 +21,7 @@
                <iidm:switch id="br2" kind="BREAKER" retained="false" open="false" node1="1" node2="2"/>
                <iidm:internalConnection node1="0" node2="1"/>
                <iidm:internalConnection node1="3" node2="4"/>
+                <iidm:bus nodes="0,1,2"/>


Same remark

Line deleted.

iidm/iidm-api/src/main/java/com/powsybl/iidm/network/util/Networks.java

miovd · 2020-02-25T09:53:14Z

iidm/iidm-xml-converter/src/main/java/com/powsybl/iidm/xml/VoltageLevelXml.java

+            for (Bus bus : vl.getBusView().getBuses()) {
+                try {
+                    context.getWriter().writeEmptyElement(context.getVersion().getNamespaceURI(), "bus");
+                    XmlUtil.writeDouble("v", bus.getV(), context.getWriter());
+                    XmlUtil.writeDouble("angle", bus.getAngle(), context.getWriter());
+                    Set<Integer> nodes = nodesByBus.get(bus.getId());
+                    context.getWriter().writeAttribute("nodes", StringUtils.join(nodes.toArray(), ','));
+                } catch (XMLStreamException e) {
+                    throw new UncheckedXmlStreamException(e);
+                }
+            }


You can replace this by a forEach and an intermediary method writeCalculatedBus(Bus, Set<Integer>, NetworkXmlWriterContext) (with a stream, it will also be easier to filter bus with a voltage or angle non NaN).

This method could be declared as a static method in BusXml.

Done, but in VoltageLevelXml.java.

iidm/iidm-xml-converter/src/main/java/com/powsybl/iidm/xml/util/IidmXmlUtil.java

iidm/iidm-xml-converter/src/main/java/com/powsybl/iidm/xml/BusbarSectionXml.java

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

…L attribute. Signed-off-by: Anne Tilloy <atilloy@gmail.com>

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

mathbagu · 2020-02-28T08:40:54Z

@MioRtia @annetill I add both do-not-merge and to-be-refactored because I want to refactor a bit the code to solve the last sonar issue about complexity. I will extract the export of CalculatedBus in a function. Please, do not merge :)

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

sonarcloud · 2020-02-28T09:37:21Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities (and 0 Security Hotspots to review)
0 Code Smells

85.6% Coverage
0.0% Duplication

* Add a function to get the nodes of each buses, from the BusView Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com> * Export of bus in node/breaker topology with voltage, angle and nodes. * Voltage and angle by bus instead of busbar sections in node/breaker topology during the XIIDM import. Signed-off-by: Anne Tilloy <atilloy@gmail.com> * add IidmXmlUtil.assertMaximumVersion and IidmXmlUtil.readOptionalDoubleUntilMaximumVersion * add IidmXmlUtil.runFromMinimumVersion and IidmXmlUtil.runUntilMaximumVersion Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com> * Backward compatibility management and unitary tests update. * Not assert anything where there is a deletion or an addition of an XML attribute. Signed-off-by: Anne Tilloy <atilloy@gmail.com> * Add unit tests * Solve last code smell (complexity) Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com> Co-authored-by: Mathieu BAGUE <mathieu.bague@gmail.com> Co-authored-by: MioRtia <miora.ralambotiana@rte-france.com> (cherry picked from commit 2a32588)

Mathieu BAGUE and others added 7 commits February 17, 2020 11:18

Add a function to get the nodes of each buses, from the BusView

32c7aa6

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

Export of bus in node/breaker topology with voltage, angle and nodes.

7459308

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

Voltage and angle by bus instead of busbar sections in node/breaker t…

d64ac2d

…opology during the XIIDM import. Signed-off-by: Anne Tilloy <atilloy@gmail.com>

Corrections.

9874777

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

add IidmXmlUtil.assertMaximumVersion and IidmXmlUtil.readOptionalDoub…

72999cf

…leUntilMaximumVersion Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

add IidmXmlUtil.runFromMinimumVersion and IidmXmlUtil.runUntilMaximum…

77d1dab

…Version Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>

Backward compatibility management and unitary tests update.

684b3a3

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

annetill requested review from mathbagu, miovd and sylvlecl February 21, 2020 15:08

annetill linked an issue Feb 21, 2020 that may be closed by this pull request

Voltage/angle values lost on XIIDM export --> import for buses with no bus bar sections #735

Closed

mathbagu reviewed Feb 24, 2020

View reviewed changes

miovd added PR: waiting-for-review XIIDM labels Feb 25, 2020

miovd added the Breaking Change API is broken label Feb 25, 2020

miovd requested changes Feb 25, 2020

View reviewed changes

Corrections after reviews.

e4dba75

Signed-off-by: Anne Tilloy <atilloy@gmail.com>

annetill force-pushed the voltages-by-bus branch from a396d1c to e4dba75 Compare February 27, 2020 13:33

annetill and others added 3 commits February 27, 2020 14:34

Merge branch 'master' into voltages-by-bus

168ec64

Not assert anything where there is a deletion or an addition of an XM…

4143798

…L attribute. Signed-off-by: Anne Tilloy <atilloy@gmail.com>

Add unit tests

0d9283b

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

mathbagu approved these changes Feb 28, 2020

View reviewed changes

mathbagu added PR: do-not-merge PR: to-be-refactored labels Feb 28, 2020

Solve last code smell (complexity)

8079951

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>

mathbagu removed the request for review from sylvlecl February 28, 2020 09:12

mathbagu removed the PR: do-not-merge label Feb 28, 2020

mathbagu removed the PR: to-be-refactored label Feb 28, 2020

miovd approved these changes Feb 28, 2020

View reviewed changes

Merge branch 'master' into voltages-by-bus

36f632b

miovd added PR: ready-to-be-merged and removed PR: waiting-for-review labels Feb 28, 2020

miovd merged commit 2a32588 into master Feb 28, 2020

miovd deleted the voltages-by-bus branch February 28, 2020 09:38

miovd mentioned this pull request Feb 28, 2020

Add getNodes(int node) in NodeBreakerView #1094

Closed

5 tasks

annetill mentioned this pull request Mar 2, 2020

[IIDM v1.1] voltage and angle by bus in node/breaker topology powsybl/powsybl-iidm4cpp#13

Closed

mathbagu mentioned this pull request Mar 3, 2020

[IIDM v1.1] Migration of ActivePowerControl to the new extension design powsybl/powsybl-iidm4cpp#14

Closed

sebalaig mentioned this pull request Apr 21, 2020

Voltage and angle by bus in node/breaker topology powsybl/powsybl-iidm4cpp#84

Merged

5 tasks

miovd mentioned this pull request Jan 8, 2021

Implement a method that gives the equivalent terminal to any node in a NodeBreaker voltage level #1106

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Voltage and angle by bus in node/breaker topology #1170

Voltage and angle by bus in node/breaker topology #1170

annetill commented Feb 21, 2020 •

edited by miovd

Loading

annetill commented Feb 21, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

mathbagu Feb 24, 2020

annetill Feb 27, 2020

miovd Feb 25, 2020

mathbagu Feb 25, 2020

annetill Feb 27, 2020 •

edited

Loading

mathbagu commented Feb 28, 2020

sonarcloud bot commented Feb 28, 2020

Voltage and angle by bus in node/breaker topology #1170

Voltage and angle by bus in node/breaker topology #1170

Conversation

annetill commented Feb 21, 2020 • edited by miovd Loading

annetill commented Feb 21, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

annetill Feb 27, 2020 • edited Loading

Choose a reason for hiding this comment

mathbagu commented Feb 28, 2020

sonarcloud bot commented Feb 28, 2020

annetill commented Feb 21, 2020 •

edited by miovd

Loading

annetill Feb 27, 2020 •

edited

Loading