Skip to content

Commit 26b24cb

Browse files
committed
fixes and add tests
Signed-off-by: AbdelHedhili <[email protected]>
1 parent 5b131cd commit 26b24cb

File tree

9 files changed

+546
-184
lines changed

9 files changed

+546
-184
lines changed

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
import com.powsybl.iidm.network.Injection;
1111
import com.powsybl.iidm.network.Terminal;
1212
import com.powsybl.network.store.iidm.impl.ConnectablePositionAdderImpl.ConnectablePositionCreator;
13-
import com.powsybl.network.store.model.ConnectableDirection;
14-
import com.powsybl.network.store.model.ConnectablePositionAttributes;
15-
import com.powsybl.network.store.model.InjectionAttributes;
16-
import com.powsybl.network.store.model.Resource;
13+
import com.powsybl.network.store.model.*;
1714
import com.powsybl.sld.iidm.extensions.ConnectablePosition;
1815
import com.powsybl.sld.iidm.extensions.ConnectablePosition.Feeder;
1916

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

-67
This file was deleted.

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.powsybl.network.store.iidm.impl;
88

99
import com.powsybl.iidm.network.ActivePowerLimitsAdder;
10+
import com.powsybl.iidm.network.LoadingLimitsAdder.TemporaryLimitAdder;
1011
import com.powsybl.iidm.network.ValidationException;
1112
import com.powsybl.network.store.model.TemporaryCurrentLimitAttributes;
1213

@@ -15,7 +16,7 @@
1516
/**
1617
* @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
1718
*/
18-
class TemporaryLimitActiveLimitAdderImpl implements ActivePowerLimitsAdder.TemporaryLimitAdder {
19+
class TemporaryLimitActiveLimitAdderImpl implements TemporaryLimitAdder {
1920

2021
private String name;
2122

@@ -34,31 +35,31 @@ class TemporaryLimitActiveLimitAdderImpl implements ActivePowerLimitsAdder.Tempo
3435
}
3536

3637
@Override
37-
public ActivePowerLimitsAdder.TemporaryLimitAdder setName(String name) {
38+
public TemporaryLimitAdder setName(String name) {
3839
this.name = name;
3940
return this;
4041
}
4142

4243
@Override
43-
public ActivePowerLimitsAdder.TemporaryLimitAdder setValue(double value) {
44+
public TemporaryLimitAdder setValue(double value) {
4445
this.value = value;
4546
return this;
4647
}
4748

4849
@Override
49-
public ActivePowerLimitsAdder.TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
50+
public TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
5051
this.acceptableDuration = acceptableDuration;
5152
return this;
5253
}
5354

5455
@Override
55-
public ActivePowerLimitsAdder.TemporaryLimitAdder setFictitious(boolean fictitious) {
56+
public TemporaryLimitAdder setFictitious(boolean fictitious) {
5657
this.fictitious = fictitious;
5758
return this;
5859
}
5960

6061
@Override
61-
public ActivePowerLimitsAdder.TemporaryLimitAdder ensureNameUnicity() {
62+
public TemporaryLimitAdder ensureNameUnicity() {
6263
this.ensureNameUnicity = true;
6364
return this;
6465
}

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.powsybl.network.store.iidm.impl;
88

99
import com.powsybl.iidm.network.ApparentPowerLimitsAdder;
10+
import com.powsybl.iidm.network.LoadingLimitsAdder.TemporaryLimitAdder;
1011
import com.powsybl.iidm.network.ValidationException;
1112
import com.powsybl.network.store.model.TemporaryCurrentLimitAttributes;
1213

@@ -15,7 +16,7 @@
1516
/**
1617
* @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
1718
*/
18-
class TemporaryLimitApparentLimitAdderImpl implements ApparentPowerLimitsAdder.TemporaryLimitAdder {
19+
class TemporaryLimitApparentLimitAdderImpl implements TemporaryLimitAdder {
1920

2021
private String name;
2122

@@ -34,31 +35,31 @@ class TemporaryLimitApparentLimitAdderImpl implements ApparentPowerLimitsAdder.T
3435
}
3536

3637
@Override
37-
public ApparentPowerLimitsAdder.TemporaryLimitAdder setName(String name) {
38+
public TemporaryLimitAdder setName(String name) {
3839
this.name = name;
3940
return this;
4041
}
4142

4243
@Override
43-
public ApparentPowerLimitsAdder.TemporaryLimitAdder setValue(double value) {
44+
public TemporaryLimitAdder setValue(double value) {
4445
this.value = value;
4546
return this;
4647
}
4748

4849
@Override
49-
public ApparentPowerLimitsAdder.TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
50+
public TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
5051
this.acceptableDuration = acceptableDuration;
5152
return this;
5253
}
5354

5455
@Override
55-
public ApparentPowerLimitsAdder.TemporaryLimitAdder setFictitious(boolean fictitious) {
56+
public TemporaryLimitAdder setFictitious(boolean fictitious) {
5657
this.fictitious = fictitious;
5758
return this;
5859
}
5960

6061
@Override
61-
public ApparentPowerLimitsAdder.TemporaryLimitAdder ensureNameUnicity() {
62+
public TemporaryLimitAdder ensureNameUnicity() {
6263
this.ensureNameUnicity = true;
6364
return this;
6465
}

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.powsybl.network.store.iidm.impl;
88

99
import com.powsybl.iidm.network.CurrentLimitsAdder;
10+
import com.powsybl.iidm.network.LoadingLimitsAdder.TemporaryLimitAdder;
1011
import com.powsybl.iidm.network.ValidationException;
1112
import com.powsybl.network.store.model.TemporaryCurrentLimitAttributes;
1213

@@ -15,7 +16,7 @@
1516
/**
1617
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
1718
*/
18-
class TemporaryLimitCurrentLimitAdderImpl implements CurrentLimitsAdder.TemporaryLimitAdder {
19+
class TemporaryLimitCurrentLimitAdderImpl implements TemporaryLimitAdder {
1920

2021
private String name;
2122

@@ -34,31 +35,31 @@ class TemporaryLimitCurrentLimitAdderImpl implements CurrentLimitsAdder.Temporar
3435
}
3536

3637
@Override
37-
public CurrentLimitsAdder.TemporaryLimitAdder setName(String name) {
38+
public TemporaryLimitAdder setName(String name) {
3839
this.name = name;
3940
return this;
4041
}
4142

4243
@Override
43-
public CurrentLimitsAdder.TemporaryLimitAdder setValue(double value) {
44+
public TemporaryLimitAdder setValue(double value) {
4445
this.value = value;
4546
return this;
4647
}
4748

4849
@Override
49-
public CurrentLimitsAdder.TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
50+
public TemporaryLimitAdder setAcceptableDuration(int acceptableDuration) {
5051
this.acceptableDuration = acceptableDuration;
5152
return this;
5253
}
5354

5455
@Override
55-
public CurrentLimitsAdder.TemporaryLimitAdder setFictitious(boolean fictitious) {
56+
public TemporaryLimitAdder setFictitious(boolean fictitious) {
5657
this.fictitious = fictitious;
5758
return this;
5859
}
5960

6061
@Override
61-
public CurrentLimitsAdder.TemporaryLimitAdder ensureNameUnicity() {
62+
public TemporaryLimitAdder ensureNameUnicity() {
6263
this.ensureNameUnicity = true;
6364
return this;
6465
}

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

+7
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,13 @@ public static Network create(NetworkFactory networkFactory) {
439439
.setId("BUS6")
440440
.add();
441441

442+
vl5.newLoad()
443+
.setId("load1")
444+
.setP0(1)
445+
.setQ0(2)
446+
.setConnectableBus("BUS5")
447+
.add();
448+
442449
TwoWindingsTransformer twoWindingsTransformer = s3.newTwoWindingsTransformer()
443450
.setId("TwoWT1")
444451
.setName("Two windings transformer 1")

0 commit comments

Comments
 (0)