From eb35f46ec35f9bd5e6ba2238ad830d5988922da9 Mon Sep 17 00:00:00 2001 From: RALAMBOTIANA MIORA Date: Tue, 24 Mar 2020 15:20:45 +0100 Subject: [PATCH] Attach the model to the shunt in the constructor Signed-off-by: RALAMBOTIANA MIORA --- .../iidm/network/impl/ShuntCompensatorAdderImpl.java | 1 - .../powsybl/iidm/network/impl/ShuntCompensatorImpl.java | 7 ++++++- 2 files changed, 6 insertions(+), 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 index b61bbdb5106..261f592e4bc 100644 --- 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 index cf96bfd9535..334b87e3453 100644 --- 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 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 impleme } } + private ShuntCompensatorModelWrapper attach(ShuntCompensatorModelWrapper model) { + model.setShuntCompensator(this); + return model; + } + @Override public ConnectableType getType() { return ConnectableType.SHUNT_COMPENSATOR;