Revert "Fix conflicts: correct loss factors values + add test for shu…

…nt.getOptionalName()" This reverts commit 2610d27. Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>
powsybl · Jun 24, 2020 · 9ffc9a4 · 9ffc9a4
1 parent 1c68e1c
commit 9ffc9a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
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
@@ -64,7 +64,6 @@ public void baseTest() {
                 .setTargetDeadband(10)
                 .add();
         assertEquals(ConnectableType.SHUNT_COMPENSATOR, shuntCompensator.getType());
-        assertEquals("shuntName", shuntCompensator.getOptionalName().orElse(null));
         assertEquals("shuntName", shuntCompensator.getName());
         assertEquals(SHUNT, shuntCompensator.getId());
         assertEquals(5.0, shuntCompensator.getbPerSection(), 0.0);

diff --git a/iidm/iidm-xml-converter/src/test/resources/V1_2/LccRoundTripRef.xml b/iidm/iidm-xml-converter/src/test/resources/V1_2/LccRoundTripRef.xml
@@ -7,7 +7,7 @@
             </iidm:busBreakerTopology>
             <iidm:shunt id="C1_Filter1" name="Filter 1" bPerSection="1.0E-5" maximumSectionCount="1" currentSectionCount="1" voltageRegulatorOn="false" bus="B1" connectableBus="B1" q="25.0"/>
             <iidm:shunt id="C1_Filter2" name="Filter 2" bPerSection="2.0E-5" maximumSectionCount="1" currentSectionCount="0" voltageRegulatorOn="false" connectableBus="B1" q="25.0"/>
-            <iidm:lccConverterStation id="C1" name="Converter1" lossFactor="1.1" powerFactor="0.5" bus="B1" connectableBus="B1" p="100.0" q="50.0"/>
+            <iidm:lccConverterStation id="C1" name="Converter1" lossFactor="0.011" powerFactor="0.5" bus="B1" connectableBus="B1" p="100.0" q="50.0"/>
         </iidm:voltageLevel>
     </iidm:substation>
     <iidm:substation id="S2" country="FR">
@@ -23,7 +23,7 @@
             </iidm:nodeBreakerTopology>
             <iidm:shunt id="C2_Filter1" name="Filter 3" bPerSection="3.0E-5" maximumSectionCount="1" currentSectionCount="1" voltageRegulatorOn="false" node="4" q="12.5"/>
             <iidm:shunt id="C2_Filter2" name="Filter 4" bPerSection="4.0E-5" maximumSectionCount="1" currentSectionCount="1" voltageRegulatorOn="false" node="6" q="12.5"/>
-            <iidm:lccConverterStation id="C2" name="Converter2" lossFactor="1.1" powerFactor="0.6" node="2" p="75.0" q="25.0"/>
+            <iidm:lccConverterStation id="C2" name="Converter2" lossFactor="0.011" powerFactor="0.6" node="2" p="75.0" q="25.0"/>
         </iidm:voltageLevel>
     </iidm:substation>
     <iidm:hvdcLine id="L" name="HVDC" r="1.0" nominalV="400.0" convertersMode="SIDE_1_INVERTER_SIDE_2_RECTIFIER" activePowerSetpoint="280.0" maxP="300.0" converterStation1="C1" converterStation2="C2"/>