Get original ID

src/main/java/com/powsybl/openloadflow/network/AbstractElement.java

@@ -7,6 +7,7 @@
 package com.powsybl.openloadflow.network;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -27,6 +28,11 @@ protected AbstractElement(LfNetwork network) {
         this.network = Objects.requireNonNull(network);
     }
 
+    @Override
+    public List<String> getOriginalIds() {
+        return List.of(getId());
+    }
+
     public int getNum() {
         return num;
     }

src/main/java/com/powsybl/openloadflow/network/LfBranch.java

@@ -23,6 +23,16 @@ public interface LfBranch extends LfElement {
 
     double LOW_IMPEDANCE_THRESHOLD = Math.pow(10, -8); // in per unit
 
+    enum BranchType {
+        LINE,
+        TRANSFO_2,
+        TRANSFO_3_LEG_1,
+        TRANSFO_3_LEG_2,
+        TRANSFO_3_LEG_3,
+        DANGLING_LINE,
+        SWITCH
+    }
+
     class LfLimit {
 
         private int acceptableDuration;
@@ -55,6 +65,8 @@ public void setAcceptableDuration(int acceptableDuration) {
         }
     }
 
+    BranchType getBranchType();
+
     LfBus getBus1();
 
     LfBus getBus2();

src/main/java/com/powsybl/openloadflow/network/LfElement.java

@@ -6,13 +6,17 @@
  */
 package com.powsybl.openloadflow.network;
 
+import java.util.List;
+
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
 public interface LfElement {
 
     String getId();
 
+    List<String> getOriginalIds();
+
     ElementType getType();
 
     int getNum();

src/main/java/com/powsybl/openloadflow/network/LfGenerator.java

@@ -19,6 +19,8 @@ enum GeneratorControlType {
 
     String getId();
 
+    String getOriginalId();
+
     LfBus getBus();
 
     void setBus(LfBus bus);

src/main/java/com/powsybl/openloadflow/network/impl/AbstractLfGenerator.java

@@ -53,6 +53,11 @@ protected AbstractLfGenerator(double targetP) {
         this.targetP = targetP;
     }
 
+    @Override
+    public String getOriginalId() {
+        return getId();
+    }
+
     public LfBus getBus() {
         return bus;
     }

src/main/java/com/powsybl/openloadflow/network/impl/LfBranchImpl.java

@@ -136,6 +136,11 @@ public String getId() {
         return branch.getId();
     }
 
+    @Override
+    public BranchType getBranchType() {
+        return branch instanceof Line ? BranchType.LINE : BranchType.TRANSFO_2;
+    }
+
     @Override
     public boolean hasPhaseControlCapability() {
         return branch.getType() == IdentifiableType.TWO_WINDINGS_TRANSFORMER

src/main/java/com/powsybl/openloadflow/network/impl/LfDanglingLineBranch.java

@@ -49,6 +49,11 @@ public String getId() {
         return danglingLine.getId();
     }
 
+    @Override
+    public BranchType getBranchType() {
+        return BranchType.DANGLING_LINE;
+    }
+
     @Override
     public boolean hasPhaseControlCapability() {
         return false;

src/main/java/com/powsybl/openloadflow/network/impl/LfDanglingLineBus.java

@@ -9,6 +9,7 @@
 import com.powsybl.iidm.network.DanglingLine;
 import com.powsybl.openloadflow.network.LfNetwork;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -36,6 +37,11 @@ public static String getId(DanglingLine danglingLine) {
         return danglingLine.getId() + "_BUS";
     }
 
+    @Override
+    public List<String> getOriginalIds() {
+        return List.of(danglingLine.getId());
+    }
+
     @Override
     public String getId() {
         return getId(danglingLine);

src/main/java/com/powsybl/openloadflow/network/impl/LfDanglingLineGenerator.java

@@ -39,6 +39,11 @@ public String getId() {
         return danglingLine.getId() + "_GEN";
     }
 
+    @Override
+    public String getOriginalId() {
+        return danglingLine.getId();
+    }
+
     @Override
     public OptionalDouble getRemoteControlReactiveKey() {
         return OptionalDouble.empty();

src/main/java/com/powsybl/openloadflow/network/impl/LfHvdcImpl.java

@@ -18,35 +18,46 @@
 /**
  * @author Anne Tilloy <anne.tilloy at rte-france.com>
  */
-public final class LfHvdcImpl extends AbstractElement implements LfHvdc {
+public class LfHvdcImpl extends AbstractElement implements LfHvdc {
 
-    private String id;
+    private final String id;
 
-    private LfBus bus1;
+    private final LfBus bus1;
 
-    private LfBus bus2;
+    private final LfBus bus2;
 
     private Evaluable p1 = NAN;
 
     private Evaluable p2 = NAN;
 
-    private double droop;
+    private final double droop;
 
-    private double p0;
+    private final double p0;
 
     private LfVscConverterStationImpl vsc1;
 
     private LfVscConverterStationImpl vsc2;
 
-    public LfHvdcImpl(HvdcAngleDroopActivePowerControl control, LfBus bus1, LfBus bus2, LfNetwork network, String hvdcId) {
+    public LfHvdcImpl(String id, LfBus bus1, LfBus bus2, LfNetwork network, HvdcAngleDroopActivePowerControl control) {
         super(network);
-        this.id = hvdcId;
+        this.id = Objects.requireNonNull(id);
         this.bus1 = bus1;
         this.bus2 = bus2;
+        Objects.requireNonNull(control);
         droop = control.getDroop();
         p0 = control.getP0();
     }
 
+    @Override
+    public ElementType getType() {
+        return ElementType.HVDC;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
     @Override
     public LfBus getBus1() {
         return this.bus1;
@@ -109,16 +120,6 @@ public void setConverterStation2(LfVscConverterStationImpl converterStation2) {
         converterStation2.setTargetP(0);
     }
 
-    @Override
-    public ElementType getType() {
-        return ElementType.HVDC;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
     @Override
     public void updateState() {
         // Should be done before updating state of generators.

src/main/java/com/powsybl/openloadflow/network/impl/LfLegBranch.java

@@ -104,6 +104,22 @@ public String getId() {
         return getId(twt.getId(), getLegNum());
     }
 
+    @Override
+    public BranchType getBranchType() {
+        if (leg == twt.getLeg1()) {
+            return BranchType.TRANSFO_3_LEG_1;
+        } else if (leg == twt.getLeg2()) {
+            return BranchType.TRANSFO_3_LEG_2;
+        } else {
+            return BranchType.TRANSFO_3_LEG_3;
+        }
+    }
+
+    @Override
+    public List<String> getOriginalIds() {
+        return List.of(twt.getId());
+    }
+
     @Override
     public boolean hasPhaseControlCapability() {
         return leg.getPhaseTapChanger() != null;

src/main/java/com/powsybl/openloadflow/network/impl/LfNetworkLoaderImpl.java

@@ -381,7 +381,7 @@ private static void createBranches(List<LfBus> lfBuses, LfNetwork lfNetwork, Loa
                 if (control != null && control.isEnabled()) {
                     LfBus lfBus1 = getLfBus(hvdcLine.getConverterStation1().getTerminal(), lfNetwork, parameters.isBreakers());
                     LfBus lfBus2 = getLfBus(hvdcLine.getConverterStation2().getTerminal(), lfNetwork, parameters.isBreakers());
-                    LfHvdc lfHvdc = new LfHvdcImpl(control, lfBus1, lfBus2, lfNetwork, hvdcLine.getId());
+                    LfHvdc lfHvdc = new LfHvdcImpl(hvdcLine.getId(), lfBus1, lfBus2, lfNetwork, control);
                     LfVscConverterStationImpl cs1 = (LfVscConverterStationImpl) lfNetwork.getGeneratorById(hvdcLine.getConverterStation1().getId());
                     LfVscConverterStationImpl cs2 = (LfVscConverterStationImpl) lfNetwork.getGeneratorById(hvdcLine.getConverterStation2().getId());
                     if (cs1 != null && cs2 != null) {

src/main/java/com/powsybl/openloadflow/network/impl/LfShuntImpl.java

@@ -140,6 +140,11 @@ public List<String> getIds() {
         return shuntCompensators.stream().map(ShuntCompensator::getId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<String> getOriginalIds() {
+        return getIds();
+    }
+
     @Override
     public double getB() {
         return b;

src/main/java/com/powsybl/openloadflow/network/impl/LfStarBus.java

@@ -9,6 +9,8 @@
 import com.powsybl.iidm.network.ThreeWindingsTransformer;
 import com.powsybl.openloadflow.network.LfNetwork;
 
+import java.util.List;
+
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
@@ -29,6 +31,11 @@ public String getId() {
         return t3wt.getId() + "_BUS0";
     }
 
+    @Override
+    public List<String> getOriginalIds() {
+        return List.of(t3wt.getId());
+    }
+
     @Override
     public String getVoltageLevelId() {
         return t3wt.getLeg1().getTerminal().getVoltageLevel().getId();

src/main/java/com/powsybl/openloadflow/network/impl/LfSwitch.java

@@ -36,6 +36,11 @@ public String getId() {
         return aSwitch.getId();
     }
 
+    @Override
+    public BranchType getBranchType() {
+        return BranchType.SWITCH;
+    }
+
     @Override
     public boolean hasPhaseControlCapability() {
         return false;