Fix deprecated API usage (#707)

Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@gmail.com>
powsybl · Jan 25, 2023 · 912bf92 · 912bf92
1 parent 55b621e
commit 912bf92
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 33 deletions.
diff --git a/src/main/java/com/powsybl/openloadflow/DefaultOuterLoopConfig.java b/src/main/java/com/powsybl/openloadflow/DefaultOuterLoopConfig.java
@@ -32,7 +32,7 @@ public List<OuterLoop> configure(LoadFlowParameters parameters, OpenLoadFlowPara
         if (parametersExt.isSvcVoltageMonitoring()) {
             outerLoops.add(new MonitoringVoltageOuterLoop());
         }
-        if (!parameters.isNoGeneratorReactiveLimits()) {
+        if (parameters.isUseReactiveLimits()) {
             outerLoops.add(new ReactiveLimitsOuterLoop());
         }
         if (parameters.isTransformerVoltageControlOn()) {

diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java
@@ -121,7 +121,7 @@ private LoadFlowResult runAc(Network network, LoadFlowParameters parameters, Rep
         for (AcLoadFlowResult result : results) {
             // update network state
             if (result.getNewtonRaphsonStatus() == NewtonRaphsonStatus.CONVERGED) {
-                var updateParameters = new LfNetworkStateUpdateParameters(!parameters.isNoGeneratorReactiveLimits(),
+                var updateParameters = new LfNetworkStateUpdateParameters(parameters.isUseReactiveLimits(),
                                                                           parameters.isWriteSlackBus(),
                                                                           parameters.isPhaseShifterRegulationOn(),
                                                                           parameters.isTransformerVoltageControlOn(),

diff --git a/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java
@@ -227,7 +227,7 @@ public void analyse(Network network, List<PropagatedContingency> contingencies,
                 .setReactivePowerRemoteControl(lfParametersExt.hasReactivePowerRemoteControl())
                 .setDc(lfParameters.isDc())
                 .setShuntVoltageControl(lfParameters.isShuntCompensatorVoltageControlOn())
-                .setReactiveLimits(!lfParameters.isNoGeneratorReactiveLimits())
+                .setReactiveLimits(lfParameters.isUseReactiveLimits())
                 .setHvdcAcEmulation(lfParameters.isHvdcAcEmulation())
                 .setMinPlausibleTargetVoltage(lfParametersExt.getMinPlausibleTargetVoltage())
                 .setMaxPlausibleTargetVoltage(lfParametersExt.getMaxPlausibleTargetVoltage());

diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java
@@ -85,7 +85,7 @@ void testGetExtendedVoltageInitializer() {
     @Test
     void specificParametersTest() {
         OpenLoadFlowProvider provider = new OpenLoadFlowProvider();
-        assertEquals(25, provider.getSpecificParametersNames().size());
+        assertEquals(25, provider.getSpecificParameters().size());
         LoadFlowParameters parameters = new LoadFlowParameters();
 
         provider.loadSpecificParameters(Collections.emptyMap())

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlow3wtTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlow3wtTest.java
@@ -44,7 +44,7 @@ void setUp() {
         bus3 = network.getBusBreakerView().getBus("b3");
         twt = network.getThreeWindingsTransformer("3wt");
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowBoundaryTest.java
@@ -48,7 +48,7 @@ void setUp() {
         g1 = network.getGenerator("g1");
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         parametersExt = OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);
@@ -90,7 +90,7 @@ void testWithVoltageRegulationOn() {
         assertReactivePowerEquals(-0.202, dl1.getTerminal());
 
         parameters.setDistributedSlack(true)
-                  .setNoGeneratorReactiveLimits(false);
+                  .setUseReactiveLimits(true);
         LoadFlowResult result2 = loadFlowRunner.run(network, parameters);
         assertTrue(result2.isOk());
 
@@ -105,7 +105,7 @@ void testWithVoltageRegulationOn() {
     @Test
     void testWithXnode() {
         Network network = BoundaryFactory.createWithXnode();
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         parameters.setDistributedSlack(true);
         LoadFlowResult result = loadFlowRunner.run(network, parameters);
         assertTrue(result.isOk());
@@ -119,7 +119,7 @@ void testWithXnode() {
     @Test
     void testWithTieLine() {
         Network network = BoundaryFactory.createWithTieLine();
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         parameters.setDistributedSlack(true);
         LoadFlowResult result = loadFlowRunner.run(network, parameters);
         assertTrue(result.isOk());

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java
@@ -63,7 +63,7 @@ void setUp() {
         vlhv2 = network.getVoltageLevel("VLHV2");
 
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         parametersExt = OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.FIRST);
@@ -299,14 +299,14 @@ void noGeneratorBecauseOfReactiveRangeTest() {
                 .setMaxQ(0)
                 .add();
 
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         LoadFlowResult result = loadFlowRunner.run(network, parameters);
         assertFalse(result.isOk());
         assertEquals(1, result.getComponentResults().size());
         assertEquals(LoadFlowResult.ComponentResult.Status.FAILED, result.getComponentResults().get(0).getStatus());
 
         // but if we do not take into account reactive limits in parameters, calculation should be ok
-        parameters.setNoGeneratorReactiveLimits(true);
+        parameters.setUseReactiveLimits(false);
         result = loadFlowRunner.run(network, parameters);
         assertTrue(result.isOk());
         assertEquals(1, result.getComponentResults().size());
@@ -421,7 +421,7 @@ void testGeneratorReactiveLimits() {
                 .setVoltageRegulatorOn(true).setTargetV(24.5D)
                 .setTargetP(607.0D).setTargetQ(301.0D).add();
         network.getGenerator("GEN1").newMinMaxReactiveLimits().setMinQ(0).setMaxQ(160).add();
-        LoadFlowParameters parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(false)
+        LoadFlowParameters parameters = new LoadFlowParameters().setUseReactiveLimits(true)
                 .setDistributedSlack(false)
                 .setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES);
         loadFlowRunner.run(network, parameters);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowLccTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowLccTest.java
@@ -26,7 +26,7 @@ class AcLoadFlowLccTest {
     void test() {
         Network network = HvdcNetworkFactory.createLcc();
         LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        LoadFlowParameters parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        LoadFlowParameters parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                                              .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowPhaseShifterTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowPhaseShifterTest.java
@@ -46,7 +46,7 @@ class AcLoadFlowPhaseShifterTest {
     void setUp() {
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.FIRST);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowShuntTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowShuntTest.java
@@ -58,7 +58,7 @@ void setUp() {
         l2 = network.getLine("l2");
         shunt = network.getShuntCompensator("SHUNT");
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(false)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(true)
                 .setDistributedSlack(true);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowSvcTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowSvcTest.java
@@ -114,7 +114,7 @@ private Network createNetwork() {
     void setUp() {
         network = createNetwork();
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(false)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(true)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowTwoBusNetworkTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowTwoBusNetworkTest.java
@@ -46,7 +46,7 @@ void setUp() {
         line1 = network.getLine("l12");
 
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.FIRST);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowVscTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowVscTest.java
@@ -28,7 +28,7 @@ void test() {
         Network network = HvdcNetworkFactory.createVsc();
         LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         LoadFlowParameters parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);
@@ -75,7 +75,7 @@ void testRegulatingTerminal() {
         vscConverterStation.setVoltageRegulatorOn(true); //FIXME
 
         LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        LoadFlowParameters parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        LoadFlowParameters parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);
@@ -96,7 +96,7 @@ void testRegulatingTerminal2() {
 
         LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         LoadFlowParameters parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowWithCachingTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowWithCachingTest.java
@@ -211,7 +211,7 @@ void testShunt2() {
 
         assertTrue(NetworkCache.INSTANCE.findEntry(network).isEmpty());
         loadFlowRunner.run(network, parameters); // Run a first LF before changing a parameter.
-        parameters.setSimulShunt(true);
+        parameters.setShuntCompensatorVoltageControlOn(true);
         assertNotNull(NetworkCache.INSTANCE.findEntry(network).orElseThrow().getContexts());
         loadFlowRunner.run(network, parameters);
         assertActivePowerEquals(0, shunt.getTerminal());
@@ -229,7 +229,7 @@ void testShunt3() {
 
         assertTrue(NetworkCache.INSTANCE.findEntry(network).isEmpty());
         loadFlowRunner.run(network, parameters);
-        parameters.setSimulShunt(true);
+        parameters.setShuntCompensatorVoltageControlOn(true);
         assertNotNull(NetworkCache.INSTANCE.findEntry(network).orElseThrow().getContexts());
         loadFlowRunner.run(network, parameters);
         assertActivePowerEquals(0, shunt.getTerminal());

diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcloadFlowReactiveLimitsTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcloadFlowReactiveLimitsTest.java
@@ -108,7 +108,7 @@ private void createNetwork() {
     void setUp() {
         createNetwork();
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(false)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(true)
                 .setDistributedSlack(false);
     }
 
@@ -126,14 +126,14 @@ void diagramTest() {
 
     @Test
     void test() {
-        parameters.setNoGeneratorReactiveLimits(true);
+        parameters.setUseReactiveLimits(false);
         LoadFlowResult result = loadFlowRunner.run(network, parameters);
         assertTrue(result.isOk());
         assertReactivePowerEquals(-109.228, gen.getTerminal());
         assertReactivePowerEquals(-152.265, gen2.getTerminal());
         assertReactivePowerEquals(-199.998, nhv2Nload.getTerminal2());
 
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         result = loadFlowRunner.run(network, parameters);
         assertTrue(result.isOk());
         assertReactivePowerEquals(-164.315, gen.getTerminal());

diff --git a/src/test/java/com/powsybl/openloadflow/ac/DistributedSlackOnGenerationTest.java b/src/test/java/com/powsybl/openloadflow/ac/DistributedSlackOnGenerationTest.java
@@ -49,7 +49,7 @@ void setUp() {
         g3 = network.getGenerator("g3");
         g4 = network.getGenerator("g4");
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                 .setDistributedSlack(true);
         OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED)

diff --git a/src/test/java/com/powsybl/openloadflow/ac/GeneratorRemoteControlTest.java b/src/test/java/com/powsybl/openloadflow/ac/GeneratorRemoteControlTest.java
@@ -61,7 +61,7 @@ void setUp() {
         tr3 = network.getTwoWindingsTransformer("tr3");
 
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
-        parameters = new LoadFlowParameters().setNoGeneratorReactiveLimits(true)
+        parameters = new LoadFlowParameters().setUseReactiveLimits(false)
                   .setDistributedSlack(false);
         parametersExt = OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.MOST_MESHED)
@@ -236,7 +236,7 @@ void testWith2Generators() {
 
     @Test
     void testWith3GeneratorsAndFirstGeneratorToLimit() {
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         g1.newMinMaxReactiveLimits()
                 .setMinQ(-50)
                 .setMaxQ(50)
@@ -568,7 +568,7 @@ void testRemoteReactivePowerControl2() {
 
     @Test
     void testReactiveRangeCheckMode() {
-        parameters.setNoGeneratorReactiveLimits(false);
+        parameters.setUseReactiveLimits(true);
         Network network = EurostagTutorialExample1Factory.create();
         VoltageLevel vlload = network.getVoltageLevel("VLLOAD");
         Bus nload = vlload.getBusBreakerView().getBus("NLOAD");

diff --git a/src/test/java/com/powsybl/openloadflow/ac/IllConditionedCaseTest.java b/src/test/java/com/powsybl/openloadflow/ac/IllConditionedCaseTest.java
@@ -47,7 +47,7 @@ void setUp() {
 
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         parametersExt = OpenLoadFlowParameters.create(parameters)
                 .setSlackBusSelectionMode(SlackBusSelectionMode.FIRST);

diff --git a/src/test/java/com/powsybl/openloadflow/ac/MultipleSlackBusesTest.java b/src/test/java/com/powsybl/openloadflow/ac/MultipleSlackBusesTest.java
@@ -40,7 +40,7 @@ void setUp() {
         network = EurostagFactory.fix(EurostagTutorialExample1Factory.create());
         loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
         parameters = new LoadFlowParameters()
-                .setNoGeneratorReactiveLimits(true)
+                .setUseReactiveLimits(false)
                 .setDistributedSlack(false);
         parametersExt = OpenLoadFlowParameters.create(parameters)
                 .setMaxSlackBusCount(2);

diff --git a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java
@@ -1269,7 +1269,7 @@ void testSaWithGeneratorContingency() {
 
         LoadFlowParameters parameters = new LoadFlowParameters();
         parameters.setBalanceType(LoadFlowParameters.BalanceType.PROPORTIONAL_TO_GENERATION_P_MAX);
-        parameters.setNoGeneratorReactiveLimits(true);
+        parameters.setUseReactiveLimits(false);
 
         List<Contingency> contingencies = List.of(new Contingency("g1", new GeneratorContingency("g1")),
                 new Contingency("l34", new BranchContingency("l34")),