Skip to content

Remove Bus case from getConnectableStream and optimize getBus by substation ids #199

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove Bus case from getConnectableStream and optimize getBus by substation ids #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84e0014
Remove Bus case from getConnectableStream and optimize getBus by subs…
anistouri Jul 30, 2024
d3673d4
Merge branch 'main' into fix-getBus-spreadsheet
anistouri Aug 8, 2024
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
11 changes: 4 additions & 7 deletions src/main/java/org/gridsuite/network/map/NetworkMapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public List<String> getSubstationsIds(UUID networkUuid, String variantId, List<D
}

public AllElementsInfos getAllElementsInfos(UUID networkUuid, String variantId, List<String> substationsId) {
Network network = getNetwork(networkUuid, PreloadingStrategy.COLLECTION, variantId);
Network network = getNetwork(networkUuid, getPreloadingStrategy(substationsId), variantId);
return AllElementsInfos.builder()
.substations(getSubstationsInfos(network, substationsId, InfoTypeParameters.TAB, null))
.voltageLevels(getVoltageLevelsInfos(network, substationsId, InfoTypeParameters.TAB, null))
Expand Down Expand Up @@ -194,10 +194,9 @@ public List<ElementInfos> getTieLinesInfos(Network network, List<String> substat
.toList();
}

public List<ElementInfos> getBusesInfos(Network network, List<String> substationsId, InfoTypeParameters infoTypeParameters) {
Stream<Bus> buses = substationsId == null ? network.getBusView().getBusStream() :
network.getBusView().getBusStream()
.filter(bus -> bus.getVoltageLevel().getSubstation().stream().anyMatch(substation -> substationsId.contains(substation.getId())))
public List<ElementInfos> getBusesInfos(Network network, List<String> substationsIds, InfoTypeParameters infoTypeParameters) {
Stream<Bus> buses = substationsIds == null ? network.getBusView().getBusStream() :
substationsIds.stream().flatMap(substationId -> network.getSubstation(substationId).getVoltageLevelStream().flatMap(voltageLevel -> voltageLevel.getBusView().getBusStream()))
.filter(Objects::nonNull)
.distinct();
return buses
Expand Down Expand Up @@ -339,8 +338,6 @@ public Stream<? extends Connectable> getConnectableStream(Network network, Eleme
return network.getShuntCompensatorStream();
case STATIC_VAR_COMPENSATOR:
return network.getStaticVarCompensatorStream();
case BUS:
return network.getBusbarSectionStream();
default:
throw new IllegalStateException("Unexpected connectable type:" + elementType);
}
Expand Down
Loading