Skip to content

Commit 5c2d94a

Browse files
authored
Fix current value for export csv (#79)
Signed-off-by: Ghazwa REHILI <[email protected]>
1 parent 52c2387 commit 5c2d94a

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,16 @@ public byte[] exportToCsv(ShortCircuitAnalysisResult result, List<String> header
139139

140140
// Write data to the CSV file
141141
for (FaultResult faultResult : faultResults) {
142+
String faultResultId = faultResult.getFault().getId();
143+
double faultCurrentValue = faultResults.size() == 1 ? faultResult.getPositiveMagnitude() : faultResult.getCurrent();
144+
String faultCurrentValueStr = Double.isNaN(faultCurrentValue) ? "" : Double.toString(faultCurrentValue);
145+
142146
// Process faultResult data
143147
List<String> faultRowData = new ArrayList<>(List.of(
144-
faultResult.getFault().getId(),
148+
faultResultId,
145149
enumValueTranslations.getOrDefault(faultResult.getFault().getFaultType(), ""),
146150
"",
147-
Double.isNaN(faultResult.getPositiveMagnitude()) ? "" : Double.toString(faultResult.getPositiveMagnitude())
151+
faultCurrentValueStr
148152
));
149153

150154
List<LimitViolation> limitViolations = faultResult.getLimitViolations();
@@ -173,11 +177,13 @@ public byte[] exportToCsv(ShortCircuitAnalysisResult result, List<String> header
173177
List<FeederResult> feederResults = faultResult.getFeederResults();
174178
if (!feederResults.isEmpty()) {
175179
for (FeederResult feederResult : feederResults) {
180+
double feederCurrentValue = faultResults.size() == 1 ? feederResult.getPositiveMagnitude() : feederResult.getCurrent();
181+
String feederCurrentValueStr = Double.isNaN(feederCurrentValue) ? "" : Double.toString(feederCurrentValue);
176182
List<String> feederRowData = new ArrayList<>(List.of(
177-
faultResult.getFault().getId(),
183+
faultResultId,
178184
"",
179185
feederResult.getConnectableId(),
180-
Double.isNaN(feederResult.getPositiveMagnitude()) ? "" : Double.toString(feederResult.getPositiveMagnitude())
186+
feederCurrentValueStr
181187
));
182188
csvWriter.writeRow(feederRowData);
183189
}

0 commit comments

Comments
 (0)