Skip to content

Move checks on 3WT legs in the 3WT add method to be consistent with core #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EtienneLt merged 5 commits into from
Jun 26, 2025
Merged

Move checks on 3WT legs in the 3WT add method to be consistent with core #522

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
514f306
move checks on 3WT legs in the 3WT add method to be consistent with core
rolnico Apr 29, 2025
8f990b6
move checks in toLegAttributes()
rolnico May 6, 2025
47f50e9
Merge branch 'main' into nro/move_checks_on_3WT_legs
rolnico May 15, 2025
ca978bf
Merge branch 'main' into nro/move_checks_on_3WT_legs
EtienneLt Jun 26, 2025
2ade8d4
Merge branch 'main' into nro/move_checks_on_3WT_legs
EtienneLt Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 48 additions & 58 deletions .../src/main/java/com/powsybl/network/store/iidm/impl/ThreeWindingsTransformerAdderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
*/
package com.powsybl.network.store.iidm.impl;

import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.Substation;
import com.powsybl.iidm.network.ThreeWindingsTransformer;
import com.powsybl.iidm.network.ThreeWindingsTransformerAdder;
import com.powsybl.iidm.network.Validable;
import com.powsybl.iidm.network.ValidationException;
import com.powsybl.iidm.network.ValidationUtil;
import com.powsybl.iidm.network.VoltageLevel;
import com.powsybl.network.store.model.LegAttributes;
import com.powsybl.network.store.model.Resource;
import com.powsybl.network.store.model.ResourceType;
Expand Down Expand Up @@ -186,69 +192,42 @@ protected VoltageLevel checkVoltageLevel() {
@Override
public ThreeWindingsTransformerAdder add() {
checkParams();
checkVoltageLevel();
checkNodeBus();

if (legNumber == 1) {
leg1 = LegAttributes.builder()
.voltageLevelId(voltageLevelId)
.node(node)
.bus(bus)
.connectableBus(connectableBus != null ? connectableBus : bus)
.r(r)
.x(x)
.g(g)
.b(b)
.ratedU(ratedU)
.ratedS(ratedS)
.legNumber(legNumber)
.build();
} else if (legNumber == 2) {
leg2 = LegAttributes.builder()
.voltageLevelId(voltageLevelId)
.node(node)
.bus(bus)
.connectableBus(connectableBus != null ? connectableBus : bus)
.r(r)
.x(x)
.g(g)
.b(b)
.ratedU(ratedU)
.ratedS(ratedS)
.legNumber(legNumber)
.build();
} else if (legNumber == 3) {
leg3 = LegAttributes.builder()
.voltageLevelId(voltageLevelId)
.node(node)
.bus(bus)
.connectableBus(connectableBus != null ? connectableBus : bus)
.r(r)
.x(x)
.g(g)
.b(b)
.ratedU(ratedU)
.ratedS(ratedS)
.legNumber(legNumber)
.build();
switch (legNumber) {
case 1 -> legAdder1 = this;
case 2 -> legAdder2 = this;
case 3 -> legAdder3 = this;
default -> throw new IllegalStateException("Unexpected side: " + legNumber);
}

return threeWindingsTransformerAdder;
}

@Override
public String getMessageHeader() {
return String.format("3 windings transformer leg%d in substation %s: ", legNumber, substation.getName());
}

protected LegAttributes toLegAttributes() {
return LegAttributes.builder()
.voltageLevelId(voltageLevelId)
.node(node)
.bus(bus)
.connectableBus(connectableBus != null ? connectableBus : bus)
.r(r)
.x(x)
.g(g)
.b(b)
.ratedU(ratedU)
.ratedS(ratedS)
.legNumber(legNumber)
.build();
}
}

private double ratedU0;

private LegAttributes leg1;

private LegAttributes leg2;

private LegAttributes leg3;
private LegAdderImpl legAdder1;
private LegAdderImpl legAdder2;
private LegAdderImpl legAdder3;

ThreeWindingsTransformerAdderImpl(NetworkObjectIndex index, SubstationImpl substation) {
super(index);
Expand Down Expand Up @@ -286,19 +265,30 @@ public ThreeWindingsTransformerAdder setRatedU0(double ratedU0) {
public ThreeWindingsTransformer add() {
String id = checkAndGetUniqueId();

if (leg1 == null) {
// Leg 1
if (legAdder1 == null) {
throw new ValidationException(this, "Leg1 is not set");
}
if (leg2 == null) {
VoltageLevel voltageLevel1 = legAdder1.checkVoltageLevel();
legAdder1.checkNodeBus();
LegAttributes leg1 = legAdder1.toLegAttributes();

// Leg 2
if (legAdder2 == null) {
throw new ValidationException(this, "Leg2 is not set");
}
if (leg3 == null) {
VoltageLevel voltageLevel2 = legAdder2.checkVoltageLevel();
legAdder2.checkNodeBus();
LegAttributes leg2 = legAdder2.toLegAttributes();

// Leg 3
if (legAdder3 == null) {
throw new ValidationException(this, "Leg3 is not set");
}
VoltageLevel voltageLevel3 = legAdder3.checkVoltageLevel();
legAdder3.checkNodeBus();
LegAttributes leg3 = legAdder3.toLegAttributes();

VoltageLevel voltageLevel1 = getNetwork().getVoltageLevel(leg1.getVoltageLevelId());
VoltageLevel voltageLevel2 = getNetwork().getVoltageLevel(leg2.getVoltageLevelId());
VoltageLevel voltageLevel3 = getNetwork().getVoltageLevel(leg3.getVoltageLevelId());
if (substation != null) {
if (voltageLevel1.getSubstation().map(s -> s != substation).orElse(true) || voltageLevel2.getSubstation().map(s -> s != substation).orElse(true) || voltageLevel3.getSubstation().map(s -> s != substation).orElse(true)) {
throw new ValidationException(this,
Expand Down