Force a buses recalculation when the view change (#163)

Signed-off-by: Slimane AMAR <[email protected]>

Author: SlimaneAmar

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/AbstractTopology.java

@@ -344,7 +344,7 @@ Map<T, Integer> getNodeOrBusToCalculatedBusNum() {
     private CalculationResult<T> getCalculatedBusAttributesList(NetworkObjectIndex index, Resource<VoltageLevelAttributes> voltageLevelResource, boolean includeOpenSwitches, boolean isBusView) {
         List<CalculatedBusAttributes> calculatedBusAttributesList;
         Map<T, Integer> nodeOrBusToCalculatedBusNum;
-        if (voltageLevelResource.getAttributes().isCalculatedBusesValid()) {
+        if (voltageLevelResource.getAttributes().isCalculatedBusesValid() && (voltageLevelResource.getAttributes().isCalculatedBusesForBusView() == isBusView)) {
             calculatedBusAttributesList = voltageLevelResource.getAttributes().getCalculatedBuses();
             nodeOrBusToCalculatedBusNum = getNodeOrBusToCalculatedBusNum(voltageLevelResource);
         } else {
@@ -366,6 +366,7 @@ private CalculationResult<T> getCalculatedBusAttributesList(NetworkObjectIndex i
             setNodeOrBusToCalculatedBusNum(voltageLevelResource, nodeOrBusToCalculatedBusNum);
 
             voltageLevelResource.getAttributes().setCalculatedBusesValid(true);
+            voltageLevelResource.getAttributes().setCalculatedBusesForBusView(isBusView);
         }
 
         return new CalculationResult<>(calculatedBusAttributesList, nodeOrBusToCalculatedBusNum);

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/BusBreakerViewImpl.java

@@ -52,7 +52,6 @@ private <T> AbstractTopology<T> getTopologyInstance() {
     }
 
     private Map<String, Bus> calculateBuses() {
-        voltageLevelResource.getAttributes().setCalculatedBusesValid(false);
         return getTopologyInstance().calculateBuses(index, voltageLevelResource);
     }
 

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/TerminalBusBreakerViewImpl.java

@@ -52,12 +52,10 @@ private void checkNodeBreakerTopology() {
     }
 
     private List<Bus> calculateBuses(boolean includeOpenSwitches) {
-        getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false);
         return NodeBreakerTopology.INSTANCE.calculateBuses(index, getVoltageLevelResource(), includeOpenSwitches, false).values().stream().collect(Collectors.toList());
     }
 
     private Bus calculateBus() {
-        getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false);
         return NodeBreakerTopology.INSTANCE.calculateBus(index, getVoltageLevelResource(), attributes.getNode());
     }
 
@@ -82,6 +80,7 @@ public Bus getConnectableBus() {
                 return bus;
             }
 
+            getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false); // Force a calculation
             List<Bus> buses = calculateBuses(true);
             Integer calculatedBusNum = getVoltageLevelResource().getAttributes().getNodeToCalculatedBus().get(attributes.getNode());
             if (calculatedBusNum != null) {
@@ -110,6 +109,6 @@ public void setConnectableBus(String busId) {
 
         attributes.setConnectableBus(busId);
 
-        getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false);
+        index.getVoltageLevel(getVoltageLevelResource().getId()).orElseThrow(AssertionError::new).invalidateCalculatedBuses();
     }
 }

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/TerminalBusViewImpl.java

@@ -49,14 +49,12 @@ private Resource<VoltageLevelAttributes> getVoltageLevelResource() {
     }
 
     private Bus calculateBus(boolean includeOpenSwitches) {
-        getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false);
         return isNodeBeakerTopologyKind() ?
                 getTopologyInstance().calculateBus(index, getVoltageLevelResource(), attributes.getNode(), includeOpenSwitches, true) :
                 getTopologyInstance().calculateBus(index, getVoltageLevelResource(), attributes.getBus(), includeOpenSwitches, true);
     }
 
     private List<Bus> calculateBuses(boolean includeOpenSwitches) {
-        getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false);
         return getTopologyInstance().calculateBuses(index, getVoltageLevelResource(), includeOpenSwitches, true).values().stream().collect(Collectors.toList());
     }
 
@@ -76,6 +74,7 @@ public Bus getConnectableBus() {
             }
 
             VoltageLevelAttributes voltageLevelAttributes = getVoltageLevelResource().getAttributes();
+            getVoltageLevelResource().getAttributes().setCalculatedBusesValid(false); // Force a calculation
             List<Bus> buses = calculateBuses(true);
 
             Integer calculatedBusNum = isNodeBeakerTopologyKind() ?

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/VoltageLevelBusViewImpl.java

@@ -45,7 +45,6 @@ private <T> AbstractTopology<T> getTopologyInstance() {
     }
 
     private Map<String, Bus> calculateBuses() {
-        voltageLevelResource.getAttributes().setCalculatedBusesValid(false);
         return getTopologyInstance().calculateBuses(index, voltageLevelResource, false, true);
     }
 

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/VoltageLevelImpl.java

@@ -54,10 +54,6 @@ void invalidateCalculatedBuses() {
         getNetwork().invalidateComponents();
     }
 
-    boolean isCalculatedBusesValid() {
-        return resource.getAttributes().isCalculatedBusesValid();
-    }
-
     @Override
     public ContainerType getContainerType() {
         return ContainerType.VOLTAGE_LEVEL;

network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CalculatedBusTest.java

@@ -130,7 +130,7 @@ public void testCalculatedBusesNodeBreakerSwitchRetain() {
         assertEquals(0, vl1.getBusBreakerView().getSwitchCount());
 
         s.setRetained(false);
-        assertTrue(((VoltageLevelImpl) vl1).isCalculatedBusesValid());
+        assertTrue(((VoltageLevelImpl) vl1).getResource().getAttributes().isCalculatedBusesValid());
     }
 
     @Test

network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/NodeBreakerTerminalTest.java

@@ -125,15 +125,12 @@ public void testBusBreakerView() {
         assertTrue(bbs1t.isConnected()); // because busbar section is not deconnectable
 
         assertTrue(gt.disconnect());
-        assertFalse(gt.isConnected());
         assertEquals(2, vl1.getBusBreakerView().getBusStream().count());
         assertNotNull(gt.getBusBreakerView().getConnectableBus());
         assertEquals(vl1.getBusBreakerView().getBus("VL1_0"), gt.getBusBreakerView().getConnectableBus());
         assertTrue(gt.connect());
-        assertTrue(gt.isConnected());
 
         assertTrue(ldt1.disconnect());
-        assertFalse(ldt1.isConnected());
         assertEquals(2, vl1.getBusBreakerView().getBusStream().count());
         assertNotNull(ldt1.getBusBreakerView().getConnectableBus());
         assertEquals(vl1.getBusBreakerView().getBus("VL1_1"), ldt1.getBusBreakerView().getConnectableBus());

network-store-integration-test/src/test/java/com/powsybl/network/store/integration/NetworkStoreIT.java

@@ -2076,14 +2076,14 @@ public void testComponentCalculationNetwork() {
             Network network = service.getNetwork(networkIds.keySet().stream().findFirst().orElseThrow(AssertionError::new));
             assertEquals(ComponentConstants.MAIN_NUM, network.getGenerator("g").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
             assertEquals(ComponentConstants.MAIN_NUM, network.getGenerator("g").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
-            //assertEquals(ComponentConstants.MAIN_NUM, network.getLoad("ld").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
-            //assertEquals(ComponentConstants.MAIN_NUM, network.getLoad("ld").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
+            assertEquals(ComponentConstants.MAIN_NUM, network.getLoad("ld").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
+            assertEquals(ComponentConstants.MAIN_NUM, network.getLoad("ld").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
 
             network.getSwitch("s").setOpen(true);
             assertEquals(ComponentConstants.MAIN_NUM, network.getGenerator("g").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
             assertEquals(ComponentConstants.MAIN_NUM, network.getGenerator("g").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
-            //assertEquals(1, network.getLoad("ld").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
-            //assertEquals(1, network.getLoad("ld").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
+            assertEquals(1, network.getLoad("ld").getTerminal().getBusView().getBus().getConnectedComponent().getNum());
+            assertEquals(1, network.getLoad("ld").getTerminal().getBusView().getBus().getSynchronousComponent().getNum());
         }
     }
 

network-store-model/src/main/java/com/powsybl/network/store/model/VoltageLevelAttributes.java

@@ -66,9 +66,12 @@ public class VoltageLevelAttributes extends AbstractAttributes implements Identi
     private TerminalRefAttributes slackTerminal;
 
     @Builder.Default
-    @ApiModelProperty("Calculated bus validity")
+    @ApiModelProperty("Calculated buses validity")
     private boolean calculatedBusesValid = false;
 
+    @ApiModelProperty("Calculated buses for bus view")
+    private boolean calculatedBusesForBusView;
+
     public VoltageLevelAttributes(VoltageLevelAttributes other) {
         super(other);
         this.substationId = other.substationId;