Merge branch 'main' into remove_assertion_error

powsybl · Feb 22, 2023 · c0b199b · c0b199b
2 parents 7735cc1 + 3bd713f
commit c0b199b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/iidm/iidm-reducer/src/main/java/com/powsybl/iidm/reducer/DefaultNetworkReducer.java b/iidm/iidm-reducer/src/main/java/com/powsybl/iidm/reducer/DefaultNetworkReducer.java
@@ -239,13 +239,14 @@ private void replaceHvdcLineByLoad(HvdcLine hvdcLine, VoltageLevel vl, Terminal
     }
 
     private void replaceHvdcLineByGenerator(HvdcLine hvdcLine, VoltageLevel vl, Terminal terminal) {
+        double maxP = hvdcLine.getMaxP();
         GeneratorAdder genAdder = vl.newGenerator()
                 .setId(hvdcLine.getId())
                 .setName(hvdcLine.getOptionalName().orElse(null))
                 .setEnergySource(EnergySource.OTHER)
                 .setVoltageRegulatorOn(false)
-                .setMaxP(checkP(terminal))
-                .setMinP(0)
+                .setMaxP(maxP)
+                .setMinP(-maxP)
                 .setTargetP(checkP(terminal))
                 .setTargetQ(checkQ(terminal));
         fillNodeOrBus(genAdder, terminal);

diff --git a/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/DefaultNetworkReducerTest.java b/iidm/iidm-reducer/src/test/java/com/powsybl/iidm/reducer/DefaultNetworkReducerTest.java
@@ -276,6 +276,9 @@ void testHvdcReplacement() {
         assertEquals(1, observerVsc.getHvdcLineReplacedCount());
         assertEquals(1, observerVsc.getHvdcLineRemovedCount());
         assertEquals(1, networkVsc.getGeneratorCount());
+        Generator gen = networkVsc.getGenerator("L");
+        assertEquals(300, gen.getMaxP());
+        assertEquals(-300, gen.getMinP());
 
     }
 

diff --git a/...src/test/java/com/powsybl/security/impl/interceptors/SecurityAnalysisInterceptorMock.java b/...src/test/java/com/powsybl/security/impl/interceptors/SecurityAnalysisInterceptorMock.java
@@ -13,7 +13,7 @@
 import com.powsybl.security.results.PostContingencyResult;
 import com.powsybl.security.results.PreContingencyResult;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Mathieu Bague <mathieu.bague at rte-france.com>