wip complexity

Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
powsybl · Jun 24, 2024 · 0284c1f · 0284c1f
1 parent 20110e9
commit 0284c1f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/iidm/iidm-geodata/src/main/java/com/powsybl/iidm/geodata/odre/GeographicDataParser.java b/iidm/iidm-geodata/src/main/java/com/powsybl/iidm/geodata/odre/GeographicDataParser.java
@@ -139,7 +139,6 @@ private static Map<String, LineGeoData> fixLines(Map<String, List<List<Coordinat
 
  int linesWithOneConnectedSet = 0;
  int linesWithTwoOrMoreConnectedSets = 0;
-
  int oneConnectedSetDiscarded = 0;
  int twoOrMoreConnectedSetsDiscarded = 0;
 
@@ -171,15 +170,15 @@ private static Map<String, LineGeoData> fixLines(Map<String, List<List<Coordinat
  linesWithTwoOrMoreConnectedSets++;
  List<List<Coordinate>> coordinatesComponents = fillMultipleConnectedSetsCoordinatesList(connectedSets, graph);
 
- if (coordinatesComponents.size() != connectedSets.size()) {
+ if (coordinatesComponents.size() == connectedSets.size()) {
+ List<Coordinate> aggregatedCoordinates = aggregateCoordinates(coordinatesComponents);
+ Pair<String, String> substations = substationOrder(stringSubstationGeoDataMap, lineId, aggregatedCoordinates);
+ LineGeoData line = new LineGeoData(lineId, FileValidator.COUNTRY_FR, FileValidator.COUNTRY_FR, substations.getLeft(), substations.getRight(), aggregatedCoordinates);
+ lines.put(lineId, line);
+ } else {
  twoOrMoreConnectedSetsDiscarded++;
- continue;
  }
 
- List<Coordinate> aggregatedCoordinates = aggregateCoordinates(coordinatesComponents);
- Pair<String, String> substations = substationOrder(stringSubstationGeoDataMap, lineId, aggregatedCoordinates);
- LineGeoData line = new LineGeoData(lineId, FileValidator.COUNTRY_FR, FileValidator.COUNTRY_FR, substations.getLeft(), substations.getRight(), aggregatedCoordinates);
- lines.put(lineId, line);
  }
  }
  }