diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml index 792691e8a5f..6920ffd3b27 100644 --- a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml +++ b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_control_area.xml @@ -1,5 +1,5 @@ - + diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml index 41cdda779dc..f072300a61e 100644 --- a/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml +++ b/cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml @@ -1,5 +1,5 @@ - + diff --git a/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml b/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml index 72c5509988f..66265b2aee3 100644 --- a/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml +++ b/cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml @@ -1,5 +1,5 @@ - + diff --git a/cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml b/cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml index 3e11396b010..9653f231432 100644 --- a/cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml +++ b/cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml @@ -1,5 +1,5 @@ - + diff --git a/entsoe-util/src/test/resources/entsoeAreaRef.xml b/entsoe-util/src/test/resources/entsoeAreaRef.xml index 937b819ccf9..d0b75bb0049 100644 --- a/entsoe-util/src/test/resources/entsoeAreaRef.xml +++ b/entsoe-util/src/test/resources/entsoeAreaRef.xml @@ -1,5 +1,5 @@ - + BE diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm index 0e1727e24fe..2029be2a020 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee118cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm index ca66423f89f..86375dc74d3 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf-solved.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm index 605d745f97b..74eddc98f99 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee14cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm index 3ae2fed3379..78ad3a89245 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee300cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm index a35f6510255..419c2a42efe 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee30cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm index 2b7eda32732..fa9142f981c 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee33.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm index 5e2ad217056..170c6b29f1b 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee57cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm index 02cf1d998a0..e5f9eac6392 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee69.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm index dcd328b5b14..6fb3ac5c374 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9cdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm index cfe6d215dd6..0f9c2b8e707 100644 --- a/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm +++ b/ieee-cdf/ieee-cdf-converter/src/test/resources/ieee9zeroimpedancecdf.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensator.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensator.java index 735a1b93693..ca1dfec2c3d 100644 --- a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensator.java +++ b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensator.java @@ -61,7 +61,7 @@ * The maximum number of sections that may be switched on * * - * CurrentSectionCount + * sectionCount * integer * - * yes @@ -69,6 +69,14 @@ * The current number of section that may be switched on * * + * solvedSectionCount + * integer + * - + * yes + * - + * The number of section that may be switched on calculated after the load flow + * + * * RegulatingTerminal * Terminal * - @@ -133,6 +141,28 @@ default OptionalInt findSectionCount() { return OptionalInt.of(getSectionCount()); } + /** + * Get the count of sections in service as calculated after the load flow. + *

+ * It is expected to be greater than one and lesser than or equal to the + * maximum section count. + *

+ * Depends on the working variant. + * @see VariantManager + */ + int getSolvedSectionCount(); + + /** + * Get the count of sections after the load flow in service if it is defined. + * Otherwise, get an empty optional. + *

+ * Depends on the working variant. + * @see VariantManager + */ + default OptionalInt findSolvedSectionCount() { + return OptionalInt.of(getSolvedSectionCount()); + } + /** * Get the maximum number of sections that can be in service */ @@ -158,6 +188,25 @@ default ShuntCompensator unsetSectionCount() { throw ValidationUtil.createUnsetMethodException(); } + /** + * Change the solved count of sections in service after the load flow calculation. + *

+ * Depends on the working variant. + * + * @see VariantManager + * @param solvedSectionCount the number of sections wanted to be put in service + * @return the shunt compensator to chain method calls. + */ + ShuntCompensator setSolvedSectionCount(int solvedSectionCount); + + /** + * Unset the solved count of sections in service. + * Note: this can be done only in SCADA validation level. + */ + default ShuntCompensator unsetSolvedSectionCount() { + throw ValidationUtil.createUnsetMethodException(); + } + /** * Get the susceptance (in S) of the shunt in its current state i.e. the sum of the sections' susceptances for all sections in service. * Return 0 if no section is in service (disconnected state). diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensatorAdder.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensatorAdder.java index 3abc70ef69d..121ccaeb933 100644 --- a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensatorAdder.java +++ b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/ShuntCompensatorAdder.java @@ -33,6 +33,8 @@ public interface ShuntCompensatorAdder extends InjectionAdder + * Depends on the working variant. + * @see VariantManager + */ + int getSolvedTapPosition(); + /** * Get an optional containing the current tap position if it is defined. * Otherwise, get an empty optional. @@ -56,6 +64,28 @@ default OptionalInt findTapPosition() { return OptionalInt.of(getTapPosition()); } + /** + * Get an optional containing the solved tap position if it is defined. + * Otherwise, get an empty optional. + *

+ * Depends on the working variant. + * @see VariantManager + */ + default OptionalInt findSolvedTapPosition() { + return OptionalInt.of(getSolvedTapPosition()); + } + + /** + * Set the solved tap position, which is the position after a load flow. + *

+ * It is expected to be contained between the lowest and the highest tap position. + *

+ * Depends on the working variant. + * @see VariantManager + */ + C setSolvedTapPosition(int solvedTapPosition); + + /** * Set the current tap position. *

diff --git a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TapChangerAdder.java b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TapChangerAdder.java index 9836fea7e3f..4206f1ffdf9 100644 --- a/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TapChangerAdder.java +++ b/iidm/iidm-api/src/main/java/com/powsybl/iidm/network/TapChangerAdder.java @@ -30,6 +30,8 @@ public interface TapChangerAdder< S setTapPosition(int tapPosition); + S setSolvedTapPosition(int solvedTapPosition); + S setRegulating(boolean regulating); S setRegulationTerminal(Terminal regulationTerminal); diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractTapChanger.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractTapChanger.java index db504f552ec..3de55975949 100644 --- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractTapChanger.java +++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractTapChanger.java @@ -43,9 +43,12 @@ abstract class AbstractTapChanger solvedTapPosition; + protected AbstractTapChanger(H parent, int lowTapPosition, List steps, TerminalExt regulationTerminal, - Integer tapPosition, boolean regulating, double targetDeadband, String type) { + Integer tapPosition, boolean regulating, double targetDeadband, String type, + Integer solvedTapPosition) { // The Ref object should be the one corresponding to the subnetwork of the tap changer holder // (to avoid errors when the subnetwork is detached) this.network = parent.getParentNetwork().getRootNetworkRef(); @@ -58,9 +61,11 @@ protected AbstractTapChanger(H parent, regulatingPoint.setRegulatingTerminal(regulationTerminal); this.tapPosition = new ArrayList<>(variantArraySize); this.targetDeadband = new TDoubleArrayList(variantArraySize); + this.solvedTapPosition = new ArrayList<>(variantArraySize); for (int i = 0; i < variantArraySize; i++) { this.tapPosition.add(tapPosition); this.targetDeadband.add(targetDeadband); + this.solvedTapPosition.add(solvedTapPosition); } this.type = Objects.requireNonNull(type); relativeNeutralPosition = getRelativeNeutralPosition(); @@ -104,11 +109,37 @@ public int getTapPosition() { return position; } + public int getSolvedTapPosition() { + Integer initialPosition = solvedTapPosition.get(network.get().getVariantIndex()); + if (initialPosition == null) { + throw ValidationUtil.createUndefinedValueGetterException(); + } + return initialPosition; + } + + public C setSolvedTapPosition(int solvedTapPosition) { + NetworkImpl n = getNetwork(); + if (solvedTapPosition < lowTapPosition + || solvedTapPosition > getHighTapPosition()) { + throwIncorrectTapPosition(solvedTapPosition, getHighTapPosition()); + } + int variantIndex = n.getVariantIndex(); + Integer oldValue = this.solvedTapPosition.set(variantIndex, solvedTapPosition); + String variantId = n.getVariantManager().getVariantId(variantIndex); + parent.getNetwork().getListeners().notifyUpdate(parent.getTransformer(), () -> getTapChangerAttribute() + ".solvedTapPosition", variantId, oldValue, solvedTapPosition); + return (C) this; + } + public OptionalInt findTapPosition() { Integer position = tapPosition.get(network.get().getVariantIndex()); return position == null ? OptionalInt.empty() : OptionalInt.of(position); } + public OptionalInt findSolvedTapPosition() { + Integer initialPosition = solvedTapPosition.get(network.get().getVariantIndex()); + return initialPosition == null ? OptionalInt.empty() : OptionalInt.of(initialPosition); + } + public OptionalInt getNeutralPosition() { return relativeNeutralPosition != null ? OptionalInt.of(lowTapPosition + relativeNeutralPosition) : OptionalInt.empty(); } diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerAdderImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerAdderImpl.java index 4ff8060405c..6398c173138 100644 --- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerAdderImpl.java +++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerAdderImpl.java @@ -31,6 +31,8 @@ class PhaseTapChangerAdderImpl implements PhaseTapChangerAdder { private Integer tapPosition; + private Integer solvedTapPosition; + private final List steps = new ArrayList<>(); private PhaseTapChanger.RegulationMode regulationMode = PhaseTapChanger.RegulationMode.FIXED_TAP; @@ -123,6 +125,12 @@ public PhaseTapChangerAdder setTapPosition(int tapPosition) { return this; } + @Override + public PhaseTapChangerAdder setSolvedTapPosition(int solvedTapPosition) { + this.solvedTapPosition = solvedTapPosition; + return this; + } + @Override public PhaseTapChangerAdder setRegulationMode(PhaseTapChanger.RegulationMode regulationMode) { this.regulationMode = regulationMode; @@ -182,7 +190,7 @@ public PhaseTapChanger add() { network.setValidationLevelIfGreaterThan(ValidationUtil.checkTargetDeadband(parent, "phase tap changer", regulating, targetDeadband, network.getMinValidationLevel())); PhaseTapChangerImpl tapChanger - = new PhaseTapChangerImpl(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, regulationMode, regulationValue, targetDeadband); + = new PhaseTapChangerImpl(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, regulationMode, regulationValue, targetDeadband, solvedTapPosition); Set> tapChangers = new HashSet<>(parent.getAllTapChangers()); tapChangers.remove(parent.getPhaseTapChanger()); diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerImpl.java index effa9274a83..e1a3bfa3954 100644 --- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerImpl.java +++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/PhaseTapChangerImpl.java @@ -28,8 +28,9 @@ class PhaseTapChangerImpl extends AbstractTapChanger steps, TerminalExt regulationTerminal, - Integer tapPosition, Boolean regulating, RegulationMode regulationMode, double regulationValue, double targetDeadband) { - super(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, targetDeadband, "phase tap changer"); + Integer tapPosition, Boolean regulating, RegulationMode regulationMode, double regulationValue, double targetDeadband, + Integer solvedTapPosition) { + super(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, targetDeadband, "phase tap changer", solvedTapPosition); int variantArraySize = network.get().getVariantManager().getVariantArraySize(); this.regulationMode = regulationMode; this.regulationValue = new TDoubleArrayList(variantArraySize); diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerAdderImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerAdderImpl.java index 5bfc721822d..4191985e0aa 100644 --- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerAdderImpl.java +++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerAdderImpl.java @@ -45,6 +45,8 @@ class RatioTapChangerAdderImpl implements RatioTapChangerAdder { private TerminalExt regulationTerminal; + private Integer solvedTapPosition; + class StepAdderImpl implements RatioTapChangerAdder.StepAdder { private double rho = Double.NaN; @@ -117,6 +119,12 @@ public RatioTapChangerAdder setTapPosition(int tapPosition) { return this; } + @Override + public RatioTapChangerAdder setSolvedTapPosition(int solvedTapPosition) { + this.solvedTapPosition = solvedTapPosition; + return this; + } + @Override public RatioTapChangerAdder setLoadTapChangingCapabilities(boolean loadTapChangingCapabilities) { this.loadTapChangingCapabilities = loadTapChangingCapabilities; @@ -192,7 +200,7 @@ public RatioTapChanger add() { network.getMinValidationLevel())); RatioTapChangerImpl tapChanger = new RatioTapChangerImpl(parent, lowTapPosition, steps, regulationTerminal, loadTapChangingCapabilities, - tapPosition, regulating, regulationMode, regulationValue, targetDeadband); + tapPosition, regulating, regulationMode, regulationValue, targetDeadband, solvedTapPosition); Set> tapChangers = new HashSet<>(parent.getAllTapChangers()); tapChangers.remove(parent.getRatioTapChanger()); diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerImpl.java index a29d79ec238..7bb35fa56f5 100644 --- a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerImpl.java +++ b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/RatioTapChangerImpl.java @@ -29,8 +29,9 @@ class RatioTapChangerImpl extends AbstractTapChanger steps, TerminalExt regulationTerminal, boolean loadTapChangingCapabilities, - Integer tapPosition, Boolean regulating, RatioTapChanger.RegulationMode regulationMode, double regulationValue, double targetDeadband) { - super(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, targetDeadband, "ratio tap changer"); + Integer tapPosition, Boolean regulating, RatioTapChanger.RegulationMode regulationMode, double regulationValue, double targetDeadband, + Integer solvedTapPosition) { + super(parent, lowTapPosition, steps, regulationTerminal, tapPosition, regulating, targetDeadband, "ratio tap changer", solvedTapPosition); this.loadTapChangingCapabilities = loadTapChangingCapabilities; int variantArraySize = network.get().getVariantManager().getVariantArraySize(); this.regulationMode = regulationMode; 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 8144dc47af8..c8f434ccf9f 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 @@ -31,6 +31,8 @@ class ShuntCompensatorAdderImpl extends AbstractInjectionAdder impleme /* the target deadband */ private final TDoubleArrayList targetDeadband; + /* the current number of solved section switched on */ + private final ArrayList solvedSectionCount; + ShuntCompensatorImpl(Ref network, String id, String name, boolean fictitious, ShuntCompensatorModelExt model, Integer sectionCount, TerminalExt regulatingTerminal, Boolean voltageRegulatorOn, - double targetV, double targetDeadband) { + double targetV, double targetDeadband, Integer solvedSectionCount) { super(network, id, name, fictitious); this.network = network; int variantArraySize = this.network.get().getVariantManager().getVariantArraySize(); @@ -50,10 +53,12 @@ class ShuntCompensatorImpl extends AbstractConnectable impleme this.sectionCount = new ArrayList<>(variantArraySize); this.targetV = new TDoubleArrayList(variantArraySize); this.targetDeadband = new TDoubleArrayList(variantArraySize); + this.solvedSectionCount = new ArrayList<>(variantArraySize); for (int i = 0; i < variantArraySize; i++) { this.sectionCount.add(sectionCount); this.targetV.add(targetV); this.targetDeadband.add(targetDeadband); + this.solvedSectionCount.add(solvedSectionCount); } this.model = Objects.requireNonNull(model).attach(this); } @@ -78,6 +83,21 @@ public OptionalInt findSectionCount() { return section == null ? OptionalInt.empty() : OptionalInt.of(section); } + @Override + public int getSolvedSectionCount() { + Integer solvedSection = solvedSectionCount.get(network.get().getVariantIndex()); + if (solvedSection == null) { + throw ValidationUtil.createUndefinedValueGetterException(); + } + return solvedSection; + } + + @Override + public OptionalInt findSolvedSectionCount() { + Integer solvedSection = solvedSectionCount.get(network.get().getVariantIndex()); + return solvedSection == null ? OptionalInt.empty() : OptionalInt.of(solvedSection); + } + @Override public int getMaximumSectionCount() { return model.getMaximumSectionCount(); @@ -110,6 +130,21 @@ public ShuntCompensator unsetSectionCount() { return this; } + @Override + public ShuntCompensatorImpl setSolvedSectionCount(int solvedSectionCount) { + NetworkImpl n = getNetwork(); + ValidationUtil.checkSections(this, solvedSectionCount, model.getMaximumSectionCount(), getNetwork().getMinValidationLevel()); + if (solvedSectionCount < 0 || solvedSectionCount > model.getMaximumSectionCount()) { + throw new ValidationException(this, "unexpected solved section number (" + solvedSectionCount + "): no existing associated section"); + } + int variantIndex = n.getVariantIndex(); + Integer oldValue = this.solvedSectionCount.set(variantIndex, solvedSectionCount); + String variantId = n.getVariantManager().getVariantId(variantIndex); + n.invalidateValidationLevel(); + notifyUpdate("solvedSectionCount", variantId, oldValue, solvedSectionCount); + return this; + } + @Override public double getB() { return model.getB(sectionCount.get(network.get().getVariantIndex())); @@ -230,10 +265,12 @@ public void extendVariantArraySize(int initVariantArraySize, int number, int sou sectionCount.ensureCapacity(sectionCount.size() + number); targetV.ensureCapacity(targetV.size() + number); targetDeadband.ensureCapacity(targetDeadband.size() + number); + solvedSectionCount.ensureCapacity(solvedSectionCount.size() + number); for (int i = 0; i < number; i++) { sectionCount.add(sectionCount.get(sourceIndex)); targetV.add(targetV.get(sourceIndex)); targetDeadband.add(targetDeadband.get(sourceIndex)); + solvedSectionCount.add(solvedSectionCount.get(sourceIndex)); } regulatingPoint.extendVariantArraySize(initVariantArraySize, number, sourceIndex); } @@ -247,6 +284,9 @@ public void reduceVariantArraySize(int number) { targetV.remove(targetV.size() - number, number); targetDeadband.remove(targetDeadband.size() - number, number); regulatingPoint.reduceVariantArraySize(number); + List tmpSolvedSectionCount = new ArrayList<>(solvedSectionCount.subList(0, solvedSectionCount.size() - number)); + solvedSectionCount.clear(); + solvedSectionCount.addAll(tmpSolvedSectionCount); } @Override @@ -262,6 +302,7 @@ public void allocateVariantArrayElement(int[] indexes, final int sourceIndex) { sectionCount.set(index, sectionCount.get(sourceIndex)); targetV.set(index, targetV.get(sourceIndex)); targetDeadband.set(index, targetDeadband.get(sourceIndex)); + solvedSectionCount.set(index, solvedSectionCount.get(sourceIndex)); } regulatingPoint.allocateVariantArrayElement(indexes, sourceIndex); } diff --git a/iidm/iidm-impl/src/test/java/com/powsybl/iidm/network/impl/TapChangerAttributeTest.java b/iidm/iidm-impl/src/test/java/com/powsybl/iidm/network/impl/TapChangerAttributeTest.java index b01f49468d1..e32a20190e4 100644 --- a/iidm/iidm-impl/src/test/java/com/powsybl/iidm/network/impl/TapChangerAttributeTest.java +++ b/iidm/iidm-impl/src/test/java/com/powsybl/iidm/network/impl/TapChangerAttributeTest.java @@ -7,13 +7,14 @@ */ package com.powsybl.iidm.network.impl; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - import com.powsybl.iidm.network.*; +import com.powsybl.iidm.network.test.NoEquipmentNetworkFactory; import org.junit.jupiter.api.Test; -import com.powsybl.iidm.network.test.NoEquipmentNetworkFactory; +import java.util.OptionalInt; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Luma Zamarreño {@literal } @@ -57,6 +58,50 @@ void testTapChangerStepsReplacement() { testRatioTapChangerStepsReplacement(twt2); } + @Test + void testSolvedTapPosition() { + Network network = NoEquipmentNetworkFactory.create(); + Substation substation = network.getSubstation("sub"); + + //Setter for two-winding transformer + TwoWindingsTransformer twt2 = createTwoWindingsTransformer(substation); + createPhaseTapChanger(twt2); + createRatioTapChanger(twt2); + assertEquals(OptionalInt.empty(), twt2.getRatioTapChanger().findSolvedTapPosition()); + assertEquals(OptionalInt.empty(), twt2.getPhaseTapChanger().findSolvedTapPosition()); + twt2.getRatioTapChanger().setSolvedTapPosition(1); + twt2.getPhaseTapChanger().setSolvedTapPosition(1); + assertEquals(1, twt2.getRatioTapChanger().getSolvedTapPosition()); + assertEquals(1, twt2.getPhaseTapChanger().getSolvedTapPosition()); + + //Setter for three-winding transformer + ThreeWindingsTransformer twt3 = createThreeWindingsTransformer(substation); + createRatioTapChanger(twt3.getLeg2()); + createPhaseTapChanger(twt3.getLeg3()); + assertEquals(OptionalInt.empty(), twt3.getLeg2().getRatioTapChanger().findSolvedTapPosition()); + assertEquals(OptionalInt.empty(), twt3.getLeg3().getPhaseTapChanger().findSolvedTapPosition()); + twt3.getLeg2().getRatioTapChanger().setSolvedTapPosition(1); + twt3.getLeg3().getPhaseTapChanger().setSolvedTapPosition(1); + assertEquals(1, twt3.getLeg2().getRatioTapChanger().getSolvedTapPosition()); + assertEquals(1, twt3.getLeg3().getPhaseTapChanger().getSolvedTapPosition()); + + Network network2 = NoEquipmentNetworkFactory.create(); + + //Adder for two-winding transformer + TwoWindingsTransformer twt2WithSolvedPosition = createTwoWindingsTransformer(network2.getSubstation("sub")); + createPhaseTapChangerWithSolvedTapPosition(twt2WithSolvedPosition); + createRatioTapChangerWithSolvedTapPosition(twt2WithSolvedPosition); + assertEquals(1, twt2WithSolvedPosition.getRatioTapChanger().getSolvedTapPosition()); + assertEquals(1, twt2WithSolvedPosition.getPhaseTapChanger().getSolvedTapPosition()); + + //Adder for two-winding transformer + ThreeWindingsTransformer twt3WithSolvedPosition = createThreeWindingsTransformer(network2.getSubstation("sub")); + createPhaseTapChangerWithSolvedTapPosition(twt3.getLeg2()); + createRatioTapChangerWithSolvedTapPosition(twt3.getLeg3()); + assertEquals(1, twt3.getLeg2().getRatioTapChanger().getSolvedTapPosition()); + assertEquals(1, twt3.getLeg3().getPhaseTapChanger().getSolvedTapPosition()); + } + private static void testPhaseTapChangerStepsReplacement(TwoWindingsTransformer twt2) { PhaseTapChanger ptc = twt2.getPhaseTapChanger(); assertEquals(2, ptc.getStepCount()); @@ -212,6 +257,32 @@ private void createPhaseTapChanger(PhaseTapChangerHolder ptch) { .add(); } + private void createPhaseTapChangerWithSolvedTapPosition(PhaseTapChangerHolder ptch) { + ptch.newPhaseTapChanger() + .setTapPosition(1) + .setSolvedTapPosition(1) + .setLowTapPosition(0) + .setRegulating(false) + .setRegulationMode(PhaseTapChanger.RegulationMode.FIXED_TAP) + .beginStep() + .setR(1.0) + .setX(2.0) + .setG(3.0) + .setB(4.0) + .setAlpha(5.0) + .setRho(6.0) + .endStep() + .beginStep() + .setR(1.0) + .setX(2.0) + .setG(3.0) + .setB(4.0) + .setAlpha(5.0) + .setRho(6.0) + .endStep() + .add(); + } + private void createRatioTapChanger(RatioTapChangerHolder rtch) { rtch.newRatioTapChanger() .setLowTapPosition(0) @@ -240,4 +311,34 @@ private void createRatioTapChanger(RatioTapChangerHolder rtch) { .endStep() .add(); } + + private void createRatioTapChangerWithSolvedTapPosition(RatioTapChangerHolder rtch) { + rtch.newRatioTapChanger() + .setLowTapPosition(0) + .setTapPosition(1) + .setSolvedTapPosition(1) + .setLoadTapChangingCapabilities(false) + .beginStep() + .setR(39.78473) + .setX(39.784725) + .setG(0.0) + .setB(0.0) + .setRho(1.0) + .endStep() + .beginStep() + .setR(39.78474) + .setX(39.784726) + .setG(0.0) + .setB(0.0) + .setRho(1.0) + .endStep() + .beginStep() + .setR(39.78475) + .setX(39.784727) + .setG(0.0) + .setB(0.0) + .setRho(1.0) + .endStep() + .add(); + } } diff --git a/iidm/iidm-modification/src/test/resources/create-vl-topo-test-complete.xiidm b/iidm/iidm-modification/src/test/resources/create-vl-topo-test-complete.xiidm index 387682de50a..0738ce6deae 100644 --- a/iidm/iidm-modification/src/test/resources/create-vl-topo-test-complete.xiidm +++ b/iidm/iidm-modification/src/test/resources/create-vl-topo-test-complete.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/create-vl-topo-test.xiidm b/iidm/iidm-modification/src/test/resources/create-vl-topo-test.xiidm index ad4ba9147ae..2e4b9188543 100644 --- a/iidm/iidm-modification/src/test/resources/create-vl-topo-test.xiidm +++ b/iidm/iidm-modification/src/test/resources/create-vl-topo-test.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-create-line-feeder-bays.xml b/iidm/iidm-modification/src/test/resources/eurostag-create-line-feeder-bays.xml index 36a501a2859..fb5ebe7130f 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-create-line-feeder-bays.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-create-line-feeder-bays.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-create-load-feeder-bay.xml b/iidm/iidm-modification/src/test/resources/eurostag-create-load-feeder-bay.xml index b8741aa2ddb..878f81e294b 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-create-load-feeder-bay.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-create-load-feeder-bay.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-create-twt-feeder-bays.xml b/iidm/iidm-modification/src/test/resources/eurostag-create-twt-feeder-bays.xml index 7379293af48..ad0a2d0971c 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-create-twt-feeder-bays.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-create-twt-feeder-bays.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-l.xml b/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-l.xml index 683cdadda15..654e462f7d9 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-l.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-l.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-vl.xml b/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-vl.xml index 4d0787490ef..45a4c490dd1 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-vl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-line-split-bb-vl.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-l.xml b/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-l.xml index 4703b73f678..ec6adc6b2d4 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-l.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-l.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-vl.xml b/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-vl.xml index 50bfd4c456c..f346d456868 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-vl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-line-split-nb-vl.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-new-voltage-level.xml b/iidm/iidm-modification/src/test/resources/eurostag-new-voltage-level.xml index d5d1112e785..ed63ed0de9e 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-new-voltage-level.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-new-voltage-level.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-bb.xml b/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-bb.xml index e8c121860d2..20d6cf91da0 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-bb.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-bb.xml @@ -1,4 +1,4 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-nb.xml b/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-nb.xml index cfa5af088d6..7c11d2c7c33 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-nb.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-remove-voltage-level-nb.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-bb.xml b/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-bb.xml index a23cfd9e886..16ff0755fb7 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-bb.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-bb.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-nbbb.xml b/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-nbbb.xml index 44cd4d7c621..f48890dfc0a 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-nbbb.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-replace-tee-point-by-voltage-level-on-line-nbbb.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml b/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml index ba8c9d65f66..216e721b49a 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-replace-tl.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-bb-vl.xml b/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-bb-vl.xml index 60ec63fe85a..d1aa0f426d0 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-bb-vl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-bb-vl.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-nb-vl.xml b/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-nb-vl.xml index 60ec63fe85a..d1aa0f426d0 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-nb-vl.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-revert-connect-voltage-level-on-line-nb-vl.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-bb-l.xml b/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-bb-l.xml index 60ec63fe85a..d1aa0f426d0 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-bb-l.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-bb-l.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-nb-l.xml b/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-nb-l.xml index 13ea441b8cd..1aa270e6d3a 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-nb-l.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-revert-create-line-on-line-nb-l.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/eurostag-tutorial-example1.xml b/iidm/iidm-modification/src/test/resources/eurostag-tutorial-example1.xml index 448da7453d0..f36b6eb5e46 100644 --- a/iidm/iidm-modification/src/test/resources/eurostag-tutorial-example1.xml +++ b/iidm/iidm-modification/src/test/resources/eurostag-tutorial-example1.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/fictitious-line-split-l-complete.xml b/iidm/iidm-modification/src/test/resources/fictitious-line-split-l-complete.xml index b86e1e028f5..f2612e4e859 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-line-split-l-complete.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-line-split-l-complete.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/fictitious-line-split-l.xml b/iidm/iidm-modification/src/test/resources/fictitious-line-split-l.xml index f768e7e4d9a..0aa75bd4078 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-line-split-l.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-line-split-l.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl-complete.xml b/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl-complete.xml index 899918d4ae1..9f44fb0ee3e 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl-complete.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl-complete.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl.xml b/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl.xml index c31db821240..d671c99e06d 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-line-split-vl.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/fictitious-replace-tee-point-by-voltage-level-on-line-nb.xml b/iidm/iidm-modification/src/test/resources/fictitious-replace-tee-point-by-voltage-level-on-line-nb.xml index c2a231882f6..bee5d0ba916 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-replace-tee-point-by-voltage-level-on-line-nb.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-replace-tee-point-by-voltage-level-on-line-nb.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/fictitious-revert-connect-voltage-level-on-line-vl.xml b/iidm/iidm-modification/src/test/resources/fictitious-revert-connect-voltage-level-on-line-vl.xml index d1552017ebe..38bf3fbcd67 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-revert-connect-voltage-level-on-line-vl.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-revert-connect-voltage-level-on-line-vl.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/fictitious-revert-create-line-on-line-l.xml b/iidm/iidm-modification/src/test/resources/fictitious-revert-create-line-on-line-l.xml index 0977bc073f2..fbf04d70507 100644 --- a/iidm/iidm-modification/src/test/resources/fictitious-revert-create-line-on-line-l.xml +++ b/iidm/iidm-modification/src/test/resources/fictitious-revert-create-line-on-line-l.xml @@ -1,5 +1,5 @@ - diff --git a/iidm/iidm-modification/src/test/resources/network-connectable-connection.xiidm b/iidm/iidm-modification/src/test/resources/network-connectable-connection.xiidm index d24cdb8251f..8b474b8aaca 100644 --- a/iidm/iidm-modification/src/test/resources/network-connectable-connection.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-connectable-connection.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-disconnection-with-fictitious.xiidm b/iidm/iidm-modification/src/test/resources/network-disconnection-with-fictitious.xiidm index 78d81b0d900..d041593a3ba 100644 --- a/iidm/iidm-modification/src/test/resources/network-disconnection-with-fictitious.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-disconnection-with-fictitious.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-nb-no-connectable-position.xiidm b/iidm/iidm-modification/src/test/resources/network-nb-no-connectable-position.xiidm index 8f1076dd0d7..c45d2c719c5 100644 --- a/iidm/iidm-modification/src/test/resources/network-nb-no-connectable-position.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-nb-no-connectable-position.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-equipments-bbs1.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-equipments-bbs1.xml index 4252d2dfe4e..3f6dabcf18a 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-equipments-bbs1.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-equipments-bbs1.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-generator-bbs1.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-generator-bbs1.xml index 9e304535d77..8eaf464cb03 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-generator-bbs1.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-generator-bbs1.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-internal-line.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-internal-line.xml index 0617f8a8942..5527d21c3e9 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-internal-line.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-internal-line.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line-order-used.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line-order-used.xml index d8bb3b172ca..f89f52abfb3 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line-order-used.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line-order-used.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line.xml index 385952f4323..0dc970b4e68 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-line.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-load-bbs4.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-load-bbs4.xml index 92d49f7779d..5d5de98bec3 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-load-bbs4.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-load-bbs4.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-twt-feeders-bbs.xml b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-twt-feeders-bbs.xml index 74be07b292b..eac978478e7 100644 --- a/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-twt-feeders-bbs.xml +++ b/iidm/iidm-modification/src/test/resources/network-node-breaker-with-new-twt-feeders-bbs.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-planned-disconnection-not-disconnected.xiidm b/iidm/iidm-modification/src/test/resources/network-planned-disconnection-not-disconnected.xiidm index 608b19fa518..20fa3ee3d9a 100644 --- a/iidm/iidm-modification/src/test/resources/network-planned-disconnection-not-disconnected.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-planned-disconnection-not-disconnected.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-planned-disconnection.xiidm b/iidm/iidm-modification/src/test/resources/network-planned-disconnection.xiidm index a05c7d967a9..4c41b491b6c 100644 --- a/iidm/iidm-modification/src/test/resources/network-planned-disconnection.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-planned-disconnection.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network-unplanned-disconnection-not-disconnected.xiidm b/iidm/iidm-modification/src/test/resources/network-unplanned-disconnection-not-disconnected.xiidm index 30d8fa81cd7..c46cf5c1551 100644 --- a/iidm/iidm-modification/src/test/resources/network-unplanned-disconnection-not-disconnected.xiidm +++ b/iidm/iidm-modification/src/test/resources/network-unplanned-disconnection-not-disconnected.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network_one_voltage_level.xiidm b/iidm/iidm-modification/src/test/resources/network_one_voltage_level.xiidm index 8421ee92557..293096fcf96 100644 --- a/iidm/iidm-modification/src/test/resources/network_one_voltage_level.xiidm +++ b/iidm/iidm-modification/src/test/resources/network_one_voltage_level.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/network_test_bus_breaker_with_coupling_device.xiidm b/iidm/iidm-modification/src/test/resources/network_test_bus_breaker_with_coupling_device.xiidm index 79cb2d69a99..f43afa00a34 100644 --- a/iidm/iidm-modification/src/test/resources/network_test_bus_breaker_with_coupling_device.xiidm +++ b/iidm/iidm-modification/src/test/resources/network_test_bus_breaker_with_coupling_device.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/replace-tl-nb.xml b/iidm/iidm-modification/src/test/resources/replace-tl-nb.xml index e74df2582af..a3321d16b01 100644 --- a/iidm/iidm-modification/src/test/resources/replace-tl-nb.xml +++ b/iidm/iidm-modification/src/test/resources/replace-tl-nb.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSections.xiidm b/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSections.xiidm index 8421ee92557..293096fcf96 100644 --- a/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSections.xiidm +++ b/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSections.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSectionsWithCouplingDevice.xiidm b/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSectionsWithCouplingDevice.xiidm index 467920f55e1..f0194b71f69 100644 --- a/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSectionsWithCouplingDevice.xiidm +++ b/iidm/iidm-modification/src/test/resources/testNetwork3BusbarSectionsWithCouplingDevice.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreaker.xiidm b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreaker.xiidm index dc573aa82d0..0b8f74b060f 100644 --- a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreaker.xiidm +++ b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreaker.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceDifferentSectionIndex.xml b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceDifferentSectionIndex.xml index f161087ef5b..95c170f1da4 100644 --- a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceDifferentSectionIndex.xml +++ b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceDifferentSectionIndex.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceSameSectionIndex.xml b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceSameSectionIndex.xml index 0effe680e2e..7691070a43a 100644 --- a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceSameSectionIndex.xml +++ b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceSameSectionIndex.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceWithoutExtensions.xml b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceWithoutExtensions.xml index 45600cedbb8..eff75585783 100644 --- a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceWithoutExtensions.xml +++ b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithCouplingDeviceWithoutExtensions.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithoutExtensions.xiidm b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithoutExtensions.xiidm index 3d11a1c82cf..0e9a6e49821 100644 --- a/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithoutExtensions.xiidm +++ b/iidm/iidm-modification/src/test/resources/testNetworkNodeBreakerWithoutExtensions.xiidm @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/AbstractTransformerSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/AbstractTransformerSerDe.java index bc8eae27c9b..6c65eda8874 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/AbstractTransformerSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/AbstractTransformerSerDe.java @@ -23,6 +23,7 @@ abstract class AbstractTransformerSerDe, A extends Iden private static final String ATTR_LOW_TAP_POSITION = "lowTapPosition"; private static final String ATTR_TAP_POSITION = "tapPosition"; + private static final String ATTR_SOLVED_TAP_POSITION = "solvedTapPosition"; private static final String ATTR_REGULATING = "regulating"; private static final String ELEM_TERMINAL_REF = "terminalRef"; private static final String ATTR_REGULATION_MODE = "regulationMode"; @@ -66,6 +67,9 @@ private static double readTargetDeadband(NetworkDeserializerContext context, boo private static void writeTapChanger(TapChanger tc, NetworkSerializerContext context) { context.getWriter().writeIntAttribute(ATTR_LOW_TAP_POSITION, tc.getLowTapPosition()); + var solvedtp = tc.findSolvedTapPosition(); + IidmSerDeUtil.runFromMinimumVersion(IidmVersion.V_1_13, context, () -> + context.getWriter().writeOptionalIntAttribute(ATTR_SOLVED_TAP_POSITION, solvedtp.isPresent() ? solvedtp.getAsInt() : null)); var tp = tc.findTapPosition(); context.getWriter().writeOptionalIntAttribute(ATTR_TAP_POSITION, tp.isPresent() ? tp.getAsInt() : null); writeTargetDeadband(tc.getTargetDeadband(), context); @@ -213,6 +217,10 @@ private static void readTapChangerTerminalRef(TapChangerAdder private static void readTapChangerAttributes(TapChangerAdder adder, NetworkDeserializerContext context) { boolean regulating = context.getReader().readOptionalBooleanAttribute(ATTR_REGULATING).orElse(false); int lowTapPosition = context.getReader().readIntAttribute(ATTR_LOW_TAP_POSITION); + IidmSerDeUtil.runFromMinimumVersion(IidmVersion.V_1_13, context, () -> { + OptionalInt solvedTapPosition = context.getReader().readOptionalIntAttribute(ATTR_SOLVED_TAP_POSITION); + solvedTapPosition.ifPresent(adder::setSolvedTapPosition); + }); OptionalInt tapPosition = context.getReader().readOptionalIntAttribute(ATTR_TAP_POSITION); double targetDeadband = readTargetDeadband(context, regulating); adder.setLowTapPosition(lowTapPosition) diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmSerDeConstants.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmSerDeConstants.java index d9ebbf9157d..d8dedd2169e 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmSerDeConstants.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmSerDeConstants.java @@ -14,7 +14,7 @@ public final class IidmSerDeConstants { public static final String INDENT = " "; - public static final IidmVersion CURRENT_IIDM_VERSION = IidmVersion.V_1_12; + public static final IidmVersion CURRENT_IIDM_VERSION = IidmVersion.V_1_13; public static final String IIDM_PREFIX = "iidm"; diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmVersion.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmVersion.java index 9fc749832e8..4f8f5960a1f 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmVersion.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/IidmVersion.java @@ -33,7 +33,8 @@ public enum IidmVersion { V_1_9(POWSYBL_DOMAIN, List.of(1, 9)), V_1_10(POWSYBL_DOMAIN, List.of(1, 10)), V_1_11(POWSYBL_DOMAIN, List.of(1, 11)), - V_1_12(POWSYBL_DOMAIN, List.of(1, 12)); + V_1_12(POWSYBL_DOMAIN, List.of(1, 12)), + V_1_13(POWSYBL_DOMAIN, List.of(1, 13)); private final String domain; private final List versionArray; diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/ShuntSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/ShuntSerDe.java index 1f26e8ba167..693ed3432ae 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/ShuntSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/ShuntSerDe.java @@ -71,6 +71,12 @@ protected void writeRootElementAttributes(ShuntCompensator sc, VoltageLevel vl, OptionalInt sectionCount = sc.findSectionCount(); context.getWriter().writeOptionalIntAttribute("sectionCount", sectionCount.isPresent() ? sectionCount.getAsInt() : null); }); + + IidmSerDeUtil.runFromMinimumVersion(IidmVersion.V_1_13, context, () -> { + OptionalInt solvedSectionCount = sc.findSolvedSectionCount(); + context.getWriter().writeOptionalIntAttribute("solvedSectionCount", solvedSectionCount.isPresent() ? solvedSectionCount.getAsInt() : null); + }); + IidmSerDeUtil.writeBooleanAttributeFromMinimumVersion(ROOT_ELEMENT_NAME, "voltageRegulatorOn", sc.isVoltageRegulatorOn(), false, IidmSerDeUtil.ErrorMessage.NOT_DEFAULT_NOT_SUPPORTED, IidmVersion.V_1_2, context); IidmSerDeUtil.writeDoubleAttributeFromMinimumVersion(ROOT_ELEMENT_NAME, "targetV", sc.getTargetV(), IidmSerDeUtil.ErrorMessage.NOT_DEFAULT_NOT_SUPPORTED, IidmVersion.V_1_2, context); @@ -150,6 +156,10 @@ protected void readRootElementAttributes(ShuntCompensatorAdder adder, VoltageLev OptionalInt sectionCount = context.getReader().readOptionalIntAttribute("sectionCount"); sectionCount.ifPresent(adder::setSectionCount); }); + IidmSerDeUtil.runFromMinimumVersion(IidmVersion.V_1_13, context, () -> { + OptionalInt solvedSectionCount = context.getReader().readOptionalIntAttribute("solvedSectionCount"); + solvedSectionCount.ifPresent(adder::setSolvedSectionCount); + }); IidmSerDeUtil.runFromMinimumVersion(IidmVersion.V_1_2, context, () -> { boolean voltageRegulatorOn = context.getReader().readBooleanAttribute("voltageRegulatorOn"); double targetV = context.getReader().readDoubleAttribute("targetV"); diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ActivePowerControlSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ActivePowerControlSerDe.java index d70fad28cee..764c02ae740 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ActivePowerControlSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ActivePowerControlSerDe.java @@ -46,6 +46,7 @@ public ActivePowerControlSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of("1.0", "1.1")) .put(IidmVersion.V_1_11, ImmutableSortedSet.of("1.0", "1.1")) .put(IidmVersion.V_1_12, ImmutableSortedSet.of("1.0", "1.1")) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of("1.0", "1.1")) .build(), new ImmutableMap.Builder() .put("1.0", "http://www.itesla_project.eu/schema/iidm/ext/active_power_control/1_0") diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ConnectablePositionSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ConnectablePositionSerDe.java index 8150dfcd6a3..b2578d6a49f 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ConnectablePositionSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/ConnectablePositionSerDe.java @@ -49,6 +49,7 @@ public ConnectablePositionSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of(V_1_0, V_1_1)) .put(IidmVersion.V_1_11, ImmutableSortedSet.of(V_1_0, V_1_1)) .put(IidmVersion.V_1_12, ImmutableSortedSet.of(V_1_0, V_1_1)) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of(V_1_0, V_1_1)) .build(), ImmutableMap.builder() .put(V_1_0, "http://www.itesla_project.eu/schema/iidm/ext/connectable_position/1_0") diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/GeneratorStartupSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/GeneratorStartupSerDe.java index 8a7ec286b9f..28f1c6d94d7 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/GeneratorStartupSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/GeneratorStartupSerDe.java @@ -50,6 +50,7 @@ public GeneratorStartupSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of(ITESLA_1_0, V_1_0, V_1_1)) .put(IidmVersion.V_1_11, ImmutableSortedSet.of(ITESLA_1_0, V_1_0, V_1_1)) .put(IidmVersion.V_1_12, ImmutableSortedSet.of(ITESLA_1_0, V_1_0, V_1_1)) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of(ITESLA_1_0, V_1_0, V_1_1)) .build(), ImmutableMap.builder() .put(ITESLA_1_0, "http://www.itesla_project.eu/schema/iidm/ext/generator_startup/1_0") diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/SlackTerminalSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/SlackTerminalSerDe.java index 979a3c592c1..1c07f3ee89c 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/SlackTerminalSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/SlackTerminalSerDe.java @@ -45,6 +45,7 @@ public SlackTerminalSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of("1.5")) .put(IidmVersion.V_1_11, ImmutableSortedSet.of("1.5")) .put(IidmVersion.V_1_12, ImmutableSortedSet.of("1.5")) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of("1.5")) .build(), new ImmutableMap.Builder() .put("1.0", "http://www.powsybl.org/schema/iidm/ext/slack_terminal/1_0") diff --git a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/VoltageRegulationSerDe.java b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/VoltageRegulationSerDe.java index 7b89bcfa1eb..b7c577250cb 100644 --- a/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/VoltageRegulationSerDe.java +++ b/iidm/iidm-serde/src/main/java/com/powsybl/iidm/serde/extensions/VoltageRegulationSerDe.java @@ -47,6 +47,7 @@ public VoltageRegulationSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of("1.1")) .put(IidmVersion.V_1_11, ImmutableSortedSet.of("1.1")) .put(IidmVersion.V_1_12, ImmutableSortedSet.of("1.1")) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of("1.1")) .build(), ImmutableMap.builder() .put("1.0", "http://www.itesla_project.eu/schema/iidm/ext/voltage_regulation/1_0") diff --git a/iidm/iidm-serde/src/main/resources/xsd/iidm_V1_13.xsd b/iidm/iidm-serde/src/main/resources/xsd/iidm_V1_13.xsd new file mode 100644 index 00000000000..ec27e6036b8 --- /dev/null +++ b/iidm/iidm-serde/src/main/resources/xsd/iidm_V1_13.xsd @@ -0,0 +1,707 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/main/resources/xsd/iidm_equipment_V1_13.xsd b/iidm/iidm-serde/src/main/resources/xsd/iidm_equipment_V1_13.xsd new file mode 100644 index 00000000000..beaf531a46d --- /dev/null +++ b/iidm/iidm-serde/src/main/resources/xsd/iidm_equipment_V1_13.xsd @@ -0,0 +1,707 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagBinaryTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagBinaryTest.java deleted file mode 100644 index 6e24236fe07..00000000000 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagBinaryTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright (c) 2024, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - */ -package com.powsybl.iidm.serde; - -import com.powsybl.commons.io.TreeDataFormat; -import com.powsybl.commons.test.ComparisonUtils; -import com.powsybl.iidm.network.Network; -import com.powsybl.iidm.network.extensions.ActivePowerControlAdder; -import com.powsybl.iidm.network.extensions.ConnectablePosition; -import com.powsybl.iidm.network.extensions.ConnectablePositionAdder; -import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.io.InputStream; -import java.io.UncheckedIOException; -import java.nio.file.Files; - -import static com.powsybl.iidm.serde.IidmSerDeConstants.CURRENT_IIDM_VERSION; - -/** - * @author Florian Dupuy {@literal } - */ -class EurostagBinaryTest extends AbstractIidmSerDeTest { - - @Test - void roundTripTest() throws IOException { - String fileName = "eurostag-tutorial1-lf.bin"; - roundTripTest(EurostagTutorialExample1Factory.createWithLFResults(), - (n, jsonFile) -> NetworkSerDe.write(n, new ExportOptions().setFormat(TreeDataFormat.BIN), jsonFile), - n -> { - try (InputStream is = Files.newInputStream(n)) { - return Network.read(fileName, is); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - }, - ComparisonUtils::assertBytesEquals, - getVersionedNetworkPath(fileName, CURRENT_IIDM_VERSION)); - - //backward compatibility - roundTripVersionedJsonFromMinToCurrentVersionTest(fileName, IidmVersion.V_1_12); - } - - @Test - void roundTripTestWithExtension() throws IOException { - ExportOptions exportOptions = new ExportOptions().setFormat(TreeDataFormat.BIN); - ImportOptions importOptions = new ImportOptions().setFormat(TreeDataFormat.BIN); - Network network = EurostagTutorialExample1Factory.createWithLFResults(); - network.getGeneratorStream().findFirst().ifPresent(g -> g.newExtension(ActivePowerControlAdder.class).withDroop(2).withParticipate(true).add()); - network.getLoadStream().forEach(l -> l.newExtension(ConnectablePositionAdder.class).newFeeder().withDirection(ConnectablePosition.Direction.BOTTOM).add().add()); - roundTripTest(network, - (n, binFile) -> NetworkSerDe.write(n, exportOptions, binFile), - binFile -> NetworkSerDe.read(binFile, importOptions), - ComparisonUtils::assertBytesEquals, - getVersionedNetworkPath("eurostag-tutorial1-lf-extensions.bin", CURRENT_IIDM_VERSION)); - - //backward compatibility - roundTripVersionedJsonFromMinToCurrentVersionTest("eurostag-tutorial1-lf-extensions.bin", IidmVersion.V_1_12); - } -} diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagJsonTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagJsonTest.java index e17da43fc21..6d52530c124 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagJsonTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/EurostagJsonTest.java @@ -35,6 +35,7 @@ void roundTripTest() throws IOException { //backward compatibility roundTripVersionedJsonFromMinToCurrentVersionTest("eurostag-tutorial1-lf.json", IidmVersion.V_1_11); + roundTripVersionedJsonFromMinToCurrentVersionTest("eurostag-tutorial1-lf.json", IidmVersion.V_1_12); } @Test @@ -51,5 +52,6 @@ void roundTripTestWithExtension() throws IOException { //backward compatibility roundTripVersionedJsonFromMinToCurrentVersionTest("eurostag-tutorial1-lf-extensions.json", IidmVersion.V_1_11); + roundTripVersionedJsonFromMinToCurrentVersionTest("eurostag-tutorial1-lf-extensions.json", IidmVersion.V_1_13); } } diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/FictitiousSwitchJsonTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/FictitiousSwitchJsonTest.java index 71b119a582e..748a821e83e 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/FictitiousSwitchJsonTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/FictitiousSwitchJsonTest.java @@ -31,6 +31,7 @@ void roundTripTest() throws IOException { //backward compatibility roundTripVersionedJsonFromMinToCurrentVersionTest("fictitiousSwitchRef.jiidm", IidmVersion.V_1_11); + roundTripVersionedJsonFromMinToCurrentVersionTest("fictitiousSwitchRef.jiidm", IidmVersion.V_1_12); } } diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/GroundSerDeTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/GroundSerDeTest.java index c78eaeacb60..c83baf8dff8 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/GroundSerDeTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/GroundSerDeTest.java @@ -30,5 +30,6 @@ void test() throws IOException { // backward compatibility allFormatsRoundTripFromVersionedXmlFromMinToCurrentVersionTest("ground.xml", IidmVersion.V_1_11); + allFormatsRoundTripFromVersionedXmlFromMinToCurrentVersionTest("ground.xml", IidmVersion.V_1_12); } } diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/RatioTapChangerSerDeTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/RatioTapChangerSerDeTest.java index b77d7cd6db9..dbd21ba6c02 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/RatioTapChangerSerDeTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/RatioTapChangerSerDeTest.java @@ -24,6 +24,14 @@ void roundTripTest() throws IOException { allFormatsRoundTripTest(createTestNetwork(), "ratioTapChangerReactivePowerControlRef.xml", CURRENT_IIDM_VERSION); } + @Test + void roundTripTestWithSolvedTapPosition() throws IOException { + Network network = createTestNetwork(); + network.getTwoWindingsTransformer("T2wT").getRatioTapChanger().setSolvedTapPosition(1); + assertEquals(1, network.getTwoWindingsTransformer("T2wT").getRatioTapChanger().getSolvedTapPosition()); + allFormatsRoundTripTest(network, "ratioTapChangerReactivePowerControlRefWithSolvedTapPosition.xml", CURRENT_IIDM_VERSION); + } + @Test void readFaultyVersionRatioTapChangerFile() { testForAllPreviousVersions(IidmVersion.V_1_12, version -> { @@ -71,11 +79,18 @@ Network createTestNetwork() { t2wt.newRatioTapChanger() .beginStep() - .setRho(0.9) - .setR(0.1089) - .setX(0.01089) - .setG(0.8264462809917356) - .setB(0.08264462809917356) + .setRho(0.9) + .setR(0.1089) + .setX(0.01089) + .setG(0.8264462809917356) + .setB(0.08264462809917356) + .endStep() + .beginStep() + .setR(0.1089) + .setX(0.01089) + .setG(0.8264462809917356) + .setB(0.08264462809917356) + .setRho(1.1) .endStep() .setTapPosition(0) .setLoadTapChangingCapabilities(true) diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/ShuntCompensatorXmlTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/ShuntCompensatorXmlTest.java index ad340ba9d24..d15313c2c25 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/ShuntCompensatorXmlTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/ShuntCompensatorXmlTest.java @@ -87,6 +87,12 @@ void nullBPerSection() { assertEquals(Double.MIN_NORMAL, sc2.getModel(ShuntCompensatorLinearModel.class).getBPerSection(), 0.0); } + @Test + void shuntWithSolvedSectionCountTest() throws IOException { + Network network = ShuntTestCaseFactory.createWithSolvedSectionCount(1); + allFormatsRoundTripTest(network, "shuntWithSolvedSectionCountRoundTripRef.xml", CURRENT_IIDM_VERSION); + } + private void write(Network network, String version) { try { ExportOptions options = new ExportOptions().setVersion(version); diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/TerminalMockSerDe.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/TerminalMockSerDe.java index b05abd19267..a7164d66536 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/TerminalMockSerDe.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/TerminalMockSerDe.java @@ -47,6 +47,7 @@ public TerminalMockSerDe() { .put(IidmVersion.V_1_10, ImmutableSortedSet.of("1.10")) .put(IidmVersion.V_1_11, ImmutableSortedSet.of("1.11")) .put(IidmVersion.V_1_12, ImmutableSortedSet.of("1.12")) + .put(IidmVersion.V_1_13, ImmutableSortedSet.of("1.13")) .build(), ImmutableMap.builder() .put("1.0", "http://www.itesla_project.eu/schema/iidm/ext/terminal_mock/1_0") @@ -62,6 +63,7 @@ public TerminalMockSerDe() { .put("1.10", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_10") .put("1.11", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_11") .put("1.12", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_12") + .put("1.13", "http://www.powsybl.org/schema/iidm/ext/terminal_mock/1_13") .build()); } diff --git a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/VoltageAngleLimitSerDeTest.java b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/VoltageAngleLimitSerDeTest.java index f9183203223..f7d4225afec 100644 --- a/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/VoltageAngleLimitSerDeTest.java +++ b/iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/VoltageAngleLimitSerDeTest.java @@ -25,6 +25,7 @@ class VoltageAngleLimitSerDeTest extends AbstractIidmSerDeTest { void roundTripTest() throws IOException { // backward compatibility allFormatsRoundTripFromVersionedXmlFromMinToCurrentVersionTest("voltageAngleLimit.xiidm", IidmVersion.V_1_11); + allFormatsRoundTripFromVersionedXmlFromMinToCurrentVersionTest("voltageAngleLimit.xiidm", IidmVersion.V_1_12); allFormatsRoundTripTest(EurostagTutorialExample1Factory.createWithVoltageAngleLimit(), "voltageAngleLimit.xiidm", CURRENT_IIDM_VERSION); } diff --git a/iidm/iidm-serde/src/test/resources/V1_13/LccRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/LccRoundTripRef.xml new file mode 100644 index 00000000000..dfbc6693273 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/LccRoundTripRef.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/VscRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/VscRoundTripRef.xml new file mode 100644 index 00000000000..e4e74b230cc --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/VscRoundTripRef.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/activePowerControlRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/activePowerControlRoundTripRef.xml new file mode 100644 index 00000000000..919e6e77ec7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/activePowerControlRoundTripRef.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/batteryRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/batteryRoundTripRef.xml new file mode 100644 index 00000000000..6a2b1a513e1 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/batteryRoundTripRef.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRef.xml new file mode 100644 index 00000000000..29c072b4c58 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRef.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRefInvalid.xml b/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRefInvalid.xml new file mode 100644 index 00000000000..dc80a7626b2 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/branchObservabilityRoundTripRefInvalid.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/completeThreeWindingsTransformerRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/completeThreeWindingsTransformerRoundTripRef.xml new file mode 100644 index 00000000000..6b3c85b544b --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/completeThreeWindingsTransformerRoundTripRef.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/coordinatedReactiveControl.xml b/iidm/iidm-serde/src/test/resources/V1_13/coordinatedReactiveControl.xml new file mode 100644 index 00000000000..95deebe10df --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/coordinatedReactiveControl.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/danglingLine.xml b/iidm/iidm-serde/src/test/resources/V1_13/danglingLine.xml new file mode 100644 index 00000000000..5ac113e8280 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/danglingLine.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/danglingLineWithGeneration.xml b/iidm/iidm-serde/src/test/resources/V1_13/danglingLineWithGeneration.xml new file mode 100644 index 00000000000..1ab6062218a --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/danglingLineWithGeneration.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/disMeasRef.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/disMeasRef.xiidm new file mode 100644 index 00000000000..d5ed3326155 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/disMeasRef.xiidm @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/dl-loading-limits.xml b/iidm/iidm-serde/src/test/resources/V1_13/dl-loading-limits.xml new file mode 100644 index 00000000000..59519bd1c2c --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/dl-loading-limits.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/europeanLvTestFeederRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/europeanLvTestFeederRef.xml new file mode 100644 index 00000000000..dc3ae27e5aa --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/europeanLvTestFeederRef.xml @@ -0,0 +1,10203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-fict-inj.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-fict-inj.xml new file mode 100644 index 00000000000..97095f238ce --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-fict-inj.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-loading-limits.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-loading-limits.xml new file mode 100644 index 00000000000..e528c27d9fb --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-loading-limits.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-anonymized.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-anonymized.xml new file mode 100644 index 00000000000..4a268565402 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-anonymized.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-expo-load-model.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-expo-load-model.xml new file mode 100644 index 00000000000..cfece41f235 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-expo-load-model.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-opt-sub.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-opt-sub.xml new file mode 100644 index 00000000000..c160e8692c7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-opt-sub.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-properties.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-properties.xml new file mode 100644 index 00000000000..eaba41d1fee --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-properties.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-with-terminalMock-ext.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-with-terminalMock-ext.xml new file mode 100644 index 00000000000..434d3748364 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-with-terminalMock-ext.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-zip-load-model.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-zip-load-model.xml new file mode 100644 index 00000000000..121dbba8506 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1-zip-load-model.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1.xml new file mode 100644 index 00000000000..f36b6eb5e46 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial-example1.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_12/eurostag-tutorial1-lf.bin b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.bin similarity index 77% rename from iidm/iidm-serde/src/test/resources/V1_12/eurostag-tutorial1-lf.bin rename to iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.bin index a50451c80c4..192b1c97131 100644 Binary files a/iidm/iidm-serde/src/test/resources/V1_12/eurostag-tutorial1-lf.bin and b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.bin differ diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.json b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.json new file mode 100644 index 00000000000..5bfada9dc82 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf-extensions.json @@ -0,0 +1,221 @@ +{ + "version" : "1.13", + "extensionVersions" : [ { + "extensionName" : "position", + "version" : "1.1" + }, { + "extensionName" : "activePowerControl", + "version" : "1.1" + } ], + "id" : "sim1", + "caseDate" : "2013-01-15T18:45:00.000+01:00", + "forecastDistance" : 0, + "sourceFormat" : "test", + "minimumValidationLevel" : "STEADY_STATE_HYPOTHESIS", + "substations" : [ { + "id" : "P1", + "country" : "FR", + "tso" : "RTE", + "geographicalTags" : [ "A" ], + "voltageLevels" : [ { + "id" : "VLGEN", + "nominalV" : 24.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NGEN", + "v" : 24.500000610351563, + "angle" : 2.3259763717651367 + } ] + }, + "generators" : [ { + "id" : "GEN", + "energySource" : "OTHER", + "minP" : -9999.99, + "maxP" : 9999.99, + "voltageRegulatorOn" : true, + "targetP" : 607.0, + "targetV" : 24.5, + "targetQ" : 301.0, + "bus" : "NGEN", + "connectableBus" : "NGEN", + "p" : -605.558349609375, + "q" : -225.2825164794922, + "minMaxReactiveLimits" : { + "minQ" : -9999.99, + "maxQ" : 9999.99 + } + } ] + }, { + "id" : "VLHV1", + "nominalV" : 380.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NHV1", + "v" : 402.1428451538086, + "angle" : 0.0 + } ] + } + } ], + "twoWindingsTransformers" : [ { + "id" : "NGEN_NHV1", + "r" : 0.26658461538461536, + "x" : 11.104492831516762, + "g" : 0.0, + "b" : 0.0, + "ratedU1" : 24.0, + "ratedU2" : 400.0, + "voltageLevelId1" : "VLGEN", + "bus1" : "NGEN", + "connectableBus1" : "NGEN", + "voltageLevelId2" : "VLHV1", + "bus2" : "NHV1", + "connectableBus2" : "NHV1", + "p1" : 605.558349609375, + "q1" : 225.2825164794922, + "p2" : -604.8909301757812, + "q2" : -197.48046875 + } ] + }, { + "id" : "P2", + "country" : "FR", + "tso" : "RTE", + "geographicalTags" : [ "B" ], + "voltageLevels" : [ { + "id" : "VLHV2", + "nominalV" : 380.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NHV2", + "v" : 389.9526763916016, + "angle" : -3.5063576698303223 + } ] + } + }, { + "id" : "VLLOAD", + "nominalV" : 150.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NLOAD", + "v" : 147.57861328125, + "angle" : -9.614486694335938 + } ] + }, + "loads" : [ { + "id" : "LOAD", + "loadType" : "UNDEFINED", + "p0" : 600.0, + "q0" : 200.0, + "bus" : "NLOAD", + "connectableBus" : "NLOAD", + "p" : 600.0, + "q" : 200.0 + } ] + } ], + "twoWindingsTransformers" : [ { + "id" : "NHV2_NLOAD", + "r" : 0.04724999999999999, + "x" : 4.049724365620455, + "g" : 0.0, + "b" : 0.0, + "ratedU1" : 400.0, + "ratedU2" : 158.0, + "voltageLevelId1" : "VLHV2", + "bus1" : "NHV2", + "connectableBus1" : "NHV2", + "voltageLevelId2" : "VLLOAD", + "bus2" : "NLOAD", + "connectableBus2" : "NLOAD", + "p1" : 600.8677978515625, + "q1" : 274.3769836425781, + "p2" : -600.0, + "q2" : -200.0, + "ratioTapChanger" : { + "regulating" : true, + "lowTapPosition" : 0, + "tapPosition" : 1, + "targetDeadband" : 0.0, + "loadTapChangingCapabilities" : true, + "regulationMode" : "VOLTAGE", + "regulationValue" : 158.0, + "terminalRef" : { + "id" : "NHV2_NLOAD", + "side" : "TWO" + }, + "steps" : [ { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 0.8505666905244191 + }, { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0006666666666666 + }, { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.150766642808914 + } ] + } + } ] + } ], + "lines" : [ { + "id" : "NHV1_NHV2_1", + "r" : 3.0, + "x" : 33.0, + "g1" : 0.0, + "b1" : 1.93E-4, + "g2" : 0.0, + "b2" : 1.93E-4, + "voltageLevelId1" : "VLHV1", + "bus1" : "NHV1", + "connectableBus1" : "NHV1", + "voltageLevelId2" : "VLHV2", + "bus2" : "NHV2", + "connectableBus2" : "NHV2", + "p1" : 302.4440612792969, + "q1" : 98.74027252197266, + "p2" : -300.43389892578125, + "q2" : -137.18849182128906 + }, { + "id" : "NHV1_NHV2_2", + "r" : 3.0, + "x" : 33.0, + "g1" : 0.0, + "b1" : 1.93E-4, + "g2" : 0.0, + "b2" : 1.93E-4, + "voltageLevelId1" : "VLHV1", + "bus1" : "NHV1", + "connectableBus1" : "NHV1", + "voltageLevelId2" : "VLHV2", + "bus2" : "NHV2", + "connectableBus2" : "NHV2", + "p1" : 302.4440612792969, + "q1" : 98.74027252197266, + "p2" : -300.43389892578125, + "q2" : -137.18849182128906 + } ], + "extensions" : [ { + "id" : "LOAD", + "position" : { + "feeder" : { + "direction" : "BOTTOM" + } + } + }, { + "id" : "GEN", + "activePowerControl" : { + "participate" : true, + "droop" : 2.0 + } + } ] +} \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.json b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.json new file mode 100644 index 00000000000..b5c1d59fddd --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.json @@ -0,0 +1,200 @@ +{ + "version" : "1.13", + "id" : "sim1", + "caseDate" : "2013-01-15T18:45:00.000+01:00", + "forecastDistance" : 0, + "sourceFormat" : "test", + "minimumValidationLevel" : "STEADY_STATE_HYPOTHESIS", + "substations" : [ { + "id" : "P1", + "country" : "FR", + "tso" : "RTE", + "geographicalTags" : [ "A" ], + "voltageLevels" : [ { + "id" : "VLGEN", + "nominalV" : 24.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NGEN", + "v" : 24.500000610351563, + "angle" : 2.3259763717651367 + } ] + }, + "generators" : [ { + "id" : "GEN", + "energySource" : "OTHER", + "minP" : -9999.99, + "maxP" : 9999.99, + "voltageRegulatorOn" : true, + "targetP" : 607.0, + "targetV" : 24.5, + "targetQ" : 301.0, + "bus" : "NGEN", + "connectableBus" : "NGEN", + "p" : -605.558349609375, + "q" : -225.2825164794922, + "minMaxReactiveLimits" : { + "minQ" : -9999.99, + "maxQ" : 9999.99 + } + } ] + }, { + "id" : "VLHV1", + "nominalV" : 380.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NHV1", + "v" : 402.1428451538086, + "angle" : 0.0 + } ] + } + } ], + "twoWindingsTransformers" : [ { + "id" : "NGEN_NHV1", + "r" : 0.26658461538461536, + "x" : 11.104492831516762, + "g" : 0.0, + "b" : 0.0, + "ratedU1" : 24.0, + "ratedU2" : 400.0, + "voltageLevelId1" : "VLGEN", + "bus1" : "NGEN", + "connectableBus1" : "NGEN", + "voltageLevelId2" : "VLHV1", + "bus2" : "NHV1", + "connectableBus2" : "NHV1", + "p1" : 605.558349609375, + "q1" : 225.2825164794922, + "p2" : -604.8909301757812, + "q2" : -197.48046875 + } ] + }, { + "id" : "P2", + "country" : "FR", + "tso" : "RTE", + "geographicalTags" : [ "B" ], + "voltageLevels" : [ { + "id" : "VLHV2", + "nominalV" : 380.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NHV2", + "v" : 389.9526763916016, + "angle" : -3.5063576698303223 + } ] + } + }, { + "id" : "VLLOAD", + "nominalV" : 150.0, + "topologyKind" : "BUS_BREAKER", + "busBreakerTopology" : { + "buses" : [ { + "id" : "NLOAD", + "v" : 147.57861328125, + "angle" : -9.614486694335938 + } ] + }, + "loads" : [ { + "id" : "LOAD", + "loadType" : "UNDEFINED", + "p0" : 600.0, + "q0" : 200.0, + "bus" : "NLOAD", + "connectableBus" : "NLOAD", + "p" : 600.0, + "q" : 200.0 + } ] + } ], + "twoWindingsTransformers" : [ { + "id" : "NHV2_NLOAD", + "r" : 0.04724999999999999, + "x" : 4.049724365620455, + "g" : 0.0, + "b" : 0.0, + "ratedU1" : 400.0, + "ratedU2" : 158.0, + "voltageLevelId1" : "VLHV2", + "bus1" : "NHV2", + "connectableBus1" : "NHV2", + "voltageLevelId2" : "VLLOAD", + "bus2" : "NLOAD", + "connectableBus2" : "NLOAD", + "p1" : 600.8677978515625, + "q1" : 274.3769836425781, + "p2" : -600.0, + "q2" : -200.0, + "ratioTapChanger" : { + "regulating" : true, + "lowTapPosition" : 0, + "tapPosition" : 1, + "targetDeadband" : 0.0, + "loadTapChangingCapabilities" : true, + "regulationMode" : "VOLTAGE", + "regulationValue" : 158.0, + "terminalRef" : { + "id" : "NHV2_NLOAD", + "side" : "TWO" + }, + "steps" : [ { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 0.8505666905244191 + }, { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0006666666666666 + }, { + "r" : 0.0, + "x" : 0.0, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.150766642808914 + } ] + } + } ] + } ], + "lines" : [ { + "id" : "NHV1_NHV2_1", + "r" : 3.0, + "x" : 33.0, + "g1" : 0.0, + "b1" : 1.93E-4, + "g2" : 0.0, + "b2" : 1.93E-4, + "voltageLevelId1" : "VLHV1", + "bus1" : "NHV1", + "connectableBus1" : "NHV1", + "voltageLevelId2" : "VLHV2", + "bus2" : "NHV2", + "connectableBus2" : "NHV2", + "p1" : 302.4440612792969, + "q1" : 98.74027252197266, + "p2" : -300.43389892578125, + "q2" : -137.18849182128906 + }, { + "id" : "NHV1_NHV2_2", + "r" : 3.0, + "x" : 33.0, + "g1" : 0.0, + "b1" : 1.93E-4, + "g2" : 0.0, + "b2" : 1.93E-4, + "voltageLevelId1" : "VLHV1", + "bus1" : "NHV1", + "connectableBus1" : "NHV1", + "voltageLevelId2" : "VLHV2", + "bus2" : "NHV2", + "connectableBus2" : "NHV2", + "p1" : 302.4440612792969, + "q1" : 98.74027252197266, + "p2" : -300.43389892578125, + "q2" : -137.18849182128906 + } ] +} \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.xml b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.xml new file mode 100644 index 00000000000..01cdfb17bfc --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/eurostag-tutorial1-lf.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/faultyThreeWindingsTransformerRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/faultyThreeWindingsTransformerRoundTripRef.xml new file mode 100644 index 00000000000..6cffc1329cc --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/faultyThreeWindingsTransformerRoundTripRef.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbk.xml b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbk.xml new file mode 100644 index 00000000000..67dfa3898ae --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbk.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbr.xml b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbr.xml new file mode 100644 index 00000000000..2539f550b4d --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-bbr.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-fict-inj.xml b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-fict-inj.xml new file mode 100644 index 00000000000..b678b920b6c --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef-fict-inj.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.jiidm b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.jiidm new file mode 100644 index 00000000000..b4185cbb5a7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.jiidm @@ -0,0 +1,745 @@ +{ + "version" : "1.13", + "id" : "fictitious", + "caseDate" : "2017-06-25T17:43:00.000+01:00", + "forecastDistance" : 0, + "sourceFormat" : "test", + "minimumValidationLevel" : "STEADY_STATE_HYPOTHESIS", + "substations" : [ { + "id" : "A", + "country" : "FR", + "voltageLevels" : [ { + "id" : "C", + "nominalV" : 225.0, + "lowVoltageLimit" : 0.0, + "topologyKind" : "NODE_BREAKER", + "nodeBreakerTopology" : { + "busbarSections" : [ { + "id" : "D", + "name" : "E", + "node" : 0 + } ], + "switches" : [ { + "id" : "F", + "name" : "G", + "fictitious" : true, + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 0, + "node2" : 1 + }, { + "id" : "H", + "name" : "I", + "fictitious" : true, + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 0, + "node2" : 3 + }, { + "id" : "J", + "name" : "K", + "fictitious" : true, + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 1, + "node2" : 2 + }, { + "id" : "L", + "name" : "M", + "fictitious" : true, + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 3, + "node2" : 4 + } ], + "buses" : [ { + "v" : 234.40912, + "angle" : 0.0, + "nodes" : [ 0, 1, 2, 3, 4 ] + } ] + } + }, { + "id" : "N", + "nominalV" : 225.0, + "lowVoltageLimit" : 220.0, + "highVoltageLimit" : 245.00002, + "topologyKind" : "NODE_BREAKER", + "nodeBreakerTopology" : { + "busbarSections" : [ { + "id" : "O", + "name" : "E", + "node" : 0 + }, { + "id" : "P", + "name" : "Q", + "node" : 1 + } ], + "switches" : [ { + "id" : "R", + "name" : "S", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 19 + }, { + "id" : "T", + "name" : "U", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 17 + }, { + "id" : "V", + "name" : "W", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 21 + }, { + "id" : "X", + "name" : "Y", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 11 + }, { + "id" : "Z", + "name" : "AA", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 13 + }, { + "id" : "AB", + "name" : "AC", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 0, + "node2" : 15 + }, { + "id" : "AD", + "name" : "AE", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 8 + }, { + "id" : "AF", + "name" : "AG", + "fictitious" : true, + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 0, + "node2" : 2 + }, { + "id" : "AH", + "name" : "AI", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 7, + "node2" : 0 + }, { + "id" : "AJ", + "name" : "AK", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 1, + "node2" : 6 + }, { + "id" : "AL", + "name" : "AM", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 1, + "node2" : 19 + }, { + "id" : "AN", + "name" : "AO", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 1, + "node2" : 17 + }, { + "id" : "AP", + "name" : "AQ", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 1, + "node2" : 21 + }, { + "id" : "AR", + "name" : "AS", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 1, + "node2" : 11 + }, { + "id" : "AT", + "name" : "AU", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 1, + "node2" : 13 + }, { + "id" : "AV", + "name" : "AW", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 1, + "node2" : 15 + }, { + "id" : "AX", + "name" : "AY", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 1, + "node2" : 8 + }, { + "id" : "AZ", + "name" : "BA", + "fictitious" : true, + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 1, + "node2" : 2 + }, { + "id" : "BB", + "name" : "BC", + "fictitious" : true, + "kind" : "BREAKER", + "retained" : true, + "open" : true, + "node1" : 2, + "node2" : 3 + }, { + "id" : "BD", + "name" : "BE", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 3, + "node2" : 4 + }, { + "id" : "BF", + "name" : "BG", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 3, + "node2" : 5 + }, { + "id" : "BH", + "name" : "BI", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : true, + "node1" : 9, + "node2" : 3 + }, { + "id" : "BJ", + "name" : "BK", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 6, + "node2" : 7 + }, { + "id" : "BL", + "name" : "BM", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 8, + "node2" : 9 + }, { + "id" : "BN", + "name" : "BO", + "kind" : "DISCONNECTOR", + "retained" : false, + "open" : false, + "node1" : 9, + "node2" : 10 + }, { + "id" : "BP", + "name" : "BQ", + "kind" : "BREAKER", + "retained" : true, + "open" : true, + "node1" : 11, + "node2" : 12 + }, { + "id" : "BR", + "name" : "BS", + "kind" : "BREAKER", + "retained" : true, + "open" : true, + "node1" : 13, + "node2" : 14 + }, { + "id" : "BT", + "name" : "BU", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 15, + "node2" : 16 + }, { + "id" : "BV", + "name" : "BW", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 17, + "node2" : 18 + }, { + "id" : "BX", + "name" : "BY", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 19, + "node2" : 20 + }, { + "id" : "BZ", + "name" : "CA", + "kind" : "BREAKER", + "retained" : true, + "open" : false, + "node1" : 21, + "node2" : 22 + } ], + "buses" : [ { + "v" : 236.44736, + "angle" : 15.250391, + "nodes" : [ 0, 1, 6, 7, 8, 9, 10, 15, 16, 17, 18, 19, 20, 21, 22 ] + } ] + }, + "generators" : [ { + "id" : "CB", + "energySource" : "HYDRO", + "minP" : 0.0, + "maxP" : 70.0, + "voltageRegulatorOn" : false, + "targetP" : 0.0, + "targetV" : 0.0, + "targetQ" : 0.0, + "node" : 12, + "reactiveCapabilityCurve" : { + "points" : [ { + "p" : 0.0, + "minQ" : -59.3, + "maxQ" : 60.0 + }, { + "p" : 70.0, + "minQ" : -54.55, + "maxQ" : 46.25 + } ] + } + }, { + "id" : "CC", + "energySource" : "HYDRO", + "minP" : 0.0, + "maxP" : 80.0, + "voltageRegulatorOn" : false, + "targetP" : 0.0, + "targetV" : 0.0, + "targetQ" : 0.0, + "node" : 14, + "reactiveCapabilityCurve" : { + "points" : [ { + "p" : 0.0, + "minQ" : -56.8, + "maxQ" : 57.4 + }, { + "p" : 80.0, + "minQ" : -53.514, + "maxQ" : 36.4 + } ] + } + }, { + "id" : "CD", + "energySource" : "HYDRO", + "minP" : 0.0, + "maxP" : 35.0, + "voltageRegulatorOn" : true, + "targetP" : 21.789589, + "targetV" : 236.44736, + "targetQ" : -20.701546, + "node" : 16, + "p" : -21.789589, + "q" : 20.693394, + "reactiveCapabilityCurve" : { + "points" : [ { + "p" : 0.0, + "minQ" : -20.6, + "maxQ" : 18.1 + }, { + "p" : 35.0, + "minQ" : -21.725, + "maxQ" : 6.3500004 + } ] + } + } ], + "loads" : [ { + "id" : "CE", + "loadType" : "UNDEFINED", + "p0" : -72.18689, + "q0" : 50.168945, + "node" : 4, + "p" : -72.18689, + "q" : 50.168945 + }, { + "id" : "CF", + "loadType" : "UNDEFINED", + "p0" : 8.455854, + "q0" : -23.695925, + "node" : 18, + "p" : 8.455854, + "q" : -23.695925 + }, { + "id" : "CG", + "loadType" : "UNDEFINED", + "p0" : 90.39911, + "q0" : -51.96869, + "node" : 20, + "p" : 90.39911, + "q" : -51.96869 + }, { + "id" : "CH", + "loadType" : "UNDEFINED", + "p0" : -5.102249, + "q0" : 4.9081216, + "node" : 22, + "p" : -5.102249, + "q" : 4.9081216 + } ] + } ], + "twoWindingsTransformers" : [ { + "id" : "CI", + "r" : 2.0, + "x" : 14.745, + "g" : 0.0, + "b" : 3.2E-5, + "ratedU1" : 225.0, + "ratedU2" : 225.0, + "voltageLevelId1" : "C", + "node1" : 2, + "voltageLevelId2" : "N", + "node2" : 10, + "selectedOperationalLimitsGroupId1" : "DEFAULT", + "selectedOperationalLimitsGroupId2" : "DEFAULT", + "phaseTapChanger" : { + "regulating" : false, + "lowTapPosition" : 0, + "tapPosition" : 22, + "regulationMode" : "CURRENT_LIMITER", + "regulationValue" : 930.6667, + "terminalRef" : { + "id" : "CI", + "side" : "ONE" + }, + "steps" : [ { + "r" : 39.78473, + "x" : 39.784725, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -42.8 + }, { + "r" : 31.720245, + "x" : 31.720242, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -40.18 + }, { + "r" : 23.655737, + "x" : 23.655735, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -37.54 + }, { + "r" : 16.263271, + "x" : 16.263268, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -34.9 + }, { + "r" : 9.542847, + "x" : 9.542842, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -32.26 + }, { + "r" : 3.4944773, + "x" : 3.4944773, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -29.6 + }, { + "r" : -1.8818557, + "x" : -1.8818527, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -26.94 + }, { + "r" : -7.258195, + "x" : -7.2581954, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -24.26 + }, { + "r" : -11.962485, + "x" : -11.962484, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -21.58 + }, { + "r" : -15.994745, + "x" : -15.994745, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -18.9 + }, { + "r" : -19.354952, + "x" : -19.354952, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -16.22 + }, { + "r" : -22.043127, + "x" : -22.043129, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -13.52 + }, { + "r" : -24.73129, + "x" : -24.731287, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -10.82 + }, { + "r" : -26.747417, + "x" : -26.747417, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -8.12 + }, { + "r" : -28.091503, + "x" : -28.091503, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -5.42 + }, { + "r" : -28.763538, + "x" : -28.763536, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : -2.7 + }, { + "r" : -28.763538, + "x" : -28.763536, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 0.0 + }, { + "r" : -28.763538, + "x" : -28.763536, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 2.7 + }, { + "r" : -28.091503, + "x" : -28.091503, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 5.42 + }, { + "r" : -26.747417, + "x" : -26.747417, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 8.12 + }, { + "r" : -24.73129, + "x" : -24.731287, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 10.82 + }, { + "r" : -22.043127, + "x" : -22.043129, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 13.52 + }, { + "r" : -19.354952, + "x" : -19.354952, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 16.22 + }, { + "r" : -15.994745, + "x" : -15.994745, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 18.9 + }, { + "r" : -11.962485, + "x" : -11.962484, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 21.58 + }, { + "r" : -7.258195, + "x" : -7.2581954, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 24.26 + }, { + "r" : -1.8818557, + "x" : -1.8818527, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 26.94 + }, { + "r" : 3.4944773, + "x" : 3.4944773, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 29.6 + }, { + "r" : 9.542847, + "x" : 9.542842, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 32.26 + }, { + "r" : 16.263271, + "x" : 16.263268, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 34.9 + }, { + "r" : 23.655737, + "x" : 23.655735, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 37.54 + }, { + "r" : 31.720245, + "x" : 31.720242, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 40.18 + }, { + "r" : 39.78473, + "x" : 39.784725, + "g" : 0.0, + "b" : 0.0, + "rho" : 1.0, + "alpha" : 42.8 + } ] + }, + "operationalLimitsGroups1" : [ { + "id" : "DEFAULT", + "currentLimits" : { + "permanentLimit" : 931.0 + } + } ], + "operationalLimitsGroups2" : [ { + "id" : "DEFAULT", + "currentLimits" : { + "permanentLimit" : 931.0 + } + } ] + } ] + } ], + "lines" : [ { + "id" : "CJ", + "r" : 0.009999999, + "x" : 0.100000024, + "g1" : 0.0, + "b1" : 0.0, + "g2" : 0.0, + "b2" : 0.0, + "voltageLevelId1" : "C", + "node1" : 4, + "voltageLevelId2" : "N", + "node2" : 5, + "selectedOperationalLimitsGroupId1" : "DEFAULT", + "selectedOperationalLimitsGroupId2" : "DEFAULT", + "operationalLimitsGroups1" : [ { + "id" : "DEFAULT", + "currentLimits" : { + "permanentLimit" : 931.0 + } + } ], + "operationalLimitsGroups2" : [ { + "id" : "DEFAULT", + "currentLimits" : { + "permanentLimit" : 931.0, + "temporaryLimits" : [ { + "name" : "IST", + "value" : 1640.0, + "fictitious" : true + }, { + "name" : "IT1", + "acceptableDuration" : 60 + } ] + } + } ] + } ] +} \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.xml new file mode 100644 index 00000000000..19cbeaf41ec --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/fictitiousSwitchRef.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/generatorEntsoeCategoryRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/generatorEntsoeCategoryRef.xml new file mode 100644 index 00000000000..8e9b07ca9b8 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/generatorEntsoeCategoryRef.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + 4 + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0-itesla.xml b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0-itesla.xml new file mode 100644 index 00000000000..6b682d6e7d9 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0-itesla.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0.xml b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0.xml new file mode 100644 index 00000000000..074b4e5a78d --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef-1.0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef.xml new file mode 100644 index 00000000000..184efa92d71 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/generatorStartupRef.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/ground.xml b/iidm/iidm-serde/src/test/resources/V1_13/ground.xml new file mode 100644 index 00000000000..697d7f3f58a --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/ground.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/hvdcAngleDroopActivePowerControlRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/hvdcAngleDroopActivePowerControlRef.xml new file mode 100644 index 00000000000..dcaf5009d80 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/hvdcAngleDroopActivePowerControlRef.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/hvdcOperatorActiveRangeRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/hvdcOperatorActiveRangeRef.xml new file mode 100644 index 00000000000..76c5f81888d --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/hvdcOperatorActiveRangeRef.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRef.xml new file mode 100644 index 00000000000..d74f1017ebe --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRef.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRefInvalid.xml b/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRefInvalid.xml new file mode 100644 index 00000000000..4abe1b99e4f --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/injectionObservabilityRoundTripRefInvalid.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/internalConnections.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/internalConnections.xiidm new file mode 100644 index 00000000000..612ccc6c630 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/internalConnections.xiidm @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/loadDetailRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/loadDetailRef.xml new file mode 100644 index 00000000000..ecfa868aa7f --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/loadDetailRef.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/measRef.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/measRef.xiidm new file mode 100644 index 00000000000..ff055852915 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/measRef.xiidm @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/multiple-extensions.xml b/iidm/iidm-serde/src/test/resources/V1_13/multiple-extensions.xml new file mode 100644 index 00000000000..0f83b29170a --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/multiple-extensions.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/multiple-subnetwork-levels.xml b/iidm/iidm-serde/src/test/resources/V1_13/multiple-subnetwork-levels.xml new file mode 100644 index 00000000000..207f6a8baeb --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/multiple-subnetwork-levels.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/nodebreaker-busproperties.xml b/iidm/iidm-serde/src/test/resources/V1_13/nodebreaker-busproperties.xml new file mode 100644 index 00000000000..7f0807659ea --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/nodebreaker-busproperties.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/nonLinearShuntRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/nonLinearShuntRoundTripRef.xml new file mode 100644 index 00000000000..303f3b6b72b --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/nonLinearShuntRoundTripRef.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/optionalLoadTypeBug.xml b/iidm/iidm-serde/src/test/resources/V1_13/optionalLoadTypeBug.xml new file mode 100644 index 00000000000..54c6ec1570e --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/optionalLoadTypeBug.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/overloadManagementSystemRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/overloadManagementSystemRoundTripRef.xml new file mode 100644 index 00000000000..e3fa457c5c2 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/overloadManagementSystemRoundTripRef.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/phaseShifterRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/phaseShifterRoundTripRef.xml new file mode 100644 index 00000000000..582078893ed --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/phaseShifterRoundTripRef.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRef.xml new file mode 100644 index 00000000000..117c5e4610f --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRef.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRefWithSolvedTapPosition.xml b/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRefWithSolvedTapPosition.xml new file mode 100644 index 00000000000..0aa91b6fee7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/ratioTapChangerReactivePowerControlRefWithSolvedTapPosition.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/reactiveLimitsRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/reactiveLimitsRoundTripRef.xml new file mode 100644 index 00000000000..2f85726d39b --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/reactiveLimitsRoundTripRef.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/referencePrioritiesRef.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/referencePrioritiesRef.xiidm new file mode 100644 index 00000000000..0c64701b3c7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/referencePrioritiesRef.xiidm @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/referenceTerminalsRef.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/referenceTerminalsRef.xiidm new file mode 100644 index 00000000000..f0a0865bd94 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/referenceTerminalsRef.xiidm @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/regulatingStaticVarCompensatorRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/regulatingStaticVarCompensatorRoundTripRef.xml new file mode 100644 index 00000000000..77f6fd76cda --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/regulatingStaticVarCompensatorRoundTripRef.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/regulatingTerminal.xml b/iidm/iidm-serde/src/test/resources/V1_13/regulatingTerminal.xml new file mode 100644 index 00000000000..612cc2e59e7 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/regulatingTerminal.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/remoteReactivePowerControlRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/remoteReactivePowerControlRef.xml new file mode 100644 index 00000000000..3f6c4749055 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/remoteReactivePowerControlRef.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/scadaNetwork.xml b/iidm/iidm-serde/src/test/resources/V1_13/scadaNetwork.xml new file mode 100644 index 00000000000..1279d306d1e --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/scadaNetwork.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/secondaryVoltageControlRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/secondaryVoltageControlRoundTripRef.xml new file mode 100644 index 00000000000..6ae8b3114eb --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/secondaryVoltageControlRoundTripRef.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NLOAD + + GEN + GEN2 + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/shuntRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/shuntRoundTripRef.xml new file mode 100644 index 00000000000..82b81303f67 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/shuntRoundTripRef.xml @@ -0,0 +1,24 @@ + + + + + + + + + Alias + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/shuntWithSolvedSectionCountRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/shuntWithSolvedSectionCountRoundTripRef.xml new file mode 100644 index 00000000000..2010611e8db --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/shuntWithSolvedSectionCountRoundTripRef.xml @@ -0,0 +1,23 @@ + + + + + + + + + Alias + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/staticVarCompensatorRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/staticVarCompensatorRoundTripRef.xml new file mode 100644 index 00000000000..48dccdd5297 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/staticVarCompensatorRoundTripRef.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/subnetworks.xml b/iidm/iidm-serde/src/test/resources/V1_13/subnetworks.xml new file mode 100644 index 00000000000..aacc031d339 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/subnetworks.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/substationAndLinePositionRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/substationAndLinePositionRoundTripRef.xml new file mode 100644 index 00000000000..aea6a8613e8 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/substationAndLinePositionRoundTripRef.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iidm/iidm-serde/src/test/resources/V1_13/t3w-loading-limits.xml b/iidm/iidm-serde/src/test/resources/V1_13/t3w-loading-limits.xml new file mode 100644 index 00000000000..f2520854f96 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/t3w-loading-limits.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/terminalRef.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/terminalRef.xiidm new file mode 100644 index 00000000000..3fef1504f67 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/terminalRef.xiidm @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/terminalRefNotFound.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/terminalRefNotFound.xiidm new file mode 100644 index 00000000000..48aad89f0cb --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/terminalRefNotFound.xiidm @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerPhaseAngleClock.xml b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerPhaseAngleClock.xml new file mode 100644 index 00000000000..151c138c347 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerPhaseAngleClock.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerRoundTripRef.xml new file mode 100644 index 00000000000..947c91ddfde --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerRoundTripRef.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerToBeEstimated.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerToBeEstimated.xiidm new file mode 100644 index 00000000000..48da0d7a2c3 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/threeWindingsTransformerToBeEstimated.xiidm @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml b/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml new file mode 100644 index 00000000000..9aeb50e8541 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/tieLineTerminalRefBug.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tieline.xml b/iidm/iidm-serde/src/test/resources/V1_13/tieline.xml new file mode 100644 index 00000000000..bb2c9031a17 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/tieline.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tielineWithAliases.xml b/iidm/iidm-serde/src/test/resources/V1_13/tielineWithAliases.xml new file mode 100644 index 00000000000..76c8d2aae49 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/tielineWithAliases.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Alias + Other alias + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/tl-loading-limits.xml b/iidm/iidm-serde/src/test/resources/V1_13/tl-loading-limits.xml new file mode 100644 index 00000000000..fc723979bc1 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/tl-loading-limits.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTap.xml b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTap.xml new file mode 100644 index 00000000000..79b8dc4f6ad --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTap.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTapWithExtensions.xml b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTapWithExtensions.xml new file mode 100644 index 00000000000..dc13faed5a9 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAndRatioTapWithExtensions.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAngleClock.xml b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAngleClock.xml new file mode 100644 index 00000000000..ec0fd43ebe9 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerPhaseAngleClock.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerToBeEstimated.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerToBeEstimated.xiidm new file mode 100644 index 00000000000..dd4775b0a31 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/twoWindingsTransformerToBeEstimated.xiidm @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/voltageAngleLimit.xiidm b/iidm/iidm-serde/src/test/resources/V1_13/voltageAngleLimit.xiidm new file mode 100644 index 00000000000..c515057975d --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/voltageAngleLimit.xiidm @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/voltagePerReactivePowerControl.xml b/iidm/iidm-serde/src/test/resources/V1_13/voltagePerReactivePowerControl.xml new file mode 100644 index 00000000000..8c303cb5dbe --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/voltagePerReactivePowerControl.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/voltageRegulationRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/V1_13/voltageRegulationRoundTripRef.xml new file mode 100644 index 00000000000..024433258e0 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/voltageRegulationRoundTripRef.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/withoutPermanentLimit.xml b/iidm/iidm-serde/src/test/resources/V1_13/withoutPermanentLimit.xml new file mode 100644 index 00000000000..5e4da4e21b8 --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/withoutPermanentLimit.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/V1_13/xsd/terminalMock.xsd b/iidm/iidm-serde/src/test/resources/V1_13/xsd/terminalMock.xsd new file mode 100644 index 00000000000..9fa0a5d16ef --- /dev/null +++ b/iidm/iidm-serde/src/test/resources/V1_13/xsd/terminalMock.xsd @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/iidm/iidm-serde/src/test/resources/asymmetrical/loadAsymmetricalRef.xml b/iidm/iidm-serde/src/test/resources/asymmetrical/loadAsymmetricalRef.xml index 0b1a5a9e79e..ee461c96afb 100644 --- a/iidm/iidm-serde/src/test/resources/asymmetrical/loadAsymmetricalRef.xml +++ b/iidm/iidm-serde/src/test/resources/asymmetrical/loadAsymmetricalRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/branchStatusRef.xml b/iidm/iidm-serde/src/test/resources/branchStatusRef.xml index 30539add49a..b45d44d5ef2 100644 --- a/iidm/iidm-serde/src/test/resources/branchStatusRef.xml +++ b/iidm/iidm-serde/src/test/resources/branchStatusRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/busbarSectionPositionRef.xml b/iidm/iidm-serde/src/test/resources/busbarSectionPositionRef.xml index 1a807f2494a..f50ee360d99 100644 --- a/iidm/iidm-serde/src/test/resources/busbarSectionPositionRef.xml +++ b/iidm/iidm-serde/src/test/resources/busbarSectionPositionRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_0.xml b/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_0.xml index f16343df8a4..df8b28b6247 100644 --- a/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_0.xml +++ b/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_0.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_1.xml b/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_1.xml index 1cba84e1fc1..c97dd763027 100644 --- a/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_1.xml +++ b/iidm/iidm-serde/src/test/resources/connectablePositionRef_V1_1.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/encoding/network.xml b/iidm/iidm-serde/src/test/resources/encoding/network.xml index 5d2112a8671..d06dcae40ed 100644 --- a/iidm/iidm-serde/src/test/resources/encoding/network.xml +++ b/iidm/iidm-serde/src/test/resources/encoding/network.xml @@ -1,4 +1,4 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/fortescue/generatorFortescueRef.xml b/iidm/iidm-serde/src/test/resources/fortescue/generatorFortescueRef.xml index 1bcf44fede4..0690763b14c 100644 --- a/iidm/iidm-serde/src/test/resources/fortescue/generatorFortescueRef.xml +++ b/iidm/iidm-serde/src/test/resources/fortescue/generatorFortescueRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/fortescue/lineFortescueRef.xml b/iidm/iidm-serde/src/test/resources/fortescue/lineFortescueRef.xml index 45a1a4ea37a..9c89cbcbe4a 100644 --- a/iidm/iidm-serde/src/test/resources/fortescue/lineFortescueRef.xml +++ b/iidm/iidm-serde/src/test/resources/fortescue/lineFortescueRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/fortescue/threeWindingsTransformerFortescueRef.xml b/iidm/iidm-serde/src/test/resources/fortescue/threeWindingsTransformerFortescueRef.xml index 25f4dcae7be..e73ebfc3c7c 100644 --- a/iidm/iidm-serde/src/test/resources/fortescue/threeWindingsTransformerFortescueRef.xml +++ b/iidm/iidm-serde/src/test/resources/fortescue/threeWindingsTransformerFortescueRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/fortescue/twoWindingsTransformerFortescueRef.xml b/iidm/iidm-serde/src/test/resources/fortescue/twoWindingsTransformerFortescueRef.xml index f3508189002..f8060ec44b4 100644 --- a/iidm/iidm-serde/src/test/resources/fortescue/twoWindingsTransformerFortescueRef.xml +++ b/iidm/iidm-serde/src/test/resources/fortescue/twoWindingsTransformerFortescueRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/geographicalTags.xml b/iidm/iidm-serde/src/test/resources/geographicalTags.xml index 939cafb5f5c..17bfcc6c78c 100644 --- a/iidm/iidm-serde/src/test/resources/geographicalTags.xml +++ b/iidm/iidm-serde/src/test/resources/geographicalTags.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/operatingStatusRef.xml b/iidm/iidm-serde/src/test/resources/operatingStatusRef.xml index 5d52b87fcc8..c8167676d4a 100644 --- a/iidm/iidm-serde/src/test/resources/operatingStatusRef.xml +++ b/iidm/iidm-serde/src/test/resources/operatingStatusRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/shortcircuits/generatorShortCircuitRef.xml b/iidm/iidm-serde/src/test/resources/shortcircuits/generatorShortCircuitRef.xml index 0b86a756818..8d17d5f42a4 100644 --- a/iidm/iidm-serde/src/test/resources/shortcircuits/generatorShortCircuitRef.xml +++ b/iidm/iidm-serde/src/test/resources/shortcircuits/generatorShortCircuitRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/shortcircuits/voltageLevelShortCircuitRef.xml b/iidm/iidm-serde/src/test/resources/shortcircuits/voltageLevelShortCircuitRef.xml index 9bf51ab1cd7..f4e0c24742c 100644 --- a/iidm/iidm-serde/src/test/resources/shortcircuits/voltageLevelShortCircuitRef.xml +++ b/iidm/iidm-serde/src/test/resources/shortcircuits/voltageLevelShortCircuitRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/skippedExtensions.xml b/iidm/iidm-serde/src/test/resources/skippedExtensions.xml index 31fff396305..7d9f68e35a7 100644 --- a/iidm/iidm-serde/src/test/resources/skippedExtensions.xml +++ b/iidm/iidm-serde/src/test/resources/skippedExtensions.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/slackTerminal.xml b/iidm/iidm-serde/src/test/resources/slackTerminal.xml index 7a4e0572c57..e0bc27c1ebd 100644 --- a/iidm/iidm-serde/src/test/resources/slackTerminal.xml +++ b/iidm/iidm-serde/src/test/resources/slackTerminal.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/standbyAutomatonRoundTripRef.xml b/iidm/iidm-serde/src/test/resources/standbyAutomatonRoundTripRef.xml index b3f7022264d..96f3a54f960 100644 --- a/iidm/iidm-serde/src/test/resources/standbyAutomatonRoundTripRef.xml +++ b/iidm/iidm-serde/src/test/resources/standbyAutomatonRoundTripRef.xml @@ -1,5 +1,5 @@ - + diff --git a/iidm/iidm-serde/src/test/resources/xsd/terminalMockNoSerDe.xsd b/iidm/iidm-serde/src/test/resources/xsd/terminalMockNoSerDe.xsd index cda5635acda..6e3b474f392 100644 --- a/iidm/iidm-serde/src/test/resources/xsd/terminalMockNoSerDe.xsd +++ b/iidm/iidm-serde/src/test/resources/xsd/terminalMockNoSerDe.xsd @@ -1,10 +1,10 @@ - + diff --git a/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractShuntCompensatorTest.java b/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractShuntCompensatorTest.java index da250507f37..b97f8627761 100644 --- a/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractShuntCompensatorTest.java +++ b/iidm/iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractShuntCompensatorTest.java @@ -521,6 +521,18 @@ public void testSetTerminalP() { assertEquals(10, sbNonLinear.getTerminal().getP(), 0.0); } + @Test + public void testSolvedSectionCount() { + ShuntCompensatorAdder adder = createShuntAdder(SHUNT, "shuntName", 6, terminal, true, 200, 10); + adder.newLinearModel() + .setBPerSection(5.0) + .setMaximumSectionCount(10) + .add(); + adder.setSolvedSectionCount(5); + ShuntCompensator shuntCompensator = adder.add(); + assertEquals(5, shuntCompensator.getSolvedSectionCount()); + } + private ShuntCompensator createLinearShunt(String id, String name, double bPerSection, double gPerSection, int sectionCount, int maxSectionCount, Terminal regulatingTerminal, boolean voltageRegulatorOn, double targetV, double targetDeadband) { return createShuntAdder(id, name, sectionCount, regulatingTerminal, voltageRegulatorOn, targetV, targetDeadband) .newLinearModel() diff --git a/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/ShuntTestCaseFactory.java b/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/ShuntTestCaseFactory.java index dbde19a85f9..15d7638cd73 100644 --- a/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/ShuntTestCaseFactory.java +++ b/iidm/iidm-test/src/main/java/com/powsybl/iidm/network/test/ShuntTestCaseFactory.java @@ -26,18 +26,22 @@ public static Network create() { return create(NetworkFactory.findDefault()); } + public static Network createWithSolvedSectionCount(Integer solvedSectionCount) { + return create(NetworkFactory.findDefault(), 1e-5, solvedSectionCount); + } + public static Network create(double bPerSection) { - return create(NetworkFactory.findDefault(), bPerSection); + return create(NetworkFactory.findDefault(), bPerSection, null); } public static Network create(NetworkFactory networkFactory) { - return create(networkFactory, 1e-5); + return create(networkFactory, 1e-5, null); } - public static Network create(NetworkFactory networkFactory, double bPerSection) { + public static Network create(NetworkFactory networkFactory, double bPerSection, Integer solvedSectionCount) { Network network = createBase(networkFactory); - network.getVoltageLevel("VL1") + ShuntCompensatorAdder adder = network.getVoltageLevel("VL1") .newShuntCompensator() .setId(SHUNT) .setBus("B1") @@ -48,11 +52,15 @@ public static Network create(NetworkFactory networkFactory, double bPerSection) .setTargetV(200) .setTargetDeadband(5.0) .newLinearModel() - .setMaximumSectionCount(1) - .setBPerSection(bPerSection) - .add() - .add() - .addAlias("Alias"); + .setMaximumSectionCount(1) + .setBPerSection(bPerSection) + .add(); + + if (solvedSectionCount != null) { + adder.setSolvedSectionCount(solvedSectionCount); + } + + adder.add().addAlias("Alias"); return network; } diff --git a/matpower/matpower-converter/src/test/resources/ieee118.xiidm b/matpower/matpower-converter/src/test/resources/ieee118.xiidm index e22d9869ef9..d648236289c 100644 --- a/matpower/matpower-converter/src/test/resources/ieee118.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee118.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee14-inverted-voltage-limits.xiidm b/matpower/matpower-converter/src/test/resources/ieee14-inverted-voltage-limits.xiidm index 5669350bcb1..872ed92eaf5 100644 --- a/matpower/matpower-converter/src/test/resources/ieee14-inverted-voltage-limits.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee14-inverted-voltage-limits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee14-phase-shifter.xiidm b/matpower/matpower-converter/src/test/resources/ieee14-phase-shifter.xiidm index aec6e1603aa..b6827e17875 100644 --- a/matpower/matpower-converter/src/test/resources/ieee14-phase-shifter.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee14-phase-shifter.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee14.xiidm b/matpower/matpower-converter/src/test/resources/ieee14.xiidm index 2ffddb11a3d..fb950e53a25 100644 --- a/matpower/matpower-converter/src/test/resources/ieee14.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee14.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee30-considering-base-voltage.xiidm b/matpower/matpower-converter/src/test/resources/ieee30-considering-base-voltage.xiidm index fb1fd8603ba..298911edef5 100644 --- a/matpower/matpower-converter/src/test/resources/ieee30-considering-base-voltage.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee30-considering-base-voltage.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee30.xiidm b/matpower/matpower-converter/src/test/resources/ieee30.xiidm index ba0d11b7a5d..0acce6d1559 100644 --- a/matpower/matpower-converter/src/test/resources/ieee30.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee30.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee300.xiidm b/matpower/matpower-converter/src/test/resources/ieee300.xiidm index f87fc7862de..d11480fcbb3 100644 --- a/matpower/matpower-converter/src/test/resources/ieee300.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee300.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee57.xiidm b/matpower/matpower-converter/src/test/resources/ieee57.xiidm index c87a7d6b185..76a3f1bc3f5 100644 --- a/matpower/matpower-converter/src/test/resources/ieee57.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee57.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee9.xiidm b/matpower/matpower-converter/src/test/resources/ieee9.xiidm index d4121ff9c0e..fc4cdbef2f4 100644 --- a/matpower/matpower-converter/src/test/resources/ieee9.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee9.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee9_limits.xiidm b/matpower/matpower-converter/src/test/resources/ieee9_limits.xiidm index d0b0a655e34..4a1638bc386 100644 --- a/matpower/matpower-converter/src/test/resources/ieee9_limits.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee9_limits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/ieee9zeroimpedance.xiidm b/matpower/matpower-converter/src/test/resources/ieee9zeroimpedance.xiidm index 4566fde62dd..130b0c53ffb 100644 --- a/matpower/matpower-converter/src/test/resources/ieee9zeroimpedance.xiidm +++ b/matpower/matpower-converter/src/test/resources/ieee9zeroimpedance.xiidm @@ -1,5 +1,5 @@ - + diff --git a/matpower/matpower-converter/src/test/resources/t_case9_dcline.xiidm b/matpower/matpower-converter/src/test/resources/t_case9_dcline.xiidm index b8f1a6de2b9..a0298cf72c2 100644 --- a/matpower/matpower-converter/src/test/resources/t_case9_dcline.xiidm +++ b/matpower/matpower-converter/src/test/resources/t_case9_dcline.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/CapabilityCurve.xiidm b/powerfactory/powerfactory-converter/src/test/resources/CapabilityCurve.xiidm index fe254f8ec5a..832d249417a 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/CapabilityCurve.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/CapabilityCurve.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedance.xiidm b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedance.xiidm index 59cea6018dc..56fa290c4cd 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedance.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedance.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceOnlyImpedance12.xiidm b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceOnlyImpedance12.xiidm index 5faa2a8a7bf..5ad5654ebac 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceOnlyImpedance12.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceOnlyImpedance12.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceWithDifferentNominal.xiidm b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceWithDifferentNominal.xiidm index 0897893da7f..12534312084 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceWithDifferentNominal.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/CommonImpedanceWithDifferentNominal.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Hvdc.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Hvdc.xiidm index bcacc7f0631..2f106286491 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Hvdc.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Hvdc.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Slack_bustp.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Slack_bustp.xiidm index a7c9de505b6..b1efbdee308 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Slack_bustp.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Slack_bustp.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Slack_ip_ctrl.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Slack_ip_ctrl.xiidm index f5a39b55029..f047d9d77d2 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Slack_ip_ctrl.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Slack_ip_ctrl.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-angle.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-angle.xiidm index 3d65888edb5..3e9a90db7a9 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-angle.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-angle.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-voltage.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-voltage.xiidm index f0f89752174..0d3aa69efce 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-voltage.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Switches-missing-voltage.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Switches-negative-voltage.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Switches-negative-voltage.xiidm index 77ba3de0901..3f0bfc0100e 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Switches-negative-voltage.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Switches-negative-voltage.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Switches-without-bus.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Switches-without-bus.xiidm index 735483c5203..0647535ce04 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Switches-without-bus.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Switches-without-bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Switches.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Switches.xiidm index 6d070dbfe63..4e104bf4658 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Switches.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Switches.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_solved.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_solved.xiidm index 85a2be7bd24..1e127800757 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_solved.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_solved.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1.xiidm index 4578c894e8c..19aa1db42e7 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding12.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding12.xiidm index 45d99db3512..288fb5e98f3 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding12.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding12.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_complete.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_complete.xiidm index d0e97abd590..8bc86cb89a5 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_complete.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_complete.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_ratio.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_ratio.xiidm index 99005e69fd4..637a2c36d32 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_ratio.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding1_ratio.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding2.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding2.xiidm index a7ec4bcb1f7..ea82b899c7b 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding2.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding2.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding3.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding3.xiidm index 48594a52abb..5dd666b06ef 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding3.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeMIB_T3W_phase_winding3.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ThreeWindingsTransformerWinding1Ratio.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ThreeWindingsTransformerWinding1Ratio.xiidm index 8bbcf66e674..c596eaea578 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ThreeWindingsTransformerWinding1Ratio.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ThreeWindingsTransformerWinding1Ratio.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Tower.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Tower.xiidm index 9a49cd1bb3e..1234ac351b1 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Tower.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Tower.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral-with-mTaps.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral-with-mTaps.xiidm index ecdfa14471a..720ca83ae1c 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral-with-mTaps.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral-with-mTaps.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral.xiidm index 08804af1efd..fd2a79aa534 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-complete.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-complete.xiidm index 5097e7bbde9..335311c2386 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-complete.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-complete.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-with-mTaps.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-with-mTaps.xiidm index a8c66bbcd17..71667e6034c 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-with-mTaps.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB-with-mTaps.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB.xiidm index 96ab2e5671b..50fac1f251f 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-GB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral-with-mTaps.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral-with-mTaps.xiidm index d6f717b6885..40b5357a2c5 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral-with-mTaps.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral-with-mTaps.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral.xiidm index dace0d5f6d8..e854c0c09a1 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-with-mTaps.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-with-mTaps.xiidm index e9df811c9b8..42ecf2db741 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-with-mTaps.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase-with-mTaps.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase.xiidm index 4fe3df0144b..028cf37023a 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-Phase.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral-proportion.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral-proportion.xiidm index 16ebd29b317..1e026de79cf 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral-proportion.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral-proportion.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral.xiidm index 91e70b612e5..6453a328c4c 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB-Non-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB.xiidm index f5144ed888e..aea781aaed3 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-GB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-Non-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-Non-Neutral.xiidm index c647d32194e..d3fd35128d9 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-Non-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl-Non-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl.xiidm index 24e4e869d15..4afb73e6228 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VhVl.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral-proportion.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral-proportion.xiidm index 971d2fd9d53..bf183a598c7 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral-proportion.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral-proportion.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral.xiidm index ec72dc8ea74..8e2d076081f 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB-Non-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB.xiidm index a0fd5b63255..6670fb6a7fc 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-GB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-Non-Neutral.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-Non-Neutral.xiidm index baedb66cf91..741e5e59a37 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-Non-Neutral.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh-Non-Neutral.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh.xiidm b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh.xiidm index ec390e8a967..52a496de88d 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/Transformer-VlVh.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TransformersWithPhaseAngleClock.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TransformersWithPhaseAngleClock.xiidm index 52c2079449c..f29f536f5db 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TransformersWithPhaseAngleClock.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TransformersWithPhaseAngleClock.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGenerator.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGenerator.xiidm index e1351d17b69..badda35c71e 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGenerator.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGenerator.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntC.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntC.xiidm index 8ca310a1f60..a10bfd1c0aa 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntC.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntC.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRL.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRL.xiidm index c13c3c0ac02..10c4007d59e 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRL.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRL.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRLrxrea.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRLrxrea.xiidm index e08bbcb5c7f..3794b3ca8da 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRLrxrea.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAndShuntRLrxrea.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAvmode.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAvmode.xiidm index 7aded466426..53574572ab4 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAvmode.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorAvmode.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorElmReactiveLimits.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorElmReactiveLimits.xiidm index 2003d574a29..1e798c71e77 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorElmReactiveLimits.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorElmReactiveLimits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorIqtype.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorIqtype.xiidm index 30fd2298b3d..a55a450a2f3 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorIqtype.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorIqtype.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypMvarReactiveLimits.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypMvarReactiveLimits.xiidm index 7012b5bd618..caf03835db2 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypMvarReactiveLimits.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypMvarReactiveLimits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypReactiveLimits.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypReactiveLimits.xiidm index 002277cc29b..953cef2b1fc 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypReactiveLimits.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorTypReactiveLimits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutActiveLimits.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutActiveLimits.xiidm index c22a4186dfb..729eeb38fa0 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutActiveLimits.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutActiveLimits.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIqtype.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIqtype.xiidm index 0a64782b0a1..28fc1f50026 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIqtype.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIqtype.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIvmode.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIvmode.xiidm index d16cc990130..5793e99266c 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIvmode.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesGeneratorWithoutIvmode.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithB.xiidm index 363923a5c5b..732ef046a01 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithC.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithC.xiidm index 652c6f2ba32..9354474bb2e 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithC.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithC.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithGandB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithGandB.xiidm index fb813e92c6a..1b9eb350aab 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithGandB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithGandB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithNumberOfParallelLines.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithNumberOfParallelLines.xiidm index 1b1baaabbf8..b7ed9dc9fb2 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithNumberOfParallelLines.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithNumberOfParallelLines.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithTandB.xiidm b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithTandB.xiidm index 4f69b9c5dfd..331d0f48fcf 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithTandB.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/TwoBusesLineWithTandB.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/VoltageLevelsAndSubstations.xiidm b/powerfactory/powerfactory-converter/src/test/resources/VoltageLevelsAndSubstations.xiidm index 94ca0a62464..8bca598b254 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/VoltageLevelsAndSubstations.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/VoltageLevelsAndSubstations.xiidm @@ -1,5 +1,5 @@ - + diff --git a/powerfactory/powerfactory-converter/src/test/resources/ieee14.xiidm b/powerfactory/powerfactory-converter/src/test/resources/ieee14.xiidm index cbcaaa16cf9..8ac8278ad6b 100644 --- a/powerfactory/powerfactory-converter/src/test/resources/ieee14.xiidm +++ b/powerfactory/powerfactory-converter/src/test/resources/ieee14.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/ExampleVersion32.xiidm b/psse/psse-converter/src/test/resources/ExampleVersion32.xiidm index 0dfa30a42e3..1457aaf76f8 100644 --- a/psse/psse-converter/src/test/resources/ExampleVersion32.xiidm +++ b/psse/psse-converter/src/test/resources/ExampleVersion32.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_118_bus.xiidm b/psse/psse-converter/src/test/resources/IEEE_118_bus.xiidm index c18ea69dcd6..6d9e6d41b07 100644 --- a/psse/psse-converter/src/test/resources/IEEE_118_bus.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_118_bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_14_bus.xiidm b/psse/psse-converter/src/test/resources/IEEE_14_bus.xiidm index ce91cadaba9..85e2bd1879c 100644 --- a/psse/psse-converter/src/test/resources/IEEE_14_bus.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_14_bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids.xiidm b/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids.xiidm index badc5a94bbe..56ccc7cd27f 100644 --- a/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids_rev35.xiidm b/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids_rev35.xiidm index 4f5e634be4d..26bd19dcf08 100644 --- a/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids_rev35.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_14_buses_duplicate_ids_rev35.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_14_buses_zip_load.xiidm b/psse/psse-converter/src/test/resources/IEEE_14_buses_zip_load.xiidm index e732810547b..fb2a34621bc 100644 --- a/psse/psse-converter/src/test/resources/IEEE_14_buses_zip_load.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_14_buses_zip_load.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_14_isolated_buses.xiidm b/psse/psse-converter/src/test/resources/IEEE_14_isolated_buses.xiidm index 1368b38a8e1..9dd45b0acf9 100644 --- a/psse/psse-converter/src/test/resources/IEEE_14_isolated_buses.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_14_isolated_buses.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_24_bus.xiidm b/psse/psse-converter/src/test/resources/IEEE_24_bus.xiidm index eb403c5e8a9..e387949c7a7 100644 --- a/psse/psse-converter/src/test/resources/IEEE_24_bus.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_24_bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_30_bus.xiidm b/psse/psse-converter/src/test/resources/IEEE_30_bus.xiidm index 0e381a3e72a..7c4c8055ae4 100644 --- a/psse/psse-converter/src/test/resources/IEEE_30_bus.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_30_bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IEEE_57_bus.xiidm b/psse/psse-converter/src/test/resources/IEEE_57_bus.xiidm index dddbc59a624..9db123b99e2 100644 --- a/psse/psse-converter/src/test/resources/IEEE_57_bus.xiidm +++ b/psse/psse-converter/src/test/resources/IEEE_57_bus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/IsolatedSlackBus.xiidm b/psse/psse-converter/src/test/resources/IsolatedSlackBus.xiidm index 15a1524978d..a01f8feb95b 100644 --- a/psse/psse-converter/src/test/resources/IsolatedSlackBus.xiidm +++ b/psse/psse-converter/src/test/resources/IsolatedSlackBus.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/RawCaseWithSpecialCharacters.xiidm b/psse/psse-converter/src/test/resources/RawCaseWithSpecialCharacters.xiidm index e2ce31a7364..a09eac310f8 100644 --- a/psse/psse-converter/src/test/resources/RawCaseWithSpecialCharacters.xiidm +++ b/psse/psse-converter/src/test/resources/RawCaseWithSpecialCharacters.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/RawxCaseWithSpecialCharacters.xiidm b/psse/psse-converter/src/test/resources/RawxCaseWithSpecialCharacters.xiidm index d502f9e163b..fb1986ed068 100644 --- a/psse/psse-converter/src/test/resources/RawxCaseWithSpecialCharacters.xiidm +++ b/psse/psse-converter/src/test/resources/RawxCaseWithSpecialCharacters.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/SwitchedShunt.xiidm b/psse/psse-converter/src/test/resources/SwitchedShunt.xiidm index 11259c3c17e..c40aa3a7cfe 100644 --- a/psse/psse-converter/src/test/resources/SwitchedShunt.xiidm +++ b/psse/psse-converter/src/test/resources/SwitchedShunt.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/SwitchedShuntWithZeroVswlo.xiidm b/psse/psse-converter/src/test/resources/SwitchedShuntWithZeroVswlo.xiidm index e1f7e8edf55..a6a18731d0f 100644 --- a/psse/psse-converter/src/test/resources/SwitchedShuntWithZeroVswlo.xiidm +++ b/psse/psse-converter/src/test/resources/SwitchedShuntWithZeroVswlo.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/ThreeMIB_T3W_modified.xiidm b/psse/psse-converter/src/test/resources/ThreeMIB_T3W_modified.xiidm index f11d9b3f068..8b031d75900 100644 --- a/psse/psse-converter/src/test/resources/ThreeMIB_T3W_modified.xiidm +++ b/psse/psse-converter/src/test/resources/ThreeMIB_T3W_modified.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/ThreeMIB_T3W_phase.xiidm b/psse/psse-converter/src/test/resources/ThreeMIB_T3W_phase.xiidm index 8a3959ed27f..299456b3acb 100644 --- a/psse/psse-converter/src/test/resources/ThreeMIB_T3W_phase.xiidm +++ b/psse/psse-converter/src/test/resources/ThreeMIB_T3W_phase.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/TransformersWithZeroNomV.xiidm b/psse/psse-converter/src/test/resources/TransformersWithZeroNomV.xiidm index daa07f2a1aa..a9de463993f 100644 --- a/psse/psse-converter/src/test/resources/TransformersWithZeroNomV.xiidm +++ b/psse/psse-converter/src/test/resources/TransformersWithZeroNomV.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/TwoWindingsTransformerPhase.xiidm b/psse/psse-converter/src/test/resources/TwoWindingsTransformerPhase.xiidm index 1bb6c73fccd..0be0f5d600a 100644 --- a/psse/psse-converter/src/test/resources/TwoWindingsTransformerPhase.xiidm +++ b/psse/psse-converter/src/test/resources/TwoWindingsTransformerPhase.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/parallelTwoTerminalDcBetweenSameAcBuses.xiidm b/psse/psse-converter/src/test/resources/parallelTwoTerminalDcBetweenSameAcBuses.xiidm index 6bb2efbb6da..082b7553fdc 100644 --- a/psse/psse-converter/src/test/resources/parallelTwoTerminalDcBetweenSameAcBuses.xiidm +++ b/psse/psse-converter/src/test/resources/parallelTwoTerminalDcBetweenSameAcBuses.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/remoteControl.xiidm b/psse/psse-converter/src/test/resources/remoteControl.xiidm index 0b5bc450103..cc4d06f9cd9 100644 --- a/psse/psse-converter/src/test/resources/remoteControl.xiidm +++ b/psse/psse-converter/src/test/resources/remoteControl.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/twoTerminalDc.xiidm b/psse/psse-converter/src/test/resources/twoTerminalDc.xiidm index d4196ef0b18..5c52ad0695b 100644 --- a/psse/psse-converter/src/test/resources/twoTerminalDc.xiidm +++ b/psse/psse-converter/src/test/resources/twoTerminalDc.xiidm @@ -1,5 +1,5 @@ - + diff --git a/psse/psse-converter/src/test/resources/twoTerminalDc_with_negative_setvl.xiidm b/psse/psse-converter/src/test/resources/twoTerminalDc_with_negative_setvl.xiidm index 86c647c769d..3b10163984b 100644 --- a/psse/psse-converter/src/test/resources/twoTerminalDc_with_negative_setvl.xiidm +++ b/psse/psse-converter/src/test/resources/twoTerminalDc_with_negative_setvl.xiidm @@ -1,5 +1,5 @@ - +