Adapt to powsybl-core 5.1.0-RC1 (#670)

Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com> Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com> Signed-off-by: Bertrand Rix <bertrand.rix@artelys.com>
powsybl · Jan 17, 2023 · dad34e9 · dad34e9
1 parent 358fef1
commit dad34e9
Show file tree

Hide file tree

Showing 18 changed files with 1,042 additions and 1,043 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
         <slf4jtoys.version>1.6.3</slf4jtoys.version>
 
-        <powsybl-core.version>5.0.0</powsybl-core.version>
+        <powsybl-core.version>5.1.0-RC1</powsybl-core.version>
     </properties>
 
     <build>
@@ -176,8 +176,7 @@
 
         <dependency>
             <groupId>com.powsybl</groupId>
-            <artifactId>powsybl-commons</artifactId>
-            <type>test-jar</type>
+            <artifactId>powsybl-commons-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java
@@ -631,7 +631,7 @@ public static void logAc(LoadFlowParameters parameters, OpenLoadFlowParameters p
         LOGGER.info("Voltage initialization mode override: {}", parametersExt.getVoltageInitModeOverride());
         LOGGER.info("Distributed slack: {}", parameters.isDistributedSlack());
         LOGGER.info("Balance type: {}", parameters.getBalanceType());
-        LOGGER.info("Reactive limits: {}", !parameters.isNoGeneratorReactiveLimits());
+        LOGGER.info("Reactive limits: {}", parameters.isUseReactiveLimits());
         LOGGER.info("Voltage remote control: {}", parametersExt.hasVoltageRemoteControl());
         LOGGER.info("Phase control: {}", parameters.isPhaseShifterRegulationOn());
         LOGGER.info("Split shunt admittance: {}", parameters.isTwtSplitShuntAdmittance());
@@ -710,7 +710,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
                 .setReactivePowerRemoteControl(parametersExt.hasReactivePowerRemoteControl())
                 .setDc(parameters.isDc())
                 .setShuntVoltageControl(parameters.isShuntCompensatorVoltageControlOn())
-                .setReactiveLimits(!parameters.isNoGeneratorReactiveLimits())
+                .setReactiveLimits(parameters.isUseReactiveLimits())
                 .setHvdcAcEmulation(parameters.isHvdcAcEmulation())
                 .setMinPlausibleTargetVoltage(parametersExt.getMinPlausibleTargetVoltage())
                 .setMaxPlausibleTargetVoltage(parametersExt.getMaxPlausibleTargetVoltage())
@@ -822,7 +822,7 @@ public static boolean equals(LoadFlowParameters parameters1, LoadFlowParameters
         Objects.requireNonNull(parameters2);
         boolean equals = parameters1.getVoltageInitMode() == parameters2.getVoltageInitMode() &&
                 parameters1.isTransformerVoltageControlOn() == parameters2.isTransformerVoltageControlOn() &&
-                parameters1.isNoGeneratorReactiveLimits() == parameters2.isNoGeneratorReactiveLimits() &&
+                parameters1.isUseReactiveLimits() == parameters2.isUseReactiveLimits() &&
                 parameters1.isPhaseShifterRegulationOn() == parameters2.isPhaseShifterRegulationOn() &&
                 parameters1.isTwtSplitShuntAdmittance() == parameters2.isTwtSplitShuntAdmittance() &&
                 parameters1.isShuntCompensatorVoltageControlOn() == parameters2.isShuntCompensatorVoltageControlOn() &&
@@ -882,7 +882,7 @@ public static LoadFlowParameters clone(LoadFlowParameters parameters) {
         Objects.requireNonNull(parameters);
         LoadFlowParameters parameters2 = new LoadFlowParameters(parameters.getVoltageInitMode(),
                                                                 parameters.isTransformerVoltageControlOn(),
-                                                                parameters.isNoGeneratorReactiveLimits(),
+                                                                parameters.isUseReactiveLimits(),
                                                                 parameters.isPhaseShifterRegulationOn(),
                                                                 parameters.isTwtSplitShuntAdmittance(),
                                                                 parameters.isShuntCompensatorVoltageControlOn(),

diff --git a/src/main/java/com/powsybl/openloadflow/network/LfAction.java b/src/main/java/com/powsybl/openloadflow/network/LfAction.java
@@ -139,7 +139,7 @@ private static Optional<LfAction> create(PhaseTapChangerTapPositionAction action
             if (branch.getPiModel() instanceof SimplePiModel) {
                 throw new UnsupportedOperationException("Phase tap changer tap connection action: only one tap in the branch {" + action.getTransformerId() + "}");
             } else {
-                var tapPositionChange = new TapPositionChange(branch, action.getValue(), action.isRelativeValue());
+                var tapPositionChange = new TapPositionChange(branch, action.getTapPosition(), action.isRelativeValue());
                 return Optional.of(new LfAction(action.getId(), null, null, tapPositionChange, null));
             }
         }

diff --git a/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java
@@ -190,7 +190,7 @@ protected static Map<String, List<OperatorStrategy>> indexOperatorStrategiesByCo
         Set<String> contingencyIds = propagatedContingencies.stream().map(propagatedContingency -> propagatedContingency.getContingency().getId()).collect(Collectors.toSet());
         Map<String, List<OperatorStrategy>> operatorStrategiesByContingencyId = new HashMap<>();
         for (OperatorStrategy operatorStrategy : operatorStrategies) {
-            if (contingencyIds.contains(operatorStrategy.getContingencyId())) {
+            if (contingencyIds.contains(operatorStrategy.getContingencyContext().getContingencyId())) {
                 // check actions IDs exists
                 for (String actionId : operatorStrategy.getActionIds()) {
                     Action action = actionsById.get(actionId);
@@ -200,11 +200,11 @@ protected static Map<String, List<OperatorStrategy>> indexOperatorStrategiesByCo
                     }
                     neededActions.add(action);
                 }
-                operatorStrategiesByContingencyId.computeIfAbsent(operatorStrategy.getContingencyId(), key -> new ArrayList<>())
+                operatorStrategiesByContingencyId.computeIfAbsent(operatorStrategy.getContingencyContext().getContingencyId(), key -> new ArrayList<>())
                         .add(operatorStrategy);
             } else {
                 throw new PowsyblException("Operator strategy '" + operatorStrategy.getId() + "' is associated to contingency '"
-                        + operatorStrategy.getContingencyId() + "' but this contingency is not present in the list");
+                        + operatorStrategy.getContingencyContext().getContingencyId() + "' but this contingency is not present in the list");
             }
         }
         return operatorStrategiesByContingencyId;
@@ -260,7 +260,7 @@ protected OperatorStrategyResult runActionSimulation(LfNetwork network, C contex
                                                          Map<String, LfAction> lfActionById, boolean createResultExtension, LfContingency contingency,
                                                          LoadFlowParameters.BalanceType balanceType) {
         LOGGER.info("Start operator strategy {} after contingency '{}' simulation on network {}", operatorStrategy.getId(),
-                operatorStrategy.getContingencyId(), network);
+                operatorStrategy.getContingencyContext().getContingencyId(), network);
 
         // get LF action for this operator strategy, as all actions have been previously checked against IIDM
         // network, an empty LF action means it is for another component (so another LF network) so we can
@@ -290,7 +290,7 @@ protected OperatorStrategyResult runActionSimulation(LfNetwork network, C contex
         stopwatch.stop();
 
         LOGGER.info("Operator strategy {} after contingency '{}' simulation done on network {} in {} ms", operatorStrategy.getId(),
-                operatorStrategy.getContingencyId(), network, stopwatch.elapsed(TimeUnit.MILLISECONDS));
+                operatorStrategy.getContingencyContext().getContingencyId(), network, stopwatch.elapsed(TimeUnit.MILLISECONDS));
 
         return new OperatorStrategyResult(operatorStrategy, status,
                 new LimitViolationsResult(postActionsViolationManager.getLimitViolations()),

diff --git a/src/main/java/com/powsybl/openloadflow/sa/AcSecurityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sa/AcSecurityAnalysis.java
@@ -35,6 +35,7 @@
 import com.powsybl.security.*;
 import com.powsybl.security.action.Action;
 import com.powsybl.security.monitor.StateMonitor;
+import com.powsybl.security.results.ConnectivityResult;
 import com.powsybl.security.results.OperatorStrategyResult;
 import com.powsybl.security.results.PostContingencyResult;
 import com.powsybl.security.results.PreContingencyResult;
@@ -250,7 +251,8 @@ private PostContingencyResult runPostContingencySimulation(LfNetwork network, Ac
                                          new LimitViolationsResult(postContingencyLimitViolationManager.getLimitViolations()),
                                          postContingencyNetworkResult.getBranchResults(),
                                          postContingencyNetworkResult.getBusResults(),
-                                         postContingencyNetworkResult.getThreeWindingsTransformerResults());
+                                         postContingencyNetworkResult.getThreeWindingsTransformerResults(),
+                                         new ConnectivityResult(0, 0, 0, 0, Collections.emptySet()));
     }
 
     private Optional<OperatorStrategyResult> runActionSimulation(LfNetwork network, AcLoadFlowContext context, OperatorStrategy operatorStrategy,

diff --git a/src/main/java/com/powsybl/openloadflow/sa/DcSecurityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sa/DcSecurityAnalysis.java
@@ -33,10 +33,7 @@
 import com.powsybl.security.detectors.DefaultLimitViolationDetector;
 import com.powsybl.security.detectors.LoadingLimitType;
 import com.powsybl.security.monitor.StateMonitor;
-import com.powsybl.security.results.BranchResult;
-import com.powsybl.security.results.OperatorStrategyResult;
-import com.powsybl.security.results.PostContingencyResult;
-import com.powsybl.security.results.PreContingencyResult;
+import com.powsybl.security.results.*;
 import com.powsybl.security.strategy.OperatorStrategy;
 import com.powsybl.sensitivity.*;
 import org.apache.commons.lang3.tuple.Pair;
@@ -202,7 +199,7 @@ private List<PostContingencyResult> createPostContingencyResults(DcSecurityAnaly
             });
 
             PostContingencyResult pcResult = new PostContingencyResult(contingency, PostContingencyComputationStatus.CONVERGED, new ArrayList<>(violations.values()),
-                    new ArrayList<>(postContingencyBranchResults.values()), Collections.emptyList(), Collections.emptyList());
+                    new ArrayList<>(postContingencyBranchResults.values()), Collections.emptyList(), Collections.emptyList(), new ConnectivityResult(0, 0, 0, 0, Collections.emptySet()));
             context.getPostContingencyResultPerContingencyId().put(contingency.getId(), pcResult);
             postContingencyResults.add(pcResult);
         }

diff --git a/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java b/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java
@@ -6,8 +6,8 @@
  */
 package com.powsybl.openloadflow.network;
 
-import com.powsybl.commons.AbstractConverterTest;
-import com.powsybl.commons.ComparisonUtils;
+import com.powsybl.commons.test.AbstractConverterTest;
+import com.powsybl.commons.test.ComparisonUtils;
 import com.powsybl.iidm.network.ComponentConstants;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.PhaseTapChanger;

diff --git a/src/test/java/com/powsybl/openloadflow/sa/LfActionTest.java b/src/test/java/com/powsybl/openloadflow/sa/LfActionTest.java
@@ -6,8 +6,8 @@
  */
 package com.powsybl.openloadflow.sa;
 
-import com.powsybl.commons.AbstractConverterTest;
 import com.powsybl.commons.reporter.Reporter;
+import com.powsybl.commons.test.AbstractConverterTest;
 import com.powsybl.contingency.Contingency;
 import com.powsybl.contingency.LoadContingency;
 import com.powsybl.iidm.network.Network;

diff --git a/src/test/java/com/powsybl/openloadflow/sa/LfContingencyTest.java b/src/test/java/com/powsybl/openloadflow/sa/LfContingencyTest.java
@@ -6,10 +6,10 @@
  */
 package com.powsybl.openloadflow.sa;
 
-import com.powsybl.commons.AbstractConverterTest;
-import com.powsybl.commons.ComparisonUtils;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.reporter.Reporter;
+import com.powsybl.commons.test.AbstractConverterTest;
+import com.powsybl.commons.test.ComparisonUtils;
 import com.powsybl.contingency.BranchContingency;
 import com.powsybl.contingency.Contingency;
 import com.powsybl.contingency.GeneratorContingency;

diff --git a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisProviderTest.java b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisProviderTest.java
@@ -6,9 +6,9 @@
  */
 package com.powsybl.openloadflow.sa;
 
-import com.powsybl.commons.AbstractConverterTest;
 import com.powsybl.commons.config.InMemoryPlatformConfig;
 import com.powsybl.commons.config.MapModuleConfig;
+import com.powsybl.commons.test.AbstractConverterTest;
 import com.powsybl.openloadflow.util.PowsyblOpenLoadFlowVersion;
 import com.powsybl.openloadflow.util.ProviderConstants;
 import com.powsybl.security.SecurityAnalysisParameters;