Skip to content

add new fields to security analysis results (tab N) #200

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 8 commits into from
Sep 23, 2025
Merged

add new fields to security analysis results (tab N) #200

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ae4ff4
add new fields for the N tab of security analysis
carojeandat Sep 16, 2025
7d3b34c
add test for PreContingencyLimitViolation's new fields
carojeandat Sep 19, 2025
51e310a
fix
carojeandat Sep 19, 2025
6a4121f
facto tests
carojeandat Sep 23, 2025
04dab64
fix
carojeandat Sep 23, 2025
030448e
clean
carojeandat Sep 23, 2025
a963246
clean
carojeandat Sep 23, 2025
660c324
remove springboottest
carojeandat Sep 23, 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
7 changes: 6 additions & 1 deletion ...va/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,22 @@ public static List<PreContingencyLimitViolationEntity> toEntityList(Network netw
}

public static PreContingencyLimitViolationEntity toEntity(Network network, LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolation) {
Double patlLimit = getPatlLimit(limitViolation, network);
return PreContingencyLimitViolationEntity.builder()
.subjectLimitViolation(subjectLimitViolation)
.limit(limitViolation.getLimit())
.limitName(limitViolation.getLimitName())
.limitType(limitViolation.getLimitType())
.acceptableDuration(limitViolation.getAcceptableDuration())
.acceptableDuration(calculateActualOverloadDuration(limitViolation, network))
.upcomingAcceptableDuration(calculateUpcomingOverloadDuration(limitViolation))
.limitReduction(limitViolation.getLimitReduction())
.value(limitViolation.getValue())
.side(limitViolation.getSide())
.patlLimit(patlLimit)
.loading(computeLoading(limitViolation, limitViolation.getLimit()))
.patlLoading(computeLoading(limitViolation, patlLimit))
.locationId(ComputationResultUtils.getViolationLocationId(limitViolation, network))
.nextLimitName(getNextLimitName(limitViolation, network))
.build();
}
}
122 changes: 122 additions & 0 deletions src/test/java/org/gridsuite/securityanalysis/server/AbstractLimitViolationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/**
* 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.securityanalysis.server;

import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.TwoSides;
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
import com.powsybl.iidm.network.util.LimitViolationUtils;
import com.powsybl.security.LimitViolation;
import com.powsybl.security.LimitViolationType;
import org.gridsuite.securityanalysis.server.entities.AbstractLimitViolationEntity;
import org.gridsuite.securityanalysis.server.entities.SubjectLimitViolationEntity;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.NGEN_NHV1;
import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.NHV1_NHV2_1;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* @author Caroline Jeandat <caroline.jeandat at rte-france.com>
*/
@SpringBootTest
abstract class AbstractLimitViolationTest {

@Test
void testAbstractLimitViolationEntityNewFields() {
testAbstractLimitViolationMapping("10'", 10 * 60, 1200, 1, 1250, TwoSides.TWO, "1'", 1100, 10 * 60, null);
}

@Test
void testAbstractLimitViolationEntityNewFieldsWithPermanentLimitReached() {
testAbstractLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 1100, 1, 1150,
TwoSides.TWO, "10'", 1100, Integer.MAX_VALUE, null);
}

@Test
void testAbstractLimitViolationEntityNewFieldsWithPermanentLimitReachedAndNoTemporaryLimit() {
testAbstractLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 500, 1, 1000,
TwoSides.ONE, null, 500, Integer.MAX_VALUE, null);
}

@Test
void testAbstractLimitViolationEntityNewFieldsWithLastLimitReached() {
testAbstractLimitViolationMapping("N/A", 0, 1100, 1, 3000, TwoSides.TWO, null, 1100, 0, null);
}

@Test
void testAbstractLimitViolationEntityNewFieldsWithLimitReductionEffective() {
// for this test to be relevant, "value" needs to be less that "limit"
testAbstractLimitViolationMapping("10'", 60, 1200, 0.8, 1150, TwoSides.TWO, "1'", 1100, 10 * 60, 60);
}

@Test
void test2wtContingencyLimitViolationEntityNewFieldsWithLimitReductionEffective() {
// for this test to be relevant, "value" needs to be less that "limit"
Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
// create limit set for two windings transformer
network.getTwoWindingsTransformer(NGEN_NHV1).getOrCreateSelectedOperationalLimitsGroup1().newCurrentLimits()
.setPermanentLimit(100)
.beginTemporaryLimit()
.setName("10'")
.setValue(200)
.setAcceptableDuration(60 * 10)
.endTemporaryLimit()
.beginTemporaryLimit()
.setName("1'")
.setValue(300)
.setAcceptableDuration(60)
.endTemporaryLimit()
.beginTemporaryLimit()
.setName("N/A")
.setValue(Double.MAX_VALUE)
.setAcceptableDuration(0)
.endTemporaryLimit()
.add();

LimitViolation limitViolation = new LimitViolation(NGEN_NHV1, "NGEN_NHV1_name", LimitViolationType.CURRENT,
"10'", 60, 200, 0.8, 180, TwoSides.ONE);

SubjectLimitViolationEntity subjectLimitViolationEntity = new SubjectLimitViolationEntity(NGEN_NHV1,
"NGEN_NHV1_name");

AbstractLimitViolationEntity limitViolationEntity = createLimitViolationEntity(network, limitViolation,
subjectLimitViolationEntity);

assertEquals("1'", limitViolationEntity.getNextLimitName());
assertEquals(100, limitViolationEntity.getPatlLimit());
assertEquals(60 * 10, limitViolationEntity.getAcceptableDuration());
assertEquals(60, limitViolationEntity.getUpcomingAcceptableDuration());
assertEquals(100 * limitViolation.getValue() / limitViolationEntity.getPatlLimit(),
limitViolationEntity.getPatlLoading());
}

private void testAbstractLimitViolationMapping(String limitName, int acceptableDuration, double limit,
double limitReduction, double value, TwoSides side, String expectedNextLimitName, long expectedPatlLimit,
Integer expectedAcceptableDuration, Integer expectedUpcomingAcceptableDuration) {
Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
LimitViolation limitViolation = new LimitViolation(NHV1_NHV2_1, "NHV1_NHV2_1_name", LimitViolationType.CURRENT,
limitName, acceptableDuration, limit, limitReduction, value, side);

SubjectLimitViolationEntity subjectLimitViolationEntity = new SubjectLimitViolationEntity(NHV1_NHV2_1,
"NHV1_NHV2_1_name");

AbstractLimitViolationEntity limitViolationEntity = createLimitViolationEntity(network, limitViolation,
subjectLimitViolationEntity);

assertEquals(expectedNextLimitName, limitViolationEntity.getNextLimitName());
assertEquals(expectedPatlLimit, limitViolationEntity.getPatlLimit());
assertEquals(expectedAcceptableDuration, limitViolationEntity.getAcceptableDuration());
assertEquals(expectedUpcomingAcceptableDuration, limitViolationEntity.getUpcomingAcceptableDuration());
assertEquals(100 * limitViolation.getValue() / limitViolationEntity.getPatlLimit(),
limitViolationEntity.getPatlLoading());
}

protected abstract AbstractLimitViolationEntity createLimitViolationEntity(Network network,
LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolationEntity);
}
89 changes: 4 additions & 85 deletions src/test/java/org/gridsuite/securityanalysis/server/ContingencyLimitViolationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,100 +7,19 @@
package org.gridsuite.securityanalysis.server;

import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.TwoSides;
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
import com.powsybl.iidm.network.util.LimitViolationUtils;
import com.powsybl.security.LimitViolation;
import com.powsybl.security.LimitViolationType;
import org.gridsuite.securityanalysis.server.entities.ContingencyLimitViolationEntity;
import org.gridsuite.securityanalysis.server.entities.SubjectLimitViolationEntity;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.NGEN_NHV1;
import static com.powsybl.iidm.network.test.EurostagTutorialExample1Factory.NHV1_NHV2_1;
import static org.junit.jupiter.api.Assertions.assertEquals;

/**
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
*/
@SpringBootTest
class ContingencyLimitViolationTest {
@Test
void testContingencyLimitViolationEntityNewFields() {
testContingencyLimitViolationMapping("10'", 10 * 60, 1200, 1, 1250, TwoSides.TWO, "1'", 1100, 10 * 60, null);
}

@Test
void testContingencyLimitViolationEntityNewFieldsWithPermanentLimitReached() {
testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 1100, 1, 1150, TwoSides.TWO, "10'", 1100, Integer.MAX_VALUE, null);
}

@Test
void testContingencyLimitViolationEntityNewFieldsWithPermanentLimitReachedAndNoTemporaryLimit() {
testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 500, 1, 1000, TwoSides.ONE, null, 500, Integer.MAX_VALUE, null);
}

@Test
void testContingencyLimitViolationEntityNewFieldsWithLastLimitReached() {
testContingencyLimitViolationMapping("N/A", 0, 1100, 1, 3000, TwoSides.TWO, null, 1100, 0, null);
}

@Test
void testContingencyLimitViolationEntityNewFieldsWithLimitReductionEffective() {
// for this test to be relevant, "value" needs to be less that "limit"
testContingencyLimitViolationMapping("10'", 60, 1200, 0.8, 1150, TwoSides.TWO, "1'", 1100, 10 * 60, 60);
}

@Test
void test2wtContingencyLimitViolationEntityNewFieldsWithLimitReductionEffective() {
// for this test to be relevant, "value" needs to be less that "limit"
Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
// create limit set for two windings transformer
network.getTwoWindingsTransformer(NGEN_NHV1).getOrCreateSelectedOperationalLimitsGroup1().newCurrentLimits()
.setPermanentLimit(100)
.beginTemporaryLimit()
.setName("10'")
.setValue(200)
.setAcceptableDuration(60 * 10)
.endTemporaryLimit()
.beginTemporaryLimit()
.setName("1'")
.setValue(300)
.setAcceptableDuration(60)
.endTemporaryLimit()
.beginTemporaryLimit()
.setName("N/A")
.setValue(Double.MAX_VALUE)
.setAcceptableDuration(0)
.endTemporaryLimit()
.add();

LimitViolation limitViolation = new LimitViolation(NGEN_NHV1, "NGEN_NHV1_name", LimitViolationType.CURRENT, "10'", 60, 200, 0.8, 180, TwoSides.ONE);

SubjectLimitViolationEntity subjectLimitViolationEntity = new SubjectLimitViolationEntity(NGEN_NHV1, "NGEN_NHV1_name");

ContingencyLimitViolationEntity contingencyLimitViolationEntity = ContingencyLimitViolationEntity.toEntity(network, limitViolation, subjectLimitViolationEntity);

assertEquals("1'", contingencyLimitViolationEntity.getNextLimitName());
assertEquals(100, contingencyLimitViolationEntity.getPatlLimit());
assertEquals(60 * 10, contingencyLimitViolationEntity.getAcceptableDuration());
assertEquals(60, contingencyLimitViolationEntity.getUpcomingAcceptableDuration());
assertEquals(100 * limitViolation.getValue() / contingencyLimitViolationEntity.getPatlLimit(), contingencyLimitViolationEntity.getPatlLoading());
}

private void testContingencyLimitViolationMapping(String limitName, int acceptableDuration, double limit, double limitReduction, double value, TwoSides side, String expectedNextLimitName, long expectedPatlLimit, Integer expectedAcceptableDuration, Integer expectedUpcomingAcceptableDuration) {
Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
LimitViolation limitViolation = new LimitViolation(NHV1_NHV2_1, "NHV1_NHV2_1_name", LimitViolationType.CURRENT, limitName, acceptableDuration, limit, limitReduction, value, side);

SubjectLimitViolationEntity subjectLimitViolationEntity = new SubjectLimitViolationEntity(NHV1_NHV2_1, "NHV1_NHV2_1_name");

ContingencyLimitViolationEntity contingencyLimitViolationEntity = ContingencyLimitViolationEntity.toEntity(network, limitViolation, subjectLimitViolationEntity);
class ContingencyLimitViolationTest extends AbstractLimitViolationTest {

assertEquals(expectedNextLimitName, contingencyLimitViolationEntity.getNextLimitName());
assertEquals(expectedPatlLimit, contingencyLimitViolationEntity.getPatlLimit());
assertEquals(expectedAcceptableDuration, contingencyLimitViolationEntity.getAcceptableDuration());
assertEquals(expectedUpcomingAcceptableDuration, contingencyLimitViolationEntity.getUpcomingAcceptableDuration());
assertEquals(100 * limitViolation.getValue() / contingencyLimitViolationEntity.getPatlLimit(), contingencyLimitViolationEntity.getPatlLoading());
@Override
protected ContingencyLimitViolationEntity createLimitViolationEntity(Network network, LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolationEntity) {
return ContingencyLimitViolationEntity.toEntity(network, limitViolation, subjectLimitViolationEntity);
}
}
25 changes: 25 additions & 0 deletions src/test/java/org/gridsuite/securityanalysis/server/PreContingencyLimitViolationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* 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.securityanalysis.server;

import com.powsybl.iidm.network.Network;
import com.powsybl.security.LimitViolation;
import org.gridsuite.securityanalysis.server.entities.PreContingencyLimitViolationEntity;
import org.gridsuite.securityanalysis.server.entities.SubjectLimitViolationEntity;
import org.springframework.boot.test.context.SpringBootTest;

/**
* @author Caroline Jeandat <caroline.jeandat at rte-france.com>
*/
@SpringBootTest
class PreContingencyLimitViolationTest extends AbstractLimitViolationTest {

@Override
protected PreContingencyLimitViolationEntity createLimitViolationEntity(Network network, LimitViolation limitViolation, SubjectLimitViolationEntity subjectLimitViolationEntity) {
return PreContingencyLimitViolationEntity.toEntity(network, limitViolation, subjectLimitViolationEntity);
}
}