Skip to content

Commit 44da057

Browse files
GodelaineGodelaine
authored
chore(CI/CD): Rename dangling lines to boundary lines and update JSON CRAC version to 2.10 (#1655)
* rename Dangling Line to Boundary Line * bump JSON CRAC version to 2.10 * Adapt to new sensi API --------- Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com> Co-authored-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com>
1 parent 2cf3579 commit 44da057

91 files changed

Lines changed: 700 additions & 441 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/snapshot-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
# Build powsybl-core
6161
- name: Checking for powsybl-core snapshot branch
62-
run: ${{ env.SCRIPTS_PATH }}/check_snapshot_branch.sh "https://github.com/powsybl/powsybl-open-loadflow.git" ${{ env.SNAPSHOT_VERSION }}
62+
run: ${{ env.SCRIPTS_PATH }}/check_snapshot_branch.sh "https://github.com/powsybl/powsybl-core.git" ${{ env.SNAPSHOT_VERSION }}
6363

6464
- name: Checkout core sources
6565
uses: actions/checkout@v4

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/networkaction/DanglingLineActionAdder.java renamed to data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/networkaction/BoundaryLineActionAdder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
/**
1111
* @author Pauline JEAN-MARIE {@literal <pauline.jean-marie at artelys.com>}
1212
*/
13-
public interface DanglingLineActionAdder extends SingleNetworkElementActionAdder<DanglingLineActionAdder> {
13+
public interface BoundaryLineActionAdder extends SingleNetworkElementActionAdder<BoundaryLineActionAdder> {
1414

15-
DanglingLineActionAdder withActivePowerValue(double setPoint);
15+
BoundaryLineActionAdder withActivePowerValue(double setPoint);
1616

1717
}

‎data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/networkaction/NetworkAction.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package com.powsybl.openrao.data.crac.api.networkaction;
99

1010
import com.powsybl.action.Action;
11-
import com.powsybl.action.DanglingLineAction;
11+
import com.powsybl.action.BoundaryLineAction;
1212
import com.powsybl.action.GeneratorAction;
1313
import com.powsybl.action.HvdcAction;
1414
import com.powsybl.action.LoadAction;
@@ -70,7 +70,7 @@ default boolean isCompatibleWith(NetworkAction otherNetworkAction) {
7070
} else {
7171
// FIXME: Action equals is only implemented for Action currently used in Rao,
7272
// so the code above is not working for all Action but only for:
73-
// GeneratorAction, LoadAction, DanglingLineAction, ShuntCompensatorPositionAction,
73+
// GeneratorAction, LoadAction, BoundaryLineAction, ShuntCompensatorPositionAction,
7474
// PhaseTapChangerTapPositionAction, TerminalsConnectionAction, SwitchAction
7575
return otherNetworkAction.getElementaryActions().stream().allMatch(otherElementaryAction -> {
7676
if (otherElementaryAction instanceof SwitchPair) {
@@ -94,8 +94,8 @@ static String getNetworkElementId(Action elementaryAction) {
9494
return generatorAction.getGeneratorId();
9595
} else if (elementaryAction instanceof LoadAction loadAction) {
9696
return loadAction.getLoadId();
97-
} else if (elementaryAction instanceof DanglingLineAction danglingLineAction) {
98-
return danglingLineAction.getDanglingLineId();
97+
} else if (elementaryAction instanceof BoundaryLineAction boundaryLineAction) {
98+
return boundaryLineAction.getBoundaryLineId();
9999
} else if (elementaryAction instanceof ShuntCompensatorPositionAction shuntCompensatorPositionAction) {
100100
return shuntCompensatorPositionAction.getShuntCompensatorId();
101101
} else if (elementaryAction instanceof PhaseTapChangerTapPositionAction phaseTapChangerTapPositionAction) {

‎data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/networkaction/NetworkActionAdder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface NetworkActionAdder extends RemedialActionAdder<NetworkActionAdd
2525

2626
LoadActionAdder newLoadAction();
2727

28-
DanglingLineActionAdder newDanglingLineAction();
28+
BoundaryLineActionAdder newBoundaryLineAction();
2929

3030
ShuntCompensatorPositionActionAdder newShuntCompensatorPositionAction();
3131

‎data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/rangeaction/InjectionRangeAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* A range action interface specifying an action on one or several Injections
1616
*
17-
* Injections can be Generator and/or Loads (DanglingLine are not yet taken into
17+
* Injections can be Generator and/or Loads (BoundaryLines are not yet taken into
1818
* account in that object).
1919
*
2020
* The InjectionRangeAction can affect several Injections, the conversion between

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/DanglingLineActionAdderImpl.java renamed to data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/BoundaryLineActionAdderImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
package com.powsybl.openrao.data.crac.impl;
99

1010
import com.powsybl.action.Action;
11-
import com.powsybl.action.DanglingLineActionBuilder;
12-
import com.powsybl.openrao.data.crac.api.networkaction.DanglingLineActionAdder;
11+
import com.powsybl.action.BoundaryLineActionBuilder;
12+
import com.powsybl.openrao.data.crac.api.networkaction.BoundaryLineActionAdder;
1313

1414
import static com.powsybl.openrao.data.crac.impl.AdderUtils.assertAttributeNotNull;
1515

1616
/**
1717
* @author Pauline JEAN-MARIE {@literal <pauline.jean-marie at artelys.com>}
1818
*/
19-
public class DanglingLineActionAdderImpl extends AbstractSingleNetworkElementActionAdderImpl<DanglingLineActionAdder> implements DanglingLineActionAdder {
19+
public class BoundaryLineActionAdderImpl extends AbstractSingleNetworkElementActionAdderImpl<BoundaryLineActionAdder> implements BoundaryLineActionAdder {
2020

2121
private Double activePowerValue;
2222

23-
DanglingLineActionAdderImpl(NetworkActionAdderImpl ownerAdder) {
23+
BoundaryLineActionAdderImpl(NetworkActionAdderImpl ownerAdder) {
2424
super(ownerAdder);
2525
}
2626

2727
@Override
28-
public DanglingLineActionAdder withActivePowerValue(double activePowerValue) {
28+
public BoundaryLineActionAdder withActivePowerValue(double activePowerValue) {
2929
this.activePowerValue = activePowerValue;
3030
return this;
3131
}
3232

3333
protected Action buildAction() {
34-
return new DanglingLineActionBuilder()
34+
return new BoundaryLineActionBuilder()
3535
.withId(String.format("%s_%s_%s", getActionName(), networkElementId, activePowerValue))
3636
.withNetworkElementId(networkElementId)
3737
.withRelativeValue(false)
@@ -44,6 +44,6 @@ protected void assertSpecificAttributes() {
4444
}
4545

4646
protected String getActionName() {
47-
return "DanglingLineAction";
47+
return "BoundaryLineAction";
4848
}
4949
}

‎data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/ContingencyAdderImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void addElementsInContingency(ContingencyBuilder builder, String conting
5050
case SHUNT_COMPENSATOR -> builder.addShuntCompensator(contingencyElementId);
5151
case HVDC_LINE -> builder.addHvdcLine(contingencyElementId);
5252
case BUSBAR_SECTION -> builder.addBusbarSection(contingencyElementId);
53-
case DANGLING_LINE -> builder.addDanglingLine(contingencyElementId);
53+
case BOUNDARY_LINE -> builder.addBoundaryLine(contingencyElementId);
5454
case LINE -> builder.addLine(contingencyElementId);
5555
case TWO_WINDINGS_TRANSFORMER -> builder.addTwoWindingsTransformer(contingencyElementId);
5656
case THREE_WINDINGS_TRANSFORMER -> builder.addThreeWindingsTransformer(contingencyElementId);

‎data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/crac/impl/NetworkActionAdderImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.powsybl.openrao.commons.logs.OpenRaoLoggerProvider;
1313
import com.powsybl.openrao.data.crac.api.NetworkElement;
1414
import com.powsybl.openrao.data.crac.api.networkaction.AcEmulationDeactivationActionAdder;
15-
import com.powsybl.openrao.data.crac.api.networkaction.DanglingLineActionAdder;
15+
import com.powsybl.openrao.data.crac.api.networkaction.BoundaryLineActionAdder;
1616
import com.powsybl.openrao.data.crac.api.networkaction.GeneratorActionAdder;
1717
import com.powsybl.openrao.data.crac.api.networkaction.LoadActionAdder;
1818
import com.powsybl.openrao.data.crac.api.networkaction.NetworkAction;
@@ -74,8 +74,8 @@ public LoadActionAdder newLoadAction() {
7474
}
7575

7676
@Override
77-
public DanglingLineActionAdder newDanglingLineAction() {
78-
return new DanglingLineActionAdderImpl(this);
77+
public BoundaryLineActionAdder newBoundaryLineAction() {
78+
return new BoundaryLineActionAdderImpl(this);
7979
}
8080

8181
@Override

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/crac/impl/DanglingLineActionAdderImplTest.java renamed to data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/crac/impl/BoundaryLineActionAdderImplTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
package com.powsybl.openrao.data.crac.impl;
99

10-
import com.powsybl.action.DanglingLineAction;
10+
import com.powsybl.action.BoundaryLineAction;
1111
import com.powsybl.openrao.commons.OpenRaoException;
1212
import com.powsybl.openrao.data.crac.api.Crac;
13-
import com.powsybl.openrao.data.crac.api.networkaction.DanglingLineActionAdder;
13+
import com.powsybl.openrao.data.crac.api.networkaction.BoundaryLineActionAdder;
1414
import com.powsybl.openrao.data.crac.api.networkaction.NetworkAction;
1515
import com.powsybl.openrao.data.crac.api.networkaction.NetworkActionAdder;
1616
import org.junit.jupiter.api.BeforeEach;
@@ -23,7 +23,7 @@
2323
/**
2424
* @author Pauline JEAN-MARIE {@literal <pauline.jean-marie at artelys.com>}
2525
*/
26-
class DanglingLineActionAdderImplTest {
26+
class BoundaryLineActionAdderImplTest {
2727

2828
private Crac crac;
2929
private NetworkActionAdder networkActionAdder;
@@ -39,15 +39,15 @@ public void setUp() {
3939

4040
@Test
4141
void testOk() {
42-
NetworkAction networkAction = networkActionAdder.newDanglingLineAction()
42+
NetworkAction networkAction = networkActionAdder.newBoundaryLineAction()
4343
.withNetworkElement("groupNetworkElementId")
4444
.withActivePowerValue(100.)
4545
.add()
4646
.add();
4747

48-
DanglingLineAction danglingLineAction = (DanglingLineAction) networkAction.getElementaryActions().iterator().next();
49-
assertEquals("groupNetworkElementId", danglingLineAction.getDanglingLineId());
50-
assertEquals(100., danglingLineAction.getActivePowerValue().getAsDouble(), 1e-3);
48+
BoundaryLineAction boundaryLineAction = (BoundaryLineAction) networkAction.getElementaryActions().iterator().next();
49+
assertEquals("groupNetworkElementId", boundaryLineAction.getBoundaryLineId());
50+
assertEquals(100., boundaryLineAction.getActivePowerValue().getAsDouble(), 1e-3);
5151

5252
// check that network element have been added to CracImpl
5353
assertEquals(1, ((CracImpl) crac).getNetworkElements().size());
@@ -56,18 +56,18 @@ void testOk() {
5656

5757
@Test
5858
void testNoNetworkElement() {
59-
DanglingLineActionAdder danglingLineActionAdder = networkActionAdder.newDanglingLineAction()
59+
BoundaryLineActionAdder boundaryLineActionAdder = networkActionAdder.newBoundaryLineAction()
6060
.withActivePowerValue(100.);
61-
Exception e = assertThrows(OpenRaoException.class, danglingLineActionAdder::add);
62-
assertEquals("Cannot add DanglingLineAction without a network element. Please use withNetworkElement() with a non null value", e.getMessage());
61+
Exception e = assertThrows(OpenRaoException.class, boundaryLineActionAdder::add);
62+
assertEquals("Cannot add BoundaryLineAction without a network element. Please use withNetworkElement() with a non null value", e.getMessage());
6363
}
6464

6565
@Test
6666
void testNoSetpoint() {
67-
DanglingLineActionAdder danglingLineActionAdder = networkActionAdder.newDanglingLineAction()
67+
BoundaryLineActionAdder boundaryLineActionAdder = networkActionAdder.newBoundaryLineAction()
6868
.withNetworkElement("groupNetworkElementId");
69-
Exception e = assertThrows(OpenRaoException.class, danglingLineActionAdder::add);
70-
assertEquals("Cannot add DanglingLineAction without a activePowerValue. Please use withActivePowerValue() with a non null value", e.getMessage());
69+
Exception e = assertThrows(OpenRaoException.class, boundaryLineActionAdder::add);
70+
assertEquals("Cannot add BoundaryLineAction without a activePowerValue. Please use withActivePowerValue() with a non null value", e.getMessage());
7171
}
7272

7373
}

0 commit comments

Comments
 (0)