Merge branch 'main' into homogenize_2WT_attributes

gridsuite · Feb 19, 2024 · 537199f · 537199f
2 parents a3473de + c2912bb
commit 537199f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
@@ -533,7 +533,13 @@ public List<Terminal> getTerminalsFromIdentifiable(Identifiable<?> identifiable)
             return Stream.of(
                     branch.getTerminal1(),
                     branch.getTerminal2()
-            ).collect(Collectors.toList());
+            ).toList();
+        } else if (identifiable instanceof ThreeWindingsTransformer w3t) {
+            return Stream.of(
+                    w3t.getLeg1().getTerminal(),
+                    w3t.getLeg2().getTerminal(),
+                    w3t.getLeg3().getTerminal()
+            ).toList();
         }
         throw NetworkModificationException.createEquipmentTypeNotSupported(identifiable.getClass().getSimpleName());
     }

diff --git a/...ain/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java b/...ain/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java
@@ -10,6 +10,7 @@
 import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.commons.reporter.TypedValue;
 import com.powsybl.iidm.modification.tripping.BranchTripping;
+import com.powsybl.iidm.modification.tripping.ThreeWindingsTransformerTripping;
 import com.powsybl.iidm.modification.tripping.Tripping;
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.OperatingStatus;
@@ -173,6 +174,8 @@ private boolean connectOneTerminal(Terminal terminal) {
     public Tripping getTrippingFromIdentifiable(Identifiable<?> identifiable) {
         if (identifiable instanceof Branch<?> branch) {
             return new BranchTripping(branch.getId());
+        } else if (identifiable instanceof ThreeWindingsTransformer w3t) {
+            return new ThreeWindingsTransformerTripping(w3t.getId());
         }
         throw NetworkModificationException.createEquipmentTypeNotSupported(identifiable.getClass().getSimpleName());
     }