Skip to content

allow to filter bus by substation properties #106

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

Merged
EtienneLt merged 1 commit into from
Feb 11, 2026
Merged

allow to filter bus by substation properties #106

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
7 changes: 4 additions & 3 deletions src/main/java/org/gridsuite/filter/utils/expertfilter/ExpertFilterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static <I extends Identifiable<I>> String getFieldValue(FieldType field,
case GENERATOR -> getGeneratorFieldValue(field, propertyName, (Generator) identifiable);
case LOAD -> getLoadFieldValue(field, propertyName, (Load) identifiable);
case SHUNT_COMPENSATOR -> getShuntCompensatorFieldValue(field, propertyName, (ShuntCompensator) identifiable);
case BUS -> getBusFieldValue(field, (Bus) identifiable);
case BUS -> getBusFieldValue(field, (Bus) identifiable, propertyName);
case BUSBAR_SECTION -> getBusBarSectionFieldValue(field, (BusbarSection) identifiable);
case BATTERY -> getBatteryFieldValue(field, propertyName, (Battery) identifiable);
case SUBSTATION -> getSubstationFieldValue(field, (Substation) identifiable);
Expand Down Expand Up @@ -229,12 +229,13 @@ private static String getGeneratorStartupFieldValue(Generator generator, FieldTy
}
}

private static String getBusFieldValue(FieldType field, Bus bus) {
private static String getBusFieldValue(FieldType field, Bus bus, String propertyName) {
return switch (field) {
case COUNTRY,
NOMINAL_VOLTAGE,
VOLTAGE_LEVEL_ID,
SUBSTATION_ID -> getVoltageLevelFieldValue(field, null, bus.getVoltageLevel());
SUBSTATION_ID,
SUBSTATION_PROPERTIES -> getVoltageLevelFieldValue(field, propertyName, bus.getVoltageLevel());
default -> throw new PowsyblException(FIELD_AND_TYPE_NOT_IMPLEMENTED + " [" + field + "," + bus.getType() + "]");
};
}
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/gridsuite/filter/globalfilter/GlobalFilterUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ private static Stream<Arguments> substationPropertyFieldTypeData() {
// Substation properties
Arguments.of(EquipmentType.LINE, List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2)),
Arguments.of(EquipmentType.GENERATOR, List.of(FieldType.SUBSTATION_PROPERTIES)),
Arguments.of(EquipmentType.SUBSTATION, List.of(FieldType.FREE_PROPERTIES))
Arguments.of(EquipmentType.SUBSTATION, List.of(FieldType.FREE_PROPERTIES)),
Arguments.of(EquipmentType.BUS, List.of(FieldType.SUBSTATION_PROPERTIES))
);
}

Expand Down