@@ -4113,8 +4113,8 @@ void testContingencyParametersOuterLoopNamesAc() {
4113
4113
Network network = MultiAreaNetworkFactory .createTwoAreasWithTieLine ();
4114
4114
4115
4115
// Create 3 times the same contingency
4116
- Contingency contingency1 = new Contingency ("load3_outerloopNames " , new LoadContingency ("load3" ));
4117
- Contingency contingency2 = new Contingency ("load3_no_outerloopNames " , new LoadContingency ("load3" ));
4116
+ Contingency contingency1 = new Contingency ("load3_outerLoopNames " , new LoadContingency ("load3" ));
4117
+ Contingency contingency2 = new Contingency ("load3_no_outerLoopNames " , new LoadContingency ("load3" ));
4118
4118
List <Contingency > contingencies = List .of (contingency1 , contingency2 );
4119
4119
4120
4120
// Default LF parameters
@@ -4156,20 +4156,20 @@ void testContingencyParametersOuterLoopNamesAc() {
4156
4156
4157
4157
// Contingency parameters will always override initial parameters
4158
4158
4159
- // Base parameters with OuterLoopNames (aic) + contingency parameters with OuterloopNames (slack) -> slack distribution applied
4160
- PostContingencyResult postContingencyResult1 = getPostContingencyResult (result1 , "load3_outerloopNames " );
4159
+ // Base parameters with OuterLoopNames (aic) + contingency parameters with OuterLoopNames (slack) -> slack distribution applied
4160
+ PostContingencyResult postContingencyResult1 = getPostContingencyResult (result1 , "load3_outerLoopNames " );
4161
4161
assertEquals (36.667 , postContingencyResult1 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4162
4162
4163
- // Base parameters with OuterLoopNames (aic) + contingency parameters without OuterloopNames (no active power distrib) -> no active power distrib
4164
- PostContingencyResult postContingencyResult2 = getPostContingencyResult (result1 , "load3_no_outerloopNames " );
4163
+ // Base parameters with OuterLoopNames (aic) + contingency parameters without OuterLoopNames (no active power distrib) -> no active power distrib
4164
+ PostContingencyResult postContingencyResult2 = getPostContingencyResult (result1 , "load3_no_outerLoopNames " );
4165
4165
assertEquals (30 , postContingencyResult2 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4166
4166
4167
- // Base parameters without OuterLoopNames (aic) + contingency parameters with OuterloopNames (slack) -> slack distribution applied
4168
- PostContingencyResult postContingencyResult3 = getPostContingencyResult (result2 , "load3_outerloopNames " );
4167
+ // Base parameters without OuterLoopNames (aic) + contingency parameters with OuterLoopNames (slack) -> slack distribution applied
4168
+ PostContingencyResult postContingencyResult3 = getPostContingencyResult (result2 , "load3_outerLoopNames " );
4169
4169
assertEquals (36.667 , postContingencyResult3 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4170
4170
4171
- // Base parameters without OuterLoopNames (aic) + contingency parameters without OuterloopNames (no active power distrib) -> no active power distrib
4172
- PostContingencyResult postContingencyResult4 = getPostContingencyResult (result2 , "load3_no_outerloopNames " );
4171
+ // Base parameters without OuterLoopNames (aic) + contingency parameters without OuterLoopNames (no active power distrib) -> no active power distrib
4172
+ PostContingencyResult postContingencyResult4 = getPostContingencyResult (result2 , "load3_no_outerLoopNames " );
4173
4173
assertEquals (30 , postContingencyResult4 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4174
4174
4175
4175
}
@@ -4179,7 +4179,7 @@ void testContingencyParametersOuterLoopNamesDc() {
4179
4179
Network network = MultiAreaNetworkFactory .createTwoAreasWithTieLine ();
4180
4180
4181
4181
// Create 3 times the same contingency
4182
- Contingency contingency1 = new Contingency ("load3_outerloopNames " , new LoadContingency ("load3" ));
4182
+ Contingency contingency1 = new Contingency ("load3_outerLoopNames " , new LoadContingency ("load3" ));
4183
4183
List <Contingency > contingencies = List .of (contingency1 );
4184
4184
4185
4185
// Default LF parameters
@@ -4203,14 +4203,12 @@ void testContingencyParametersOuterLoopNamesDc() {
4203
4203
securityAnalysisParameters1 .setLoadFlowParameters (parameters1 );
4204
4204
SecurityAnalysisResult result1 = runSecurityAnalysis (network , contingencies , monitors , securityAnalysisParameters1 );
4205
4205
4206
-
4206
+ // Pre contingency computation with aic
4207
4207
PreContingencyResult preContingencyResult1 = result1 .getPreContingencyResult ();
4208
4208
assertEquals (50 , preContingencyResult1 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4209
4209
4210
- // Contingency parameters will always override initial parameters
4211
-
4212
- // Base parameters with OuterLoopNames (aic) + contingency parameters with OuterloopNames (slack) -> slack distribution applied
4213
- PostContingencyResult postContingencyResult1 = getPostContingencyResult (result1 , "load3_outerloopNames" );
4214
- assertEquals (50 , postContingencyResult1 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4210
+ // Base parameters with OuterLoopNames (aic) + contingency parameters with OuterLoopNames (slack) -> slack distribution applied
4211
+ PostContingencyResult postContingencyResult1 = getPostContingencyResult (result1 , "load3_outerLoopNames" );
4212
+ assertEquals (36.667 , postContingencyResult1 .getNetworkResult ().getBranchResult ("tl1" ).getP1 (), LoadFlowAssert .DELTA_POWER );
4215
4213
}
4216
4214
}
0 commit comments