Skip to content

Commit cefaee6

Browse files
ipirogMathieu-Deharbe
ipirog
and
Mathieu-Deharbe
authored
Rename field regulatingTerminalXXX into terminalRefConnectableXXX (#88)
* Rename field regulatingTerminalXXX into terminalRefConnectableXXX Signed-off-by: Igor PIROG <[email protected]> * Add some dummy tests :/ Signed-off-by: Igor PIROG <[email protected]> * Add other dummy tests :/ Signed-off-by: Igor PIROG <[email protected]> * Add missing regulation mode test :/ Signed-off-by: Igor PIROG <[email protected]> * Add modified attributes test :/ Signed-off-by: Igor PIROG <[email protected]> * Test isModified method Signed-off-by: Igor PIROG <[email protected]> * Add on test :/ Signed-off-by: Igor PIROG <[email protected]> * Corrections as asked from reviewer Signed-off-by: Igor PIROG <[email protected]> --------- Signed-off-by: Igor PIROG <[email protected]> Co-authored-by: Mathieu Deharbe <[email protected]>
1 parent 33c78b6 commit cefaee6

8 files changed

+162
-104
lines changed

‎src/main/java/org/gridsuite/modification/dto/TapChangerCreationInfos.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ public class TapChangerCreationInfos {
4040
@Schema(description = "targetDeadband")
4141
private Double targetDeadband;
4242

43-
@Schema(description = "Regulating terminal equipment id")
44-
private String regulatingTerminalId;
43+
@Schema(description = "Id of the equipment to which is attached the regulating terminal")
44+
private String terminalRefConnectableId;
4545

46-
@Schema(description = "Regulating terminal equipment type")
47-
private String regulatingTerminalType;
46+
@Schema(description = "Type of the equipment to which is attached the regulating terminal")
47+
private String terminalRefConnectableType;
4848

49-
@Schema(description = "Regulating terminal voltage level id")
50-
private String regulatingTerminalVlId;
49+
@Schema(description = "Voltage level id of the equipment to which is attached the regulating terminal")
50+
private String terminalRefConnectableVlId;
5151

5252
@Schema(description = "steps")
5353
private List<TapChangerStepCreationInfos> steps;

‎src/main/java/org/gridsuite/modification/dto/TapChangerModificationInfos.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public class TapChangerModificationInfos {
4949
@Schema(description = "targetDeadband")
5050
private AttributeModification<Double> targetDeadband;
5151

52-
@Schema(description = "Regulating terminal equipment id")
53-
private AttributeModification<String> regulatingTerminalId;
52+
@Schema(description = "Id of the equipment to which is attached the regulating terminal")
53+
private AttributeModification<String> terminalRefConnectableId;
5454

55-
@Schema(description = "Regulating terminal equipment type")
56-
private AttributeModification<String> regulatingTerminalType;
55+
@Schema(description = "Type of the equipment to which is attached the regulating terminal")
56+
private AttributeModification<String> terminalRefConnectableType;
5757

58-
@Schema(description = "Regulating terminal voltage level id")
59-
private AttributeModification<String> regulatingTerminalVlId;
58+
@Schema(description = "Voltage level id of the equipment to which is attached the regulating terminal")
59+
private AttributeModification<String> terminalRefConnectableVlId;
6060

6161
@Schema(description = "steps")
6262
private List<TapChangerStepCreationInfos> steps;

‎src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ private void addPhaseTapChangersToTwoWindingsTransformer(Network network, TwoWin
147147
regulationReports.add(getInstance().buildCreationReport(targetDeadband, "Target deadband"));
148148
}
149149
Terminal terminal = getInstance().getTerminalFromIdentifiable(network,
150-
phaseTapChangerInfos.getRegulatingTerminalId(),
151-
phaseTapChangerInfos.getRegulatingTerminalType(),
152-
phaseTapChangerInfos.getRegulatingTerminalVlId());
150+
phaseTapChangerInfos.getTerminalRefConnectableId(),
151+
phaseTapChangerInfos.getTerminalRefConnectableType(),
152+
phaseTapChangerInfos.getTerminalRefConnectableVlId());
153153
if (terminal != null) {
154154
phaseTapChangerAdder.setRegulationTerminal(terminal);
155-
regulatedTerminalReports.add(getInstance().buildCreationReport(phaseTapChangerInfos.getRegulatingTerminalVlId(), "Voltage level"));
156-
regulatedTerminalReports.add(getInstance().buildCreationReport(phaseTapChangerInfos.getRegulatingTerminalType() + " : " + phaseTapChangerInfos.getRegulatingTerminalId(), "Equipment"));
155+
regulatedTerminalReports.add(getInstance().buildCreationReport(phaseTapChangerInfos.getTerminalRefConnectableVlId(), "Voltage level"));
156+
regulatedTerminalReports.add(getInstance().buildCreationReport(phaseTapChangerInfos.getTerminalRefConnectableType() + " : " + phaseTapChangerInfos.getTerminalRefConnectableId(), "Equipment"));
157157
}
158158

159159
phaseTapChangerAdder.setRegulating(phaseTapChangerInfos.isRegulating())
@@ -189,12 +189,12 @@ private void addRatioTapChangersToTwoWindingsTransformer(Network network, TwoWin
189189
RatioTapChangerCreationInfos ratioTapChangerInfos = twoWindingsTransformerCreationInfos.getRatioTapChanger();
190190
RatioTapChangerAdder ratioTapChangerAdder = twt.newRatioTapChanger();
191191
Terminal terminal = getInstance().getTerminalFromIdentifiable(network,
192-
ratioTapChangerInfos.getRegulatingTerminalId(),
193-
ratioTapChangerInfos.getRegulatingTerminalType(),
194-
ratioTapChangerInfos.getRegulatingTerminalVlId());
192+
ratioTapChangerInfos.getTerminalRefConnectableId(),
193+
ratioTapChangerInfos.getTerminalRefConnectableType(),
194+
ratioTapChangerInfos.getTerminalRefConnectableVlId());
195195
if (terminal != null) {
196-
regulatedTerminalReports.add(getInstance().buildCreationReport(ratioTapChangerInfos.getRegulatingTerminalVlId(), "Voltage level"));
197-
regulatedTerminalReports.add(getInstance().buildCreationReport(ratioTapChangerInfos.getRegulatingTerminalType() + " : " + ratioTapChangerInfos.getRegulatingTerminalId(), "Equipment"));
196+
regulatedTerminalReports.add(getInstance().buildCreationReport(ratioTapChangerInfos.getTerminalRefConnectableVlId(), "Voltage level"));
197+
regulatedTerminalReports.add(getInstance().buildCreationReport(ratioTapChangerInfos.getTerminalRefConnectableType() + " : " + ratioTapChangerInfos.getTerminalRefConnectableId(), "Equipment"));
198198
}
199199

200200
Double targetDeadband = ratioTapChangerInfos.getTargetDeadband();

‎src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModification.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ private void checkAndModifyTapChanger(Network network, TapChangerModificationInf
7979

8080
private void checkTapChangerModification(Network network, TapChangerModificationInfos tapChangerModificationInfos, TapChanger tapChanger, String errorMessage) {
8181
ModificationUtils.getInstance().checkEnableRegulation(tapChangerModificationInfos.getRegulationType(),
82-
tapChangerModificationInfos.getRegulatingTerminalId(),
83-
tapChangerModificationInfos.getRegulatingTerminalType(),
84-
tapChangerModificationInfos.getRegulatingTerminalVlId(),
82+
tapChangerModificationInfos.getTerminalRefConnectableId(),
83+
tapChangerModificationInfos.getTerminalRefConnectableType(),
84+
tapChangerModificationInfos.getTerminalRefConnectableVlId(),
8585
null,
8686
tapChanger.getRegulationTerminal(),
8787
network,
@@ -589,33 +589,33 @@ private void processRegulatingTerminal(TapChangerModificationInfos tapChangerMod
589589
setRegulatingTerminalInfos(tapChangerModificationInfos, terminal);
590590
}
591591

592-
if (tapChangerModificationInfos.getRegulatingTerminalId() != null
593-
&& tapChangerModificationInfos.getRegulatingTerminalType() != null
594-
&& tapChangerModificationInfos.getRegulatingTerminalVlId() != null) {
592+
if (tapChangerModificationInfos.getTerminalRefConnectableId() != null
593+
&& tapChangerModificationInfos.getTerminalRefConnectableType() != null
594+
&& tapChangerModificationInfos.getTerminalRefConnectableVlId() != null) {
595595
Terminal terminal = ModificationUtils.getInstance().getTerminalFromIdentifiable(network,
596-
tapChangerModificationInfos.getRegulatingTerminalId().getValue(),
597-
tapChangerModificationInfos.getRegulatingTerminalType().getValue(),
598-
tapChangerModificationInfos.getRegulatingTerminalVlId().getValue());
596+
tapChangerModificationInfos.getTerminalRefConnectableId().getValue(),
597+
tapChangerModificationInfos.getTerminalRefConnectableType().getValue(),
598+
tapChangerModificationInfos.getTerminalRefConnectableVlId().getValue());
599599
if (isModification) {
600600
tapChanger.setRegulationTerminal(terminal);
601601
} else {
602602
tapChangerAdder.setRegulationTerminal(terminal);
603603
}
604604
regulatedTerminalReports
605605
.add(ModificationUtils.getInstance().buildModificationReport(oldVoltageLevel,
606-
tapChangerModificationInfos.getRegulatingTerminalVlId().getValue(),
606+
tapChangerModificationInfos.getTerminalRefConnectableVlId().getValue(),
607607
"Voltage level"));
608608
regulatedTerminalReports.add(ModificationUtils.getInstance().buildModificationReport(oldEquipment,
609-
tapChangerModificationInfos.getRegulatingTerminalType().getValue() + " : "
610-
+ tapChangerModificationInfos.getRegulatingTerminalId().getValue(),
609+
tapChangerModificationInfos.getTerminalRefConnectableType().getValue() + " : "
610+
+ tapChangerModificationInfos.getTerminalRefConnectableId().getValue(),
611611
"Equipment"));
612612
}
613613
}
614614

615615
private void setRegulatingTerminalInfos(TapChangerModificationInfos tapChangerModificationInfos, Terminal terminal) {
616-
tapChangerModificationInfos.setRegulatingTerminalVlId(new AttributeModification<>(terminal.getVoltageLevel().getId(), OperationType.SET));
617-
tapChangerModificationInfos.setRegulatingTerminalId(new AttributeModification<>(terminal.getConnectable().getId(), OperationType.SET));
618-
tapChangerModificationInfos.setRegulatingTerminalType(new AttributeModification<>(terminal.getConnectable().getType().name(), OperationType.SET));
616+
tapChangerModificationInfos.setTerminalRefConnectableVlId(new AttributeModification<>(terminal.getVoltageLevel().getId(), OperationType.SET));
617+
tapChangerModificationInfos.setTerminalRefConnectableId(new AttributeModification<>(terminal.getConnectable().getId(), OperationType.SET));
618+
tapChangerModificationInfos.setTerminalRefConnectableType(new AttributeModification<>(terminal.getConnectable().getType().name(), OperationType.SET));
619619
}
620620

621621
private static void processTapchangerSteps(List<ReportNode> tapChangerStepsReports,
@@ -750,12 +750,12 @@ private boolean commonTapChangerAttributesModified(TapChangerModificationInfos t
750750
&& tapChangerModificationInfos.getRegulationType().getValue() != null
751751
|| tapChangerModificationInfos.getRegulationSide() != null
752752
&& tapChangerModificationInfos.getRegulationSide().getValue() != null
753-
|| tapChangerModificationInfos.getRegulatingTerminalId() != null
754-
&& tapChangerModificationInfos.getRegulatingTerminalId().getValue() != null
755-
|| tapChangerModificationInfos.getRegulatingTerminalType() != null
756-
&& tapChangerModificationInfos.getRegulatingTerminalType().getValue() != null
757-
|| tapChangerModificationInfos.getRegulatingTerminalVlId() != null
758-
&& tapChangerModificationInfos.getRegulatingTerminalVlId().getValue() != null
753+
|| tapChangerModificationInfos.getTerminalRefConnectableId() != null
754+
&& tapChangerModificationInfos.getTerminalRefConnectableId().getValue() != null
755+
|| tapChangerModificationInfos.getTerminalRefConnectableType() != null
756+
&& tapChangerModificationInfos.getTerminalRefConnectableType().getValue() != null
757+
|| tapChangerModificationInfos.getTerminalRefConnectableVlId() != null
758+
&& tapChangerModificationInfos.getTerminalRefConnectableVlId().getValue() != null
759759
|| tapChangerModificationInfos.getTargetDeadband() != null
760760
&& tapChangerModificationInfos.getTargetDeadband().getValue() != null
761761
|| positionsAndStepsModified(tapChangerModificationInfos));

‎src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ protected ModificationInfos buildModification() {
8484
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
8585
.lowTapPosition(1)
8686
.tapPosition(2)
87-
.regulatingTerminalId("idGenerator1")
88-
.regulatingTerminalVlId("v1")
87+
.terminalRefConnectableId("idGenerator1")
88+
.terminalRefConnectableVlId("v1")
8989
.regulating(false)
90-
.regulatingTerminalType("GENERATOR")
90+
.terminalRefConnectableType("GENERATOR")
9191
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
9292
.steps(List.of(TapChangerStepCreationInfos.builder()
9393
.index(1)
@@ -122,9 +122,9 @@ protected ModificationInfos buildModification() {
122122
.tapPosition(6)
123123
.regulating(true)
124124
.targetDeadband(1.)
125-
.regulatingTerminalId("idGenerator1")
126-
.regulatingTerminalVlId("v2")
127-
.regulatingTerminalType("GENERATOR")
125+
.terminalRefConnectableId("idGenerator1")
126+
.terminalRefConnectableVlId("v2")
127+
.terminalRefConnectableType("GENERATOR")
128128
.loadTapChangingCapabilities(true)
129129
.targetV(5.)
130130
.steps(List.of(TapChangerStepCreationInfos.builder()
@@ -201,9 +201,9 @@ void testCreateTwoWindingsTransformerWithRatioTapChangerInBusBreaker() throws Ex
201201
.tapPosition(1)
202202
.regulating(true)
203203
.targetDeadband(null)
204-
.regulatingTerminalVlId("v1")
205-
.regulatingTerminalId("idGenerator1")
206-
.regulatingTerminalType("GENERATOR")
204+
.terminalRefConnectableVlId("v1")
205+
.terminalRefConnectableId("idGenerator1")
206+
.terminalRefConnectableType("GENERATOR")
207207
.loadTapChangingCapabilities(true)
208208
.targetV(220.)
209209
.steps(getTapChangerSteps())
@@ -262,9 +262,9 @@ void testCreateTwoWindingsTransformerWithPhaseTapChangerInBusBreaker() throws Ex
262262
.targetDeadband(null)
263263
.regulationMode(PhaseTapChanger.RegulationMode.ACTIVE_POWER_CONTROL)
264264
.regulationValue(10.0)
265-
.regulatingTerminalVlId("v1")
266-
.regulatingTerminalId("idGenerator1")
267-
.regulatingTerminalType("GENERATOR")
265+
.terminalRefConnectableVlId("v1")
266+
.terminalRefConnectableId("idGenerator1")
267+
.terminalRefConnectableType("GENERATOR")
268268
.steps(getTapChangerSteps())
269269
.build();
270270
TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos = TwoWindingsTransformerCreationInfos.builder()

‎src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationMixedBreakerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ protected ModificationInfos buildModification() {
5656
.phaseTapChanger(PhaseTapChangerCreationInfos.builder()
5757
.lowTapPosition(1)
5858
.tapPosition(2)
59-
.regulatingTerminalId("v1load")
60-
.regulatingTerminalVlId("v1")
59+
.terminalRefConnectableId("v1load")
60+
.terminalRefConnectableVlId("v1")
6161
.regulating(false)
62-
.regulatingTerminalType("LOAD")
62+
.terminalRefConnectableType("LOAD")
6363
.regulationMode(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)
6464
.steps(List.of(TapChangerStepCreationInfos.builder()
6565
.index(1)
@@ -94,9 +94,9 @@ protected ModificationInfos buildModification() {
9494
.tapPosition(6)
9595
.regulating(true)
9696
.targetDeadband(1.)
97-
.regulatingTerminalId("v1load")
98-
.regulatingTerminalVlId("v1")
99-
.regulatingTerminalType("LOAD")
97+
.terminalRefConnectableId("v1load")
98+
.terminalRefConnectableVlId("v1")
99+
.terminalRefConnectableType("LOAD")
100100
.loadTapChangingCapabilities(true)
101101
.targetV(5.)
102102
.steps(List.of(TapChangerStepCreationInfos.builder()

0 commit comments

Comments
 (0)