Enhance busbar sections retrieval – rework BusbarSectionFinderTraverser

src/main/java/org/gridsuite/network/map/dto/definition/extension/BusbarSectionFinderTraverser.java

@@ -6,42 +6,97 @@
  */
 package org.gridsuite.network.map.dto.definition.extension;
 
-import com.powsybl.iidm.network.IdentifiableType;
+import com.powsybl.iidm.network.BusbarSection;
 import com.powsybl.iidm.network.Switch;
 import com.powsybl.iidm.network.Terminal;
+import com.powsybl.iidm.network.VoltageLevel;
+import com.powsybl.math.graph.TraversalType;
 import com.powsybl.math.graph.TraverseResult;
 
+import java.util.*;
+
 /**
- * @author Slimane Amar <slimane.amar at rte-france.com>
+ * @author Ghazwa Rehili <ghazwa.rehili at rte-france.com>
  */
-public class BusbarSectionFinderTraverser implements Terminal.TopologyTraverser {
+// TODO : code to move to powsybl-core or powsybl-network-store
+public final class BusbarSectionFinderTraverser {
+
+    private BusbarSectionFinderTraverser() {
+        throw new UnsupportedOperationException();
+    }
 
-    private final boolean onlyConnectedBbs;
+    public record SwitchInfo(String id, boolean isOpen) { }
 
-    private String firstTraversedBbsId;
+    public record BusbarSectionResult(String busbarSectionId, int depth, SwitchInfo lastSwitch, boolean allClosedSwitch) { }
 
-    public BusbarSectionFinderTraverser(boolean onlyConnectedBbs) {
-        this.onlyConnectedBbs = onlyConnectedBbs;
+    public static String findBusbarSectionId(Terminal terminal) {
+        BusbarSectionResult result = getBusbarSectionResult(terminal);
+        return result != null ? result.busbarSectionId() : terminal.getVoltageLevel().getNodeBreakerView().getBusbarSections().iterator().next().getId();
     }
 
-    @Override
-    public TraverseResult traverse(Terminal terminal, boolean connected) {
-        if (terminal.getConnectable().getType() == IdentifiableType.BUSBAR_SECTION) {
-            firstTraversedBbsId = terminal.getConnectable().getId();
-            return TraverseResult.TERMINATE_TRAVERSER;
+    public static BusbarSectionResult getBusbarSectionResult(Terminal terminal) {
+        int startNode = terminal.getNodeBreakerView().getNode();
+        List<BusbarSectionResult> allResults = searchAllBusbars(terminal.getVoltageLevel(), startNode);
+        if (allResults.isEmpty()) {
+            return null;
         }
-        return TraverseResult.CONTINUE;
+        return selectBestBusbar(allResults);
     }
 
-    @Override
-    public TraverseResult traverse(Switch aSwitch) {
-        if (onlyConnectedBbs && aSwitch.isOpen()) {
-            return TraverseResult.TERMINATE_PATH;
+    private static BusbarSectionResult selectBestBusbar(List<BusbarSectionResult> results) {
+        List<BusbarSectionResult> withAllClosedSwitch = results.stream().filter(r -> r.allClosedSwitch).toList();
+        if (!withAllClosedSwitch.isEmpty()) {
+            return withAllClosedSwitch.stream().min(Comparator.comparingInt(BusbarSectionResult::depth)
+                    .thenComparing(BusbarSectionResult::busbarSectionId)).orElse(null);
         }
-        return TraverseResult.CONTINUE;
+        List<BusbarSectionResult> withClosedSwitch = results.stream().filter(r -> r.lastSwitch() != null && !r.lastSwitch().isOpen()).toList();
+        if (!withClosedSwitch.isEmpty()) {
+            return withClosedSwitch.stream().min(Comparator.comparingInt(BusbarSectionResult::depth)
+                    .thenComparing(BusbarSectionResult::busbarSectionId)).orElse(null);
+        }
+        List<BusbarSectionResult> withOpenSwitch = results.stream().filter(r -> r.lastSwitch() != null && r.lastSwitch().isOpen()).toList();
+        if (!withOpenSwitch.isEmpty()) {
+            return withOpenSwitch.stream().min(Comparator.comparingInt(BusbarSectionResult::depth)
+                    .thenComparing(BusbarSectionResult::busbarSectionId)).orElse(null);
+        }
+        return results.getFirst();
     }
 
-    public String getFirstTraversedBbsId() {
-        return firstTraversedBbsId;
+    private static List<BusbarSectionResult> searchAllBusbars(VoltageLevel voltageLevel, int startNode) {
+        List<BusbarSectionResult> results = new ArrayList<>();
+        record NodeState(int depth, boolean allClosed) { }
+        Map<Integer, NodeState> visitedNodes = new HashMap<>();
+        visitedNodes.put(startNode, new NodeState(0, true));
+        voltageLevel.getNodeBreakerView().getTerminal(startNode).traverse(new Terminal.TopologyTraverser() {
+            SwitchInfo lastSwitch = null;
+            @Override
+            public TraverseResult traverse(Terminal terminal, boolean connected) {
+                if (terminal.getVoltageLevel() != voltageLevel) {
+                    return TraverseResult.TERMINATE_PATH;
+                }
+                NodeState currentNodeState = visitedNodes.get(terminal.getNodeBreakerView().getNode());
+                if (terminal.getConnectable() instanceof BusbarSection busbarSection) {
+                    if (currentNodeState != null) {
+                        results.add(new BusbarSectionResult(busbarSection.getId(), currentNodeState.depth, lastSwitch, currentNodeState.allClosed));
+                    }
+                    return TraverseResult.TERMINATE_PATH;
+                }
+                return TraverseResult.CONTINUE;
+            }
+
+            @Override
+            public TraverseResult traverse(Switch aSwitch) {
+                int node1 = voltageLevel.getNodeBreakerView().getNode1(aSwitch.getId());
+                int node2 = voltageLevel.getNodeBreakerView().getNode2(aSwitch.getId());
+                int sourceNode = visitedNodes.containsKey(node1) ? node1 : node2;
+                int targetNode = visitedNodes.containsKey(node1) ? node2 : node1;
+                NodeState sourceState = visitedNodes.get(sourceNode);
+                NodeState newState = new NodeState(sourceState.depth + 1, sourceState.allClosed && !aSwitch.isOpen());
+                visitedNodes.put(targetNode, newState);
+                lastSwitch = new SwitchInfo(aSwitch.getId(), aSwitch.isOpen());
+                return TraverseResult.CONTINUE;
+            }
+        }, TraversalType.BREADTH_FIRST);
+        return results;
     }
 }

src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java

@@ -8,7 +8,6 @@
 
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.ConnectablePosition;
-import com.powsybl.math.graph.TraversalType;
 import org.gridsuite.network.map.dto.common.ReactiveCapabilityCurveMapData;
 import org.gridsuite.network.map.dto.common.TapChangerData;
 import org.gridsuite.network.map.dto.common.TapChangerStepData;
@@ -92,9 +91,8 @@ public static String getBusOrBusbarSection(Terminal terminal) {
                 return terminal.getBusBreakerView().getConnectableBus().getId();
             }
         } else {
-            final BusbarSectionFinderTraverser connectedBusbarSectionFinder = new BusbarSectionFinderTraverser(terminal.isConnected());
-            terminal.traverse(connectedBusbarSectionFinder, TraversalType.BREADTH_FIRST);
-            return connectedBusbarSectionFinder.getFirstTraversedBbsId();
+            // NODE_BREAKER: explore all paths and choose the busbar with the closed disconnector
+            return BusbarSectionFinderTraverser.findBusbarSectionId(terminal);
         }
     }