Skip to content
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

Use tie line util get paired dangling line #114

Merged
merged 20 commits into from
Sep 29, 2023
Merged

Use tie line util get paired dangling line #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
86ef897
test emf using subnetworks
zamarrenolm Jun 29, 2023
9642034
Update maven.yml
zamarrenolm Aug 8, 2023
c24a17f
merge main, solve conflicts; merging view has been removed
zamarrenolm Aug 8, 2023
0dcf6b9
merge main, solve conflicts; merging view has been removed
zamarrenolm Aug 8, 2023
47da7dc
Add a test on EQ / SSH / TP partial exports after merging IGM
olperr1 Aug 17, 2023
2637900
uniform naming, remove unused method
zamarrenolm Sep 18, 2023
b354c5b
Merge branch 'main' into emf_subnetworks
zamarrenolm Sep 20, 2023
edb37eb
add unit test
zamarrenolm Sep 20, 2023
0b3e8a5
migration after changes in scalable (float to double in percentages))
zamarrenolm Sep 20, 2023
bed0a60
migration to next version of core and open-loadflow
zamarrenolm Sep 21, 2023
90035fd
use branch from open-loadflow that bumps to core 6.0.0
zamarrenolm Sep 21, 2023
169ac94
update core to rc1, parent to 15
zamarrenolm Sep 22, 2023
08d4859
Update maven.yml
zamarrenolm Sep 25, 2023
7d7c7b9
merge main
zamarrenolm Sep 25, 2023
73193ba
scalable uses doubles; pairing key
zamarrenolm Sep 25, 2023
2ab4fc1
use TieLineUtil getPairedDanglingLine
OpenSuze Sep 25, 2023
bfc1b87
simplify export: call network write
zamarrenolm Sep 26, 2023
fdaedb7
Merge branch 'main' into emf_subnetworks
annetill Sep 28, 2023
b9afaa7
Bump to core 6.0.0 and olf 1.3.0
annetill Sep 28, 2023
73b5d3c
Merge branch 'emf_subnetworks' into refactoring/use_TieLineUtil_getPa…
annetill Sep 28, 2023
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
20 changes: 7 additions & 13 deletions balances-adjustment/src/main/java/com/powsybl/balances_adjustment/util/CountryArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.powsybl.commons.PowsyblException;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.util.TieLineUtil;

import java.util.*;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -35,13 +36,13 @@ public CountryArea(Network network, List<Country> countries) {

danglingLineBordersCache = network.getDanglingLineStream()
.filter(this::isAreaBorder)
.collect(Collectors.toList());
.toList();
lineBordersCache = network.getLineStream()
.filter(this::isAreaBorder)
.collect(Collectors.toList());
.toList();
hvdcLineBordersCache = network.getHvdcLineStream()
.filter(this::isAreaBorder)
.collect(Collectors.toList());
.toList();

busesCache = network.getBusView().getBusStream()
.filter(bus -> bus.getVoltageLevel().getSubstation().flatMap(Substation::getCountry).map(countries::contains).orElse(false))
Expand Down Expand Up @@ -73,7 +74,7 @@ public double getLeavingFlowToCountry(CountryArea otherCountryArea) {
});
double sum = 0;
for (DanglingLine danglingLine : danglingLineBordersCache) {
if (otherSideIsInArea(danglingLine, otherCountryArea)) {
if (isOtherSideInArea(danglingLine, otherCountryArea)) {
sum += getLeavingFlow(danglingLine);
}
}
Expand All @@ -90,15 +91,8 @@ public double getLeavingFlowToCountry(CountryArea otherCountryArea) {
return sum;
}

private boolean otherSideIsInArea(DanglingLine danglingLine, CountryArea countryArea) {
Optional<TieLine> optionalTieLine = danglingLine.getTieLine();
if (optionalTieLine.isPresent()) {
TieLine tieLine = optionalTieLine.get();
DanglingLine otherSide = tieLine.getDanglingLine1() == danglingLine ? tieLine.getDanglingLine2() : tieLine.getDanglingLine1();
return countryArea.isAreaBorder(otherSide);
} else {
return false;
}
private boolean isOtherSideInArea(DanglingLine danglingLine, CountryArea countryArea) {
return TieLineUtil.getPairedDanglingLine(danglingLine).filter(countryArea::isAreaBorder).isPresent();
}

private boolean isAreaBorder(DanglingLine danglingLine) {
Expand Down
9 changes: 4 additions & 5 deletions balances-adjustment/src/main/java/com/powsybl/balances_adjustment/util/NetworkAreaUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import com.powsybl.iidm.network.extensions.LoadDetail;

import java.util.List;
import java.util.stream.Collectors;

/**
* @author Miora Ralambotiana <miora.ralambotiana at rte-france.com>
Expand All @@ -33,14 +32,14 @@ public static Scalable createConformLoadScalable(NetworkArea area) {
.map(t -> (Load) t.getConnectable())
.filter(load -> load.getP0() >= 0)
.filter(load -> load.getExtension(LoadDetail.class) != null && load.getExtension(LoadDetail.class).getVariableActivePower() != 0)
.collect(Collectors.toList());
.toList();
if (loads.isEmpty()) {
loads = area.getContainedBusViewBuses().stream()
.flatMap(Bus::getConnectedTerminalStream)
.filter(t -> t.getConnectable() instanceof Load)
.map(t -> (Load) t.getConnectable())
.filter(load -> load.getP0() >= 0)
.collect(Collectors.toList());
.toList();
if (loads.isEmpty()) {
throw new PowsyblException("There is no load in this area");
}
Expand All @@ -49,8 +48,8 @@ public static Scalable createConformLoadScalable(NetworkArea area) {
if (totalP0 == 0.0) {
throw new PowsyblException("All loads' active power flows is null"); // this case should never happen
}
List<Float> percentages = loads.stream().map(load -> (float) (100f * load.getP0() / totalP0)).collect(Collectors.toList());
return Scalable.proportional(percentages, loads.stream().map(inj -> (Scalable) Scalable.onLoad(inj.getId())).collect(Collectors.toList()));
List<Double> percentages = loads.stream().map(load -> 100.0 * load.getP0() / totalP0).toList();
return Scalable.proportional(percentages, loads.stream().map(inj -> (Scalable) Scalable.onLoad(inj.getId())).toList());
}

private NetworkAreaUtil() {
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/powsybl/balances_adjustment/balance_computation/BalanceComputationImplDcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ void setUp() {

loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));

scalableFR = Scalable.proportional(Arrays.asList(60f, 30f, 10f),
scalableFR = Scalable.proportional(Arrays.asList(60.0, 30.0, 10.0),
Arrays.asList(Scalable.onGenerator("FFR1AA1 _generator"), Scalable.onGenerator("FFR2AA1 _generator"), Scalable.onGenerator("FFR3AA1 _generator")));
scalableBE = Scalable.proportional(Arrays.asList(60f, 30f, 10f),
scalableBE = Scalable.proportional(Arrays.asList(60.0, 30.0, 10.0),
Arrays.asList(Scalable.onGenerator("BBE1AA1 _generator"), Scalable.onGenerator("BBE3AA1 _generator"), Scalable.onGenerator("BBE2AA1 _generator")));
}

Expand Down
4 changes: 2 additions & 2 deletions ...a/com/powsybl/balances_adjustment/balance_computation/BalanceComputationSimpleDcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ void setUp() {

loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));

scalableFR = Scalable.proportional(Arrays.asList(60f, 40f),
scalableFR = Scalable.proportional(Arrays.asList(60.0, 40.0),
Arrays.asList(Scalable.onGenerator("GENERATOR_FR"), Scalable.onLoad("LOAD_FR")));

scalableBE = Scalable.proportional(Arrays.asList(60f, 40f),
scalableBE = Scalable.proportional(Arrays.asList(60.0, 40.0),
Arrays.asList(Scalable.onGenerator("GENERATOR_BE"), Scalable.onLoad("LOAD_BE")));

generatorFr = simpleNetwork.getGenerator("GENERATOR_FR");
Expand Down
4 changes: 2 additions & 2 deletions ...ybl/balances_adjustment/balance_computation/extension/ExtendedBalanceComputationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ void setUp() {

loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));

scalableFR = Scalable.proportional(Arrays.asList(60f, 30f, 10f),
scalableFR = Scalable.proportional(Arrays.asList(60.0, 30.0, 10.0),
Arrays.asList(Scalable.onGenerator("FFR1AA1 _generator"), Scalable.onGenerator("FFR2AA1 _generator"), Scalable.onGenerator("FFR3AA1 _generator")));
scalableBE = Scalable.proportional(Arrays.asList(60f, 30f, 10f),
scalableBE = Scalable.proportional(Arrays.asList(60.0, 30.0, 10.0),
Arrays.asList(Scalable.onGenerator("BBE1AA1 _generator"), Scalable.onGenerator("BBE3AA1 _generator"), Scalable.onGenerator("BBE2AA1 _generator")));

}
Expand Down
4 changes: 2 additions & 2 deletions balances-adjustment/src/test/resources/balanceComputationParameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"dcPowerFactor" : 1.0
},
"scaling-parameters" : {
"version" : "1.0",
"version" : "1.1",
"scalingConvention" : "GENERATOR",
"constantPowerFactor" : false,
"reconnect" : false,
"iterative" : false
"priority" : "ONESHOT"
}
}
4 changes: 2 additions & 2 deletions balances-adjustment/src/test/resources/balanceComputationParametersWithExtension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"dcPowerFactor" : 1.0
},
"scaling-parameters" : {
"version" : "1.0",
"version" : "1.1",
"scalingConvention" : "GENERATOR",
"constantPowerFactor" : false,
"reconnect" : false,
"iterative" : false
"priority" : "ONESHOT"
},
"extensions" : {
"dummy-extension" : { }
Expand Down
4 changes: 0 additions & 4 deletions emf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes-conversion</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm-mergingview</artifactId>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes-conformity</artifactId>
Expand Down
Loading
Loading