Only use branches connected at both sides in most meshed slack bus se…

…lection (#762) Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
powsybl · Mar 27, 2023 · 15062c5 · 15062c5
1 parent bfb2521
commit 15062c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/powsybl/openloadflow/network/MostMeshedSlackBusSelector.java b/src/main/java/com/powsybl/openloadflow/network/MostMeshedSlackBusSelector.java
@@ -29,6 +29,10 @@ public MostMeshedSlackBusSelector(double maxNominalVoltagePercentile) {
         this.maxNominalVoltagePercentile = maxNominalVoltagePercentile;
     }
 
+    private static int getBranchCountConnectedAtBothSides(LfBus bus) {
+        return (int) bus.getBranches().stream().filter(LfBranch::isConnectedAtBothSides).count();
+    }
+
     @Override
     public SelectedSlackBus select(List<LfBus> buses, int limit) {
         double[] nominalVoltages = buses.stream()
@@ -41,7 +45,7 @@ public SelectedSlackBus select(List<LfBus> buses, int limit) {
         // select non-fictitious and most meshed bus among buses with the highest nominal voltage
         List<LfBus> slackBuses = buses.stream()
             .filter(bus -> !bus.isFictitious() && bus.getNominalV() == maxNominalV)
-            .sorted(Comparator.comparingInt((LfBus bus) -> bus.getBranches().size())
+            .sorted(Comparator.comparingInt(MostMeshedSlackBusSelector::getBranchCountConnectedAtBothSides)
                     .thenComparing(Comparator.comparing(LfBus::getId).reversed()).reversed())
             .limit(limit)
             .collect(Collectors.toList());

diff --git a/src/test/java/com/powsybl/openloadflow/ac/NonImpedantBranchDisablingTest.java b/src/test/java/com/powsybl/openloadflow/ac/NonImpedantBranchDisablingTest.java
@@ -73,8 +73,8 @@ void testOpenBranch() {
         network.getLine("L2").setR(0.0).setX(0.0);
         network.getLine("L1").getTerminal1().disconnect();
         LoadFlow.run(network);
-        assertEquals(600.0, network.getLine("L2").getTerminal1().getP(), LoadFlowAssert.DELTA_POWER);
-        assertEquals(-600.0, network.getLine("L2").getTerminal2().getP(), LoadFlowAssert.DELTA_POWER);
+        assertEquals(600.018, network.getLine("L2").getTerminal1().getP(), LoadFlowAssert.DELTA_POWER);
+        assertEquals(-600.018, network.getLine("L2").getTerminal2().getP(), LoadFlowAssert.DELTA_POWER);
         assertEquals(Double.NaN, network.getLine("L1").getTerminal1().getP(), LoadFlowAssert.DELTA_POWER);
 
         network.getLine("L1").getTerminal1().connect();