Skip to content

Commit 327b2ca

Browse files
committed
fix sonar
Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com>
1 parent 334e42c commit 327b2ca

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

data/crac/crac-io/crac-io-cim/src/main/java/com/powsybl/openrao/data/crac/io/cim/craccreator/RemedialActionSeriesCreator.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,11 @@ public void createAndAddRemedialActionSeries() {
9696
}
9797
});
9898

99-
if (contingencies.isEmpty() && !invalidContingencies.isEmpty()) {
100-
cimSerie.getRemedialActionSeries().forEach(remedialActionSeries -> this.remedialActionSeriesCreationContexts.add(RemedialActionSeriesCreationContext.notImported(remedialActionSeries.getMRID(), ImportStatus.INCONSISTENCY_IN_DATA, String.format("This RA is not imported because it is only associated to invalid contingencies %s", invalidContingencies))));
101-
continue;
102-
}
103-
10499
// Read and store Monitored Series
105100
this.cnecs = getFlowCnecsFromMonitoredAndContingencySeries(cimSerie);
101+
106102
// Read and store AdditionalConstraint Series
107-
if (!readAdditionalConstraintSeries(cimSerie)) {
103+
if (doNotImportRaSeries(cimSerie)) {
108104
continue;
109105
}
110106
// Read and create / modify RA creators
@@ -124,6 +120,12 @@ public void createAndAddRemedialActionSeries() {
124120
this.cracCreationContext.setRemedialActionSeriesCreationContexts(remedialActionSeriesCreationContexts);
125121
}
126122

123+
private boolean doNotImportRaSeries(Series cimSerie) {
124+
// Do not import a series with only ill-defined contingencies
125+
// Do not import a series with an ill-defined additional constraint series
126+
return contingencies.isEmpty() && !invalidContingencies.isEmpty() || !readAdditionalConstraintSeries(cimSerie);
127+
}
128+
127129
/**
128130
* Reads AdditionalConstraint_Series of a Series and potentially creates associated angleCnec
129131
* If an angle cnec has been correctly defined, return true to import cimSerie's remedial actions.

0 commit comments

Comments
 (0)