Skip to content

Commit f4665ff

Browse files
committed
Merge remote-tracking branch 'origin/fix-detection-of-violations-on-disabled-elements-in-fast-dc-sa' into fix-detection-of-violations-on-disabled-elements-in-fast-dc-sa
2 parents f2dd2f7 + cfbc534 commit f4665ff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4411,12 +4411,12 @@ void testDcSaNoViolationDetectedOnRemovedBranchOnOneSide() {
44114411
.collect(Collectors.toList());
44124412
List<StateMonitor> monitors = createAllBranchesMonitors(network);
44134413

4414-
SecurityAnalysisResult resultSlowDcSa = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters);
4415-
PostContingencyResult postContingencyResult = getPostContingencyResult(resultSlowDcSa, "BBS3");
4414+
SecurityAnalysisResult resultDefaultDcSa = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters);
4415+
PostContingencyResult postContingencyResult = getPostContingencyResult(resultDefaultDcSa, "BBS3");
44164416
assertEquals(200.0, postContingencyResult.getNetworkResult().getBranchResult("PS1").getP1(), DELTA_POWER);
44174417
assertEquals(-200.0, postContingencyResult.getNetworkResult().getBranchResult("PS1").getP2(), DELTA_POWER);
44184418
assertEquals(0, postContingencyResult.getLimitViolationsResult().getLimitViolations().size());
4419-
// in slow dc mode, branch results with 0 flow are created for disabled branches on one side
4419+
// in default dc mode, branch results with 0 flow are created for disabled branches on one side
44204420
assertEquals(5, postContingencyResult.getNetworkResult().getBranchResults().size());
44214421

44224422
// set dc sa mode

src/test/java/com/powsybl/openloadflow/sa/WoodburyDcSecurityAnalysisWithActionsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -476,13 +476,13 @@ void testDcSaPhaseTapChangerTapPositionChangeNoViolationDetectedOnRemovedBranchO
476476
List<Action> actions = List.of(new PhaseTapChangerTapPositionAction("pstChange", "PS1", false, 0));
477477
List<OperatorStrategy> operatorStrategies = List.of(new OperatorStrategy("strategyPstChange", ContingencyContext.specificContingency("BBS3"), new TrueCondition(), List.of("pstChange")));
478478

479-
SecurityAnalysisResult resultSlowDcSa = runSecurityAnalysis(network, contingencies, monitors, securityParameters,
479+
SecurityAnalysisResult resultDefaultDcSa = runSecurityAnalysis(network, contingencies, monitors, securityParameters,
480480
operatorStrategies, actions, ReportNode.NO_OP);
481-
OperatorStrategyResult operatorStrategyResult = getOperatorStrategyResult(resultSlowDcSa, "strategyPstChange");
481+
OperatorStrategyResult operatorStrategyResult = getOperatorStrategyResult(resultDefaultDcSa, "strategyPstChange");
482482
assertEquals(200.0, operatorStrategyResult.getNetworkResult().getBranchResult("PS1").getP1(), DELTA_POWER);
483483
assertEquals(-200.0, operatorStrategyResult.getNetworkResult().getBranchResult("PS1").getP2(), DELTA_POWER);
484484
assertEquals(0, operatorStrategyResult.getLimitViolationsResult().getLimitViolations().size());
485-
// in slow dc mode, branch results with 0 flow are created for disabled branches on one side
485+
// in default dc mode, branch results with 0 flow are created for disabled branches on one side
486486
assertEquals(5, operatorStrategyResult.getNetworkResult().getBranchResults().size());
487487

488488
// set dc sa mode

0 commit comments

Comments
 (0)