From 27305dd78f17a3843859c16673990e5e0581b759 Mon Sep 17 00:00:00 2001 From: Anne Tilloy Date: Wed, 20 Sep 2023 18:38:49 +0200 Subject: [PATCH] Clean. Signed-off-by: Anne Tilloy --- .../powsybl/cgmes/conversion/export/CgmesExportUtil.java | 4 ---- .../powsybl/cgmes/conversion/export/EquipmentExport.java | 6 +++--- .../cgmes/conversion/export/StateVariablesExport.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java index 7b05c2f3397..160dd3f8cde 100644 --- a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java +++ b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java @@ -331,10 +331,6 @@ public static List getBoundaryDanglingLines(Network network) { .collect(Collectors.toList()); } - public static boolean isBoundary(Network network, DanglingLine danglingLine) { - return network.getBoundaryElements().stream().map(Identifiable::getId).toList().contains(danglingLine.getId()); - } - public static boolean isEquivalentShuntWithZeroSectionCount(Connectable c) { if (c instanceof ShuntCompensator shuntCompensator) { return "true".equals(c.getProperty(Conversion.PROPERTY_IS_EQUIVALENT_SHUNT)) diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java index 9907a6d7432..af80c119f61 100644 --- a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java +++ b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java @@ -1125,7 +1125,7 @@ private static void writeControlArea(CgmesControlArea cgmesControlArea, String e for (Terminal terminal : cgmesControlArea.getTerminals()) { Connectable c = terminal.getConnectable(); if (c instanceof DanglingLine dl) { - if (CgmesExportUtil.isBoundary(network, dl)) { + if (network.isBoundaryElement(dl)) { TieFlowEq.write(CgmesExportUtil.getUniqueId(), controlAreaCgmesId, context.getNamingStrategy().getCgmesIdFromAlias(dl, Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + TERMINAL_BOUNDARY), cimNamespace, writer, context); @@ -1146,7 +1146,7 @@ private static void writeControlArea(CgmesControlArea cgmesControlArea, String e private static String getTieFlowBoundaryTerminal(Boundary boundary, CgmesExportContext context, Network network) { DanglingLine dl = boundary.getDanglingLine(); - if (CgmesExportUtil.isBoundary(network, dl)) { + if (network.isBoundaryElement(dl)) { return context.getNamingStrategy().getCgmesIdFromAlias(dl, Conversion.CGMES_PREFIX_ALIAS_PROPERTIES + TERMINAL_BOUNDARY); } else { // This means the boundary corresponds to a TieLine. @@ -1203,7 +1203,7 @@ private static void writeTerminal(Terminal t, Map mapTerminal2 // When we change the export and write the two dangling lines as separate equipment, // then we should always return 1 and forget about this special case Connectable c = t.getConnectable(); - if (c instanceof DanglingLine dl && !CgmesExportUtil.isBoundary(network, dl)) { + if (c instanceof DanglingLine dl && !network.isBoundaryElement(dl)) { equipmentId = context.getNamingStrategy().getCgmesId(dl.getTieLine().orElseThrow(IllegalStateException::new)); } writeTerminal(t, mapTerminal2Id, CgmesExportUtil.getTerminalId(t, context), equipmentId, connectivityNodeId(mapNodeKey2NodeId, t), diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/StateVariablesExport.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/StateVariablesExport.java index 4cc26b53df0..7bb4539f5ff 100644 --- a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/StateVariablesExport.java +++ b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/StateVariablesExport.java @@ -420,7 +420,7 @@ private static void writeStatus(Network network, String cimNamespace, XMLStreamW private static void writeConnectableStatus(Connectable connectable, String cimNamespace, XMLStreamWriter writer, CgmesExportContext context, Network network) { - if (connectable instanceof DanglingLine dl && !CgmesExportUtil.isBoundary(network, dl)) { + if (connectable instanceof DanglingLine dl && !network.isBoundaryElement(dl)) { // TODO(Luma) Export tie line components instead of a single equipment // If this dangling line is part of a tie line we will be exporting the tie line as a single equipment // We ignore dangling lines inside tie lines for now