Skip to content

chore: update gridsuite-filter to 1.18.0 and computation to 1.10.0 #217

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
flomillot merged 2 commits into from
Jan 9, 2026
Merged

chore: update gridsuite-filter to 1.18.0 and computation to 1.10.0 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47bdc01
chore: update gridsuite-filter to 1.18.0 and computation to 1.10.0
flomillot Dec 30, 2025
d9189a5
refactor: update nominalV to voltageRanges in LoadFlowControllerTest …
flomillot Jan 9, 2026
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<liquibase-hibernate-package>org.gridsuite.loadflow.server</liquibase-hibernate-package>
<gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
<!-- TODO remove gridsuite-filter.version and computation.version when upgrading gridsuite dependencies -->
<gridsuite-filter.version>1.16.0</gridsuite-filter.version>
<gridsuite-computation.version>1.9.0</gridsuite-computation.version>
<gridsuite-filter.version>1.18.0</gridsuite-filter.version>
<gridsuite-computation.version>1.10.0</gridsuite-computation.version>
<!--
antlr4 from openloadflow conflicts ? Only on repository.count() method in this project..
[ERROR] org.gridsuite.loadflow.server.SupervisionControllerTest.testResultCount <<< ERROR!
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/gridsuite/loadflow/server/LoadFlowControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,21 +518,21 @@ public void testGetLimitViolationsWithGlobalFilters() throws Exception {

// get limit violations with filters and different globalFilters
assertLimitViolations(createStringGlobalFilter(
List.of("380", "150"),
List.of(List.of(350, 410), List.of(130, 170)),
Map.of(),
List.of(Country.FR, Country.IT),
List.of(),
List.of(LimitViolationType.CURRENT)
), 4);
assertLimitViolations(createStringGlobalFilter(
List.of("24"),
List.of(List.of(20, 30)),
Map.of(),
List.of(Country.FR, Country.IT),
List.of(),
List.of(LimitViolationType.HIGH_VOLTAGE, LimitViolationType.LOW_VOLTAGE)
), 0);
assertLimitViolations(createStringGlobalFilter(
List.of("380"),
List.of(List.of(350, 410)),
Map.of(),
List.of(),
List.of(),
Expand Down Expand Up @@ -603,14 +603,14 @@ public void testGetLimitViolationsWithGlobalFilters() throws Exception {
}

private String createStringGlobalFilter(
List<String> nominalVs,
Map<String, List<String>> substationProperty,
List<Country> countryCodes,
List<UUID> genericFiltersUuid,
List<LimitViolationType> limitViolationTypes
List<List<Integer>> voltageRanges,
Map<String, List<String>> substationProperty,
List<Country> countryCodes,
List<UUID> genericFiltersUuid,
List<LimitViolationType> limitViolationTypes
) throws JsonProcessingException {
GlobalFilter globalFilter = GlobalFilter.builder()
.nominalV(nominalVs)
.voltageRanges(voltageRanges)
.substationProperty(substationProperty)
.countryCode(countryCodes)
.genericFilter(genericFiltersUuid)
Expand Down