Skip to content

filter by norminalVoltage/country for generators #17

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
merged 1 commit into from
Nov 4, 2025
Merged

filter by norminalVoltage/country for generators #17

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
8 changes: 4 additions & 4 deletions src/main/java/org/gridsuite/computation/service/AbstractFilterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,23 @@ protected ExpertFilter buildExpertFilter(GlobalFilter globalFilter, EquipmentTyp
protected List<FieldType> getNominalVoltageFieldType(EquipmentType equipmentType) {
return switch (equipmentType) {
case LINE, TWO_WINDINGS_TRANSFORMER -> List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2);
case VOLTAGE_LEVEL -> List.of(FieldType.NOMINAL_VOLTAGE);
case VOLTAGE_LEVEL, GENERATOR -> List.of(FieldType.NOMINAL_VOLTAGE);
default -> List.of();
};
}

protected List<FieldType> getCountryCodeFieldType(EquipmentType equipmentType) {
return switch (equipmentType) {
case VOLTAGE_LEVEL, TWO_WINDINGS_TRANSFORMER -> List.of(FieldType.COUNTRY);
case VOLTAGE_LEVEL, TWO_WINDINGS_TRANSFORMER, GENERATOR -> List.of(FieldType.COUNTRY);
case LINE -> List.of(FieldType.COUNTRY_1, FieldType.COUNTRY_2);
default -> List.of();
};
}

protected List<FieldType> getSubstationPropertiesFieldTypes(EquipmentType equipmentType) {
return equipmentType == EquipmentType.LINE ?
List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2) :
List.of(FieldType.SUBSTATION_PROPERTIES);
List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2) :
List.of(FieldType.SUBSTATION_PROPERTIES);
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/test/java/org/gridsuite/computation/service/FilterServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,16 @@ private static Stream<Arguments> fieldTypeData() {
// Nominal voltage
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.LINE, List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2)),
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.TWO_WINDINGS_TRANSFORMER, List.of(FieldType.NOMINAL_VOLTAGE_1, FieldType.NOMINAL_VOLTAGE_2)),
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.GENERATOR, List.of(FieldType.NOMINAL_VOLTAGE)),
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.VOLTAGE_LEVEL, List.of(FieldType.NOMINAL_VOLTAGE)),
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.GENERATOR, Collections.emptyList()),
Arguments.of(GlobalFilter.Fields.nominalV, EquipmentType.BATTERY, Collections.emptyList()),

// Country code
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.GENERATOR, List.of(FieldType.COUNTRY)),
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.VOLTAGE_LEVEL, List.of(FieldType.COUNTRY)),
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.TWO_WINDINGS_TRANSFORMER, List.of(FieldType.COUNTRY)),
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.LINE, List.of(FieldType.COUNTRY_1, FieldType.COUNTRY_2)),
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.GENERATOR, Collections.emptyList()),
Arguments.of(GlobalFilter.Fields.countryCode, EquipmentType.BATTERY, Collections.emptyList()),

// Substation properties
Arguments.of(GlobalFilter.Fields.substationProperty, EquipmentType.LINE, List.of(FieldType.SUBSTATION_PROPERTIES_1, FieldType.SUBSTATION_PROPERTIES_2)),
Expand Down