Skip to content

add new features for filtered based contingency list #84

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add new features for filtered based contingency list #84

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
f55ae85
add new features for filtered based contingency list
basseche Sep 16, 2025
bed2829
add tests
basseche Sep 17, 2025
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
5 changes: 5 additions & 0 deletions src/main/java/org/gridsuite/filter/AbstractFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.expertfilter.ExpertFilter;
import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
import org.gridsuite.filter.identifierlistfilter.FilteredIdentifiables;
import org.gridsuite.filter.identifierlistfilter.IdentifiableAttributes;
import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter;
import org.gridsuite.filter.utils.EquipmentType;
Expand Down Expand Up @@ -52,4 +53,8 @@ public FilterEquipments toFilterEquipments(List<IdentifiableAttributes> identifi
.identifiableAttributes(identifiableAttributes)
.build();
}

public FilteredIdentifiables toFilteredIdentifiables(List<IdentifiableAttributes> identifiableAttributes) {
return new FilteredIdentifiables(identifiableAttributes, null);
}
}
24 changes: 24 additions & 0 deletions src/main/java/org/gridsuite/filter/identifierlistfilter/FilteredIdentifiables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright (c) 2025, RTE (http://www.rte-france.com)
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package org.gridsuite.filter.identifierlistfilter;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.util.List;

@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class FilteredIdentifiables {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it should be a record

private List<IdentifiableAttributes> equipmentIds;
private List<IdentifiableAttributes> notFoundIds;
}
15 changes: 15 additions & 0 deletions src/main/java/org/gridsuite/filter/identifierlistfilter/IdentifierListFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.gridsuite.filter.identifierlistfilter;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.powsybl.iidm.network.IdentifiableType;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -76,4 +77,18 @@ public FilterEquipments toFilterEquipments(List<IdentifiableAttributes> identifi
.notFoundEquipments(notFound)
.build();
}

@Override
public FilteredIdentifiables toFilteredIdentifiables(List<IdentifiableAttributes> identifiableAttributes) {

FilterEquipments filterEquipments = toFilterEquipments(identifiableAttributes);

FilteredIdentifiables filteredIdentifiables = new FilteredIdentifiables();
filteredIdentifiables.setEquipmentIds(filterEquipments.getIdentifiableAttributes());
IdentifiableType idType = IdentifiableType.valueOf(getEquipmentType().name());
filteredIdentifiables.setNotFoundIds(filterEquipments.getNotFoundEquipments().stream().map(element ->
new IdentifiableAttributes(element, idType, null)).toList());

return filteredIdentifiables;
}
}
10 changes: 10 additions & 0 deletions src/test/java/org/gridsuite/filter/utils/FiltersUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.gridsuite.filter.expertfilter.expertrule.CombinatorExpertRule;
import org.gridsuite.filter.expertfilter.expertrule.StringExpertRule;
import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
import org.gridsuite.filter.identifierlistfilter.FilteredIdentifiables;
import org.gridsuite.filter.identifierlistfilter.IdentifiableAttributes;
import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter;
import org.gridsuite.filter.identifierlistfilter.IdentifierListFilterEquipmentAttributes;
Expand Down Expand Up @@ -499,6 +500,15 @@ void testIdentifierListFilter() {
assertEquals(2, identifiables.size());
assertEquals("GEN", identifiables.get(0).getId());
assertEquals("GEN2", identifiables.get(1).getId());

FilteredIdentifiables filteredIdentifiables = identifierListFilter.toFilteredIdentifiables(identifiableAttributes);
assertTrue(CollectionUtils.isEqualCollection(filteredIdentifiables.getNotFoundIds(),
List.of(new IdentifiableAttributes("notFound1", IdentifiableType.GENERATOR, null),
new IdentifiableAttributes("notFound2", IdentifiableType.GENERATOR, null))));

assertEquals(2, filteredIdentifiables.getEquipmentIds().size());
assertEquals("GEN", filteredIdentifiables.getEquipmentIds().getFirst().getId());
assertEquals("GEN2", filteredIdentifiables.getEquipmentIds().get(1).getId());
}

@Test
Expand Down