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

get number of voltage levels in nad diagram #486

Merged
merged 10 commits into from
Jan 31, 2023
Merged

get number of voltage levels in nad diagram #486

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
24cfba1
get nb voltage levels
FranckLecuyer Jan 27, 2023
5b63aa1
Merge branch 'main' into get_number_of_voltage_levels_in_nad
FranckLecuyer Jan 27, 2023
161ca3e
improve coverage
FranckLecuyer Jan 27, 2023
99cf632
improve coverage
FranckLecuyer Jan 27, 2023
f972ef4
Merge branch 'main' into get_number_of_voltage_levels_in_nad
FranckLecuyer Jan 30, 2023
c821c7f
Merge branch 'main' into get_number_of_voltage_levels_in_nad
FranckLecuyer Jan 30, 2023
dd4f3da
Merge branch 'main' into get_number_of_voltage_levels_in_nad
FranckLecuyer Jan 30, 2023
ee5f53d
Merge remote-tracking branch 'origin/main' into get_number_of_voltage…
FranckLecuyer Jan 30, 2023
ef90807
Remove method from NetworkAreaDiagram
flo-dup Jan 31, 2023
0fcdb65
Merge branch 'main' into get_number_of_voltage_levels_in_nad
flo-dup Jan 31, 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
6 changes: 6 additions & 0 deletions network-area-diagram/src/main/java/com/powsybl/nad/NetworkAreaDiagram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,10 @@ public String drawToString(SvgParameters svgParameters) {
throw new UncheckedIOException(e);
}
}

public int getNbVoltageLevels() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is some discussion to remove NetworkAreaDiagram object, as it is of no use so far and to correspond to SingleLineDiagram static class.

return voltageLevelFilter instanceof VoltageLevelFilter
? ((VoltageLevelFilter) voltageLevelFilter).getNbVoltageLevels()
: network.getVoltageLevelCount();
}
}
4 changes: 4 additions & 0 deletions network-area-diagram/src/main/java/com/powsybl/nad/build/iidm/VoltageLevelFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public VoltageLevelFilter(Set<VoltageLevel> voltageLevels) {
this.voltageLevels = voltageLevels;
}

public int getNbVoltageLevels() {
return voltageLevels.size();
}

@Override
public boolean test(VoltageLevel voltageLevel) {
return voltageLevels.contains(voltageLevel);
Expand Down
11 changes: 11 additions & 0 deletions ...ork-area-diagram/src/test/java/com/powsybl/nad/layout/LayoutWithInitialPositionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@ public void testDiamond() {
checkLayoutWithInitialPositions(LayoutNetworkFactory.createDiamond());
}

@Test
public void testNbVoltageLevels() {
Network network = LayoutNetworkFactory.createDiamond();

assertEquals(1, new NetworkAreaDiagram(network, VoltageLevelFilter.createVoltageLevelDepthFilter(network, "A 400", 0)).getNbVoltageLevels());
assertEquals(4, new NetworkAreaDiagram(network, VoltageLevelFilter.createVoltageLevelDepthFilter(network, "A 400", 3)).getNbVoltageLevels());
assertEquals(7, new NetworkAreaDiagram(network, VoltageLevelFilter.createVoltageLevelDepthFilter(network, "A 400", 5)).getNbVoltageLevels());
assertEquals(1, new NetworkAreaDiagram(network, VoltageLevelFilter.createVoltageLevelDepthFilter(network, "A 400", 0)).getNbVoltageLevels());
assertEquals(15, new NetworkAreaDiagram(network, VoltageLevelFilter.NO_FILTER).getNbVoltageLevels());
}

private void checkLayoutWithInitialPositions(Network network) {
Predicate<VoltageLevel> filter = vl -> vl.getNominalV() >= 100;

Expand Down