-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Network action compatibility filter (#912)
* Network actions compatibility filter Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
- Loading branch information
Showing
18 changed files
with
1,278 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
...api/src/test/java/com/powsybl/openrao/data/cracapi/ElementaryActionCompatibilityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/* | ||
* Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
*/ | ||
|
||
package com.powsybl.openrao.data.cracapi; | ||
|
||
import com.powsybl.openrao.commons.Unit; | ||
import com.powsybl.openrao.data.cracapi.networkaction.ActionType; | ||
import com.powsybl.openrao.data.cracapi.networkaction.ElementaryAction; | ||
import com.powsybl.openrao.data.cracapi.networkaction.InjectionSetpoint; | ||
import com.powsybl.openrao.data.cracapi.networkaction.PstSetpoint; | ||
import com.powsybl.openrao.data.cracapi.networkaction.SwitchPair; | ||
import com.powsybl.openrao.data.cracapi.networkaction.TopologicalAction; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertFalse; | ||
import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
||
/** | ||
* @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>} | ||
*/ | ||
class ElementaryActionCompatibilityTest { | ||
private final NetworkElement switchFr = NetworkActionUtils.createNetworkElement("switch-fr"); | ||
private final NetworkElement switchBe = NetworkActionUtils.createNetworkElement("switch-be"); | ||
private final NetworkElement pstFr = NetworkActionUtils.createNetworkElement("pst-fr"); | ||
private final NetworkElement pstBe = NetworkActionUtils.createNetworkElement("pst-be"); | ||
private final NetworkElement generatorFr = NetworkActionUtils.createNetworkElement("generator-fr"); | ||
private final NetworkElement generatorBe = NetworkActionUtils.createNetworkElement("generator-be"); | ||
private final TopologicalAction openSwitchFr = NetworkActionUtils.createTopologyAction(switchFr, ActionType.OPEN); | ||
private final TopologicalAction closeSwitchFr = NetworkActionUtils.createTopologyAction(switchFr, ActionType.CLOSE); | ||
private final TopologicalAction openSwitchBe = NetworkActionUtils.createTopologyAction(switchBe, ActionType.OPEN); | ||
private final TopologicalAction closeSwitchBe = NetworkActionUtils.createTopologyAction(switchBe, ActionType.CLOSE); | ||
private final SwitchPair openSwitchFrCloseSwitchBe = NetworkActionUtils.createSwitchPair(switchFr, switchBe); | ||
private final SwitchPair openSwitchBeCloseSwitchFr = NetworkActionUtils.createSwitchPair(switchBe, switchFr); | ||
private final PstSetpoint pstFr0 = NetworkActionUtils.createPstSetpoint(pstFr, 0); | ||
private final PstSetpoint pstFr5 = NetworkActionUtils.createPstSetpoint(pstFr, 5); | ||
private final PstSetpoint pstBe0 = NetworkActionUtils.createPstSetpoint(pstBe, 0); | ||
private final PstSetpoint pstBeMinus5 = NetworkActionUtils.createPstSetpoint(pstBe, -5); | ||
private final InjectionSetpoint generatorFr0Mw = NetworkActionUtils.createInjectionSetpoint(generatorFr, 0d, Unit.MEGAWATT); | ||
private final InjectionSetpoint generatorFr100Mw = NetworkActionUtils.createInjectionSetpoint(generatorFr, 100d, Unit.MEGAWATT); | ||
private final InjectionSetpoint generatorFr0A = NetworkActionUtils.createInjectionSetpoint(generatorFr, 0d, Unit.AMPERE); | ||
private final InjectionSetpoint generatorFr1000A = NetworkActionUtils.createInjectionSetpoint(generatorFr, 1000d, Unit.AMPERE); | ||
private final InjectionSetpoint generatorBe0Mw = NetworkActionUtils.createInjectionSetpoint(generatorBe, 0d, Unit.MEGAWATT); | ||
private final InjectionSetpoint generatorBe100Mw = NetworkActionUtils.createInjectionSetpoint(generatorBe, 100d, Unit.MEGAWATT); | ||
private final InjectionSetpoint generatorBe0A = NetworkActionUtils.createInjectionSetpoint(generatorBe, 0d, Unit.AMPERE); | ||
private final InjectionSetpoint generatorBe1000A = NetworkActionUtils.createInjectionSetpoint(generatorBe, 1000d, Unit.AMPERE); | ||
private final List<ElementaryAction> elementaryActions = gatherElementaryActions(); | ||
|
||
@Test | ||
void testElementaryActionsCompatibility() { | ||
assertIncompatibility(openSwitchFr, closeSwitchFr); | ||
assertIncompatibility(closeSwitchFr, openSwitchFr); | ||
assertIncompatibility(openSwitchBe, closeSwitchBe); | ||
assertIncompatibility(closeSwitchBe, openSwitchBe); | ||
assertIncompatibility(openSwitchFrCloseSwitchBe, openSwitchBeCloseSwitchFr); | ||
assertIncompatibility(openSwitchBeCloseSwitchFr, openSwitchFrCloseSwitchBe); | ||
assertIncompatibility(pstFr0, pstFr5); | ||
assertIncompatibility(pstFr5, pstFr0); | ||
assertIncompatibility(pstBe0, pstBeMinus5); | ||
assertIncompatibility(pstBeMinus5, pstBe0); | ||
assertIncompatibility(generatorFr0Mw, generatorFr100Mw, generatorFr0A, generatorFr1000A); | ||
assertIncompatibility(generatorFr100Mw, generatorFr0Mw, generatorFr0A, generatorFr1000A); | ||
assertIncompatibility(generatorFr0A, generatorFr100Mw, generatorFr0Mw, generatorFr1000A); | ||
assertIncompatibility(generatorFr1000A, generatorFr0Mw, generatorFr100Mw, generatorFr0A); | ||
assertIncompatibility(generatorBe0Mw, generatorBe100Mw, generatorBe0A, generatorBe1000A); | ||
assertIncompatibility(generatorBe100Mw, generatorBe0Mw, generatorBe0A, generatorBe1000A); | ||
assertIncompatibility(generatorBe0A, generatorBe0Mw, generatorBe100Mw, generatorBe1000A); | ||
assertIncompatibility(generatorBe1000A, generatorBe0Mw, generatorBe100Mw, generatorBe0A); | ||
} | ||
|
||
private List<ElementaryAction> gatherElementaryActions() { | ||
List<ElementaryAction> elementaryActions = new ArrayList<>(); | ||
elementaryActions.add(openSwitchFr); | ||
elementaryActions.add(closeSwitchFr); | ||
elementaryActions.add(openSwitchBe); | ||
elementaryActions.add(closeSwitchBe); | ||
elementaryActions.add(openSwitchFrCloseSwitchBe); | ||
elementaryActions.add(openSwitchBeCloseSwitchFr); | ||
elementaryActions.add(pstFr0); | ||
elementaryActions.add(pstFr5); | ||
elementaryActions.add(pstBe0); | ||
elementaryActions.add(pstBeMinus5); | ||
elementaryActions.add(generatorFr0Mw); | ||
elementaryActions.add(generatorFr100Mw); | ||
elementaryActions.add(generatorFr0A); | ||
elementaryActions.add(generatorFr1000A); | ||
elementaryActions.add(generatorBe0Mw); | ||
elementaryActions.add(generatorBe100Mw); | ||
elementaryActions.add(generatorBe0A); | ||
elementaryActions.add(generatorBe1000A); | ||
return elementaryActions; | ||
} | ||
|
||
private void assertIncompatibility(ElementaryAction elementaryAction, ElementaryAction... incompatibleElementaryActions) { | ||
List<ElementaryAction> incompatibleElementaryActionsList = List.of(incompatibleElementaryActions); | ||
for (ElementaryAction ea : elementaryActions) { | ||
if (incompatibleElementaryActionsList.contains(ea)) { | ||
assertFalse(elementaryAction.isCompatibleWith(ea)); | ||
} else { | ||
assertTrue(elementaryAction.isCompatibleWith(ea)); | ||
} | ||
} | ||
} | ||
} |
73 changes: 73 additions & 0 deletions
73
data/crac/crac-api/src/test/java/com/powsybl/openrao/data/cracapi/NetworkActionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
*/ | ||
|
||
package com.powsybl.openrao.data.cracapi; | ||
|
||
import com.powsybl.openrao.commons.Unit; | ||
import com.powsybl.openrao.data.cracapi.networkaction.ActionType; | ||
import com.powsybl.openrao.data.cracapi.networkaction.ElementaryAction; | ||
import com.powsybl.openrao.data.cracapi.networkaction.InjectionSetpoint; | ||
import com.powsybl.openrao.data.cracapi.networkaction.NetworkAction; | ||
import com.powsybl.openrao.data.cracapi.networkaction.PstSetpoint; | ||
import com.powsybl.openrao.data.cracapi.networkaction.SwitchPair; | ||
import com.powsybl.openrao.data.cracapi.networkaction.TopologicalAction; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Set; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertFalse; | ||
import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
||
/** | ||
* @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>} | ||
*/ | ||
class NetworkActionTest { | ||
@Test | ||
void compatibility() { | ||
NetworkAction hvdcFrEs200Mw = mockHvdcAction(-200d); | ||
NetworkAction hvdcEsFr200Mw = mockHvdcAction(200d); | ||
NetworkAction alignedPsts = mockNetworkAction(mockPstSetpoint("pst-fr-1", 4), mockPstSetpoint("pst-fr-2", 4), mockPstSetpoint("pst-fr-3", 4)); | ||
NetworkAction switchPairAndPst = mockNetworkAction(mockPstSetpoint("pst-fr-2", -2), mockSwitchPair()); | ||
|
||
assertTrue(hvdcFrEs200Mw.isCompatibleWith(hvdcFrEs200Mw)); | ||
assertFalse(hvdcFrEs200Mw.isCompatibleWith(hvdcEsFr200Mw)); | ||
assertTrue(hvdcFrEs200Mw.isCompatibleWith(alignedPsts)); | ||
assertTrue(hvdcFrEs200Mw.isCompatibleWith(switchPairAndPst)); | ||
assertTrue(hvdcEsFr200Mw.isCompatibleWith(hvdcEsFr200Mw)); | ||
assertTrue(hvdcEsFr200Mw.isCompatibleWith(alignedPsts)); | ||
assertTrue(hvdcEsFr200Mw.isCompatibleWith(switchPairAndPst)); | ||
assertTrue(alignedPsts.isCompatibleWith(alignedPsts)); | ||
assertFalse(alignedPsts.isCompatibleWith(switchPairAndPst)); | ||
assertTrue(switchPairAndPst.isCompatibleWith(switchPairAndPst)); | ||
} | ||
|
||
private NetworkAction mockHvdcAction(double setpoint) { | ||
return new NetworkActionUtils.NetworkActionImplTest(Set.of(mockTopologicalAction("switch-fr"), mockTopologicalAction("switch-es"), mockInjectionSetpoint("generator-fr-1", setpoint / 2d), mockInjectionSetpoint("generator-fr-2", setpoint / 2d), mockInjectionSetpoint("generator-es-1", -setpoint / 2d), mockInjectionSetpoint("generator-es-2", -setpoint / 2d))); | ||
} | ||
|
||
private NetworkAction mockNetworkAction(ElementaryAction... elementaryActions) { | ||
return new NetworkActionUtils.NetworkActionImplTest(new HashSet<>(List.of(elementaryActions))); | ||
} | ||
|
||
private TopologicalAction mockTopologicalAction(String switchId) { | ||
return new NetworkActionUtils.TopologicalActionImplTest(NetworkActionUtils.createNetworkElement(switchId), ActionType.OPEN); | ||
} | ||
|
||
private InjectionSetpoint mockInjectionSetpoint(String networkElementId, double setpoint) { | ||
return new NetworkActionUtils.InjectionSetpointImplTest(NetworkActionUtils.createNetworkElement(networkElementId), setpoint, Unit.MEGAWATT); | ||
} | ||
|
||
private PstSetpoint mockPstSetpoint(String pstId, int setpoint) { | ||
return new NetworkActionUtils.PstSetpointImplTest(NetworkActionUtils.createNetworkElement(pstId), setpoint); | ||
} | ||
|
||
private SwitchPair mockSwitchPair() { | ||
return new NetworkActionUtils.SwitchPairImplTest(NetworkActionUtils.createNetworkElement("switch-fr"), NetworkActionUtils.createNetworkElement("switch-es")); | ||
} | ||
} |
Oops, something went wrong.