Skip to content

optimize Network#getConnectables(Class), avoid full scan #3923

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

Draft
samirromdhani wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

optimize Network#getConnectables(Class), avoid full scan #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ public <C extends Connectable> Iterable<C> getConnectables(Class<C> clazz) {

@Override
public <C extends Connectable> Stream<C> getConnectableStream(Class<C> clazz) {
return index.getAll().stream().filter(clazz::isInstance).map(clazz::cast);
return index.streamAssignable(clazz);
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/NetworkIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.io.PrintStream;
import java.util.*;
import java.util.stream.Stream;

/**
*
Expand Down Expand Up @@ -119,6 +120,13 @@ <T extends Identifiable> Set<T> getAll(Class<T> clazz) {
return (Set<T>) all;
}

<T extends Identifiable> Stream<T> streamAssignable(Class<T> clazz) {
return objectsByClass.entrySet().stream()
.filter(e -> clazz.isAssignableFrom(e.getKey()))
.flatMap(e -> e.getValue().stream())
.map(clazz::cast);
}

boolean contains(String id) {
String idFromPotentialAlias = idByAlias.getOrDefault(id, id);
checkId(idFromPotentialAlias);
Expand Down
Loading