Attach the model to the shunt in the constructor

Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>
powsybl · Mar 24, 2020 · eb35f46 · eb35f46
1 parent 106bab2
commit eb35f46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/ShuntCompensatorAdderImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/ShuntCompensatorAdderImpl.java
@@ -194,7 +194,6 @@ public ShuntCompensatorImpl add() {
                 id, getName(), isFictitious(), model,
                 currentSectionCount, regulatingTerminal == null ? terminal : regulatingTerminal,
                 voltageRegulatorOn, targetV, targetDeadband);
-        model.setShuntCompensator(shunt);
         shunt.addTerminal(terminal);
         voltageLevel.attach(terminal, false);
         getNetwork().getIndex().checkAndAdd(shunt);

diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/ShuntCompensatorImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/ShuntCompensatorImpl.java
@@ -44,7 +44,7 @@ class ShuntCompensatorImpl extends AbstractConnectable<ShuntCompensator> impleme
                          double targetV, double targetDeadband) {
         super(id, name, fictitious);
         this.network = network;
-        this.model = model;
+        this.model = attach(model);
         this.regulatingTerminal = regulatingTerminal;
         int variantArraySize = network.get().getVariantManager().getVariantArraySize();
         this.currentSectionCount = new TIntArrayList(variantArraySize);
@@ -59,6 +59,11 @@ class ShuntCompensatorImpl extends AbstractConnectable<ShuntCompensator> impleme
         }
     }
 
+    private ShuntCompensatorModelWrapper attach(ShuntCompensatorModelWrapper model) {
+        model.setShuntCompensator(this);
+        return model;
+    }
+
     @Override
     public ConnectableType getType() {
         return ConnectableType.SHUNT_COMPENSATOR;