Merge branch 'main' into remove_iidm_converter_api

Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
powsybl · Nov 3, 2022 · de7b9ca · de7b9ca
2 parents fb89c75 + 7012399
commit de7b9ca
Show file tree

Hide file tree

Showing 19 changed files with 554 additions and 244 deletions.
diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/Connectable.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/Connectable.java
@@ -18,16 +18,7 @@ public interface Connectable<I extends Connectable<I>> extends Identifiable<I> {
     List<? extends Terminal> getTerminals();
 
     /**
-     * Remove the connectable from the voltage level.
-     *
-     * @param removeDanglingSwitches if true, also remove dangling switches in addition to isolated nodes
+     * Remove the connectable from the voltage level (dangling switches are kept).
      */
-    void remove(boolean removeDanglingSwitches);
-
-    /**
-     * Remove the connectable from the voltage level and keep dangling switches.
-     */
-    default void remove() {
-        remove(false);
-    }
+    void remove();
 }
diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractConnectable.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractConnectable.java
@@ -50,15 +50,15 @@ public NetworkImpl getNetwork() {
     }
 
     @Override
-    public void remove(boolean removeDanglingSwitches) {
+    public void remove() {
         NetworkImpl network = getNetwork();
 
         network.getListeners().notifyBeforeRemoval(this);
 
         network.getIndex().remove(this);
         for (TerminalExt terminal : terminals) {
             VoltageLevelExt vl = terminal.getVoltageLevel();
-            vl.detach(terminal, removeDanglingSwitches);
+            vl.detach(terminal);
         }
 
         network.getListeners().notifyAfterRemoval(id);
@@ -170,7 +170,7 @@ private void attachTerminal(TerminalExt oldTerminal, String oldConnectionInfo, V
         voltageLevel.attach(terminalExt, false);
 
         // then we can detach the old terminal, as we now know that the new terminal is valid
-        oldTerminal.getVoltageLevel().detach(oldTerminal, false);
+        oldTerminal.getVoltageLevel().detach(oldTerminal);
 
         // replace the old terminal by the new terminal in the connectable
         int iSide = terminals.indexOf(oldTerminal);

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractHvdcConverterStation.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractHvdcConverterStation.java
@@ -69,11 +69,11 @@ public Optional<? extends HvdcConverterStation<?>> getOtherConverterStation() {
     }
 
     @Override
-    public void remove(boolean removeDanglingSwitches) {
+    public void remove() {
         if (hvdcLine != null) {
             throw new ValidationException(this, "Impossible to remove this converter station (still attached to '" + hvdcLine.getId() + "')");
         }
-        super.remove(removeDanglingSwitches);
+        super.remove();
     }
 
 }
diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/BusBreakerVoltageLevel.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/BusBreakerVoltageLevel.java
@@ -880,7 +880,7 @@ public void attach(final TerminalExt terminal, boolean test) {
     }
 
     @Override
-    public void detach(final TerminalExt terminal, boolean removeDanglingSwitches) {
+    public void detach(final TerminalExt terminal) {
         if (!(terminal instanceof BusTerminal)) {
             throw new IllegalArgumentException("Incorrect terminal type");
         }

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/BusTerminal.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/BusTerminal.java
@@ -66,7 +66,7 @@ public void setConnectableBus(String busId) {
             // Assert that the new bus exists
             vl.getBus(busId, true);
 
-            vl.detach(BusTerminal.this, false);
+            vl.detach(BusTerminal.this);
             int variantIndex = network.get().getVariantIndex();
             String oldValue = BusTerminal.this.connectableBusId.set(variantIndex, busId);
             vl.attach(BusTerminal.this, false);

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NodeBreakerVoltageLevel.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NodeBreakerVoltageLevel.java
@@ -836,7 +836,7 @@ public void removeInternalConnections(int node1, int node2) {
             for (int ic : internalConnectionsToBeRemoved) {
                 graph.removeEdge(ic);
             }
-            graph.removeIsolatedVertices(false);
+            graph.removeIsolatedVertices();
             invalidateCache();
         }
 
@@ -882,7 +882,7 @@ public void removeSwitch(String switchId) {
                         + "' not found in voltage level '" + id + "'");
             }
             graph.removeEdge(e);
-            graph.removeIsolatedVertices(false);
+            graph.removeIsolatedVertices();
         }
 
         @Override
@@ -1131,7 +1131,7 @@ public void attach(TerminalExt terminal, boolean test) {
     }
 
     @Override
-    public void detach(TerminalExt terminal, boolean removeDanglingSwitches) {
+    public void detach(TerminalExt terminal) {
         if (!(terminal instanceof NodeTerminal)) {
             throw new IllegalArgumentException("Incorrect terminal type");
         }
@@ -1145,7 +1145,7 @@ public void detach(TerminalExt terminal, boolean removeDanglingSwitches) {
         // remove the link terminal -> voltage level
         terminal.setVoltageLevel(null);
 
-        graph.removeIsolatedVertices(removeDanglingSwitches);
+        graph.removeIsolatedVertices();
     }
 
     private static boolean isBusbarSection(Terminal t) {

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/VoltageLevelExt.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/VoltageLevelExt.java
@@ -46,7 +46,7 @@ interface BusViewExt extends BusView {
     /**
      * Detach an equipment from the topology.
      */
-    void detach(TerminalExt terminal, boolean removeDanglingSwitches);
+    void detach(TerminalExt terminal);
 
     boolean connect(TerminalExt terminal);
 

diff --git a/.../test/java/com/powsybl/iidm/network/impl/tck/util/RemoveDanglingSwitchesTopologyTest.java b/.../test/java/com/powsybl/iidm/network/impl/tck/util/RemoveDanglingSwitchesTopologyTest.java
diff --git a/...dm-mergingview/src/main/java/com/powsybl/iidm/mergingview/AbstractConnectableAdapter.java b/...dm-mergingview/src/main/java/com/powsybl/iidm/mergingview/AbstractConnectableAdapter.java
@@ -30,7 +30,7 @@ public final List<? extends Terminal> getTerminals() {
     }
 
     @Override
-    public final void remove(boolean removeDanglingSwitches) {
+    public final void remove() {
         throw MergingView.createNotImplementedException();
     }
 }
diff --git a/iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/MergedLine.java b/iidm/iidm-mergingview/src/main/java/com/powsybl/iidm/mergingview/MergedLine.java
@@ -517,7 +517,7 @@ public boolean removeProperty(String key) {
     // Not implemented methods -------
     // -------------------------------
     @Override
-    public void remove(boolean removeDanglingSwitches) {
+    public void remove() {
         throw MergingView.createNotImplementedException();
     }
 

diff --git a/...rgingview/src/main/java/com/powsybl/iidm/mergingview/ThreeWindingsTransformerAdapter.java b/...rgingview/src/main/java/com/powsybl/iidm/mergingview/ThreeWindingsTransformerAdapter.java
@@ -250,7 +250,7 @@ public double getRatedU0() {
     // Not implemented methods -------
     // -------------------------------
     @Override
-    public void remove(boolean removeDanglingSwitches) {
+    public void remove() {
         throw MergingView.createNotImplementedException();
     }
 }
diff --git a/...odification/src/main/java/com/powsybl/iidm/modification/topology/ModificationReports.java b/...odification/src/main/java/com/powsybl/iidm/modification/topology/ModificationReports.java
@@ -108,6 +108,24 @@ static void notFoundLineReport(Reporter reporter, String lineId) {
                 .build());
     }
 
+    static void notFoundConnectableReport(Reporter reporter, String connectableId) {
+        reporter.report(Report.builder()
+                .withKey("connectableNotFound")
+                .withDefaultMessage("Connectable ${connectableId} is not found")
+                .withValue("connectableId", connectableId)
+                .withSeverity(TypedValue.ERROR_SEVERITY)
+                .build());
+    }
+
+    static void removeFeederBayBusbarSectionReport(Reporter reporter, String busbarSectionConnectableId) {
+        reporter.report(Report.builder()
+                .withKey("removeBayBusbarSectionConnectable")
+                .withDefaultMessage("Cannot remove feeder bay for connectable ${busbarSectionConnectableId}, as it is a busbarSection")
+                .withValue("connectableId", busbarSectionConnectableId)
+                .withSeverity(TypedValue.ERROR_SEVERITY)
+                .build());
+    }
+
     static void noVoltageLevelInCommonReport(Reporter reporter, String line1Id, String line2Id) {
         reporter.report(Report.builder()
                 .withKey("noVoltageLevelInCommon")
@@ -268,6 +286,45 @@ static void createdNewSymmetricalTopology(Reporter reporter, String voltageLevel
                 .build());
     }
 
+    public static void removedSwitchReport(Reporter reporter, String switchId) {
+        reporter.report(Report.builder()
+                .withKey("SwitchRemoved")
+                .withDefaultMessage("Switch ${switchId} removed")
+                .withValue("switchId", switchId)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
+    }
+
+    public static void removedInternalConnectionReport(Reporter reporter, int node1, int node2) {
+        reporter.report(Report.builder()
+                .withKey("InternalConnectionRemoved")
+                .withDefaultMessage("Internal connection between ${node1} and ${node2} removed")
+                .withValue("node1", node1)
+                .withValue("node2", node2)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
+    }
+
+    public static void removedConnectableReport(Reporter reporter, String connectableId) {
+        reporter.report(Report.builder()
+                .withKey("ConnectableRemoved")
+                .withDefaultMessage("Connectable ${connectableId} removed")
+                .withValue("connectableId", connectableId)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
+    }
+
+    public static void removeFeederBayAborted(Reporter reporter, String connectableId, int node, String otherConnectableId) {
+        reporter.report(Report.builder()
+                .withKey("RemoveFeederBayAborted")
+                .withDefaultMessage("Remove feeder bay of ${connectableId} cannot go further node ${node}, as it is connected to ${otherConnectableId}")
+                .withValue("connectableId", connectableId)
+                .withValue("node", node)
+                .withValue("otherConnectableId", otherConnectableId)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
+    }
+
     private ModificationReports() {
     }
 }