diff --git a/pom.xml b/pom.xml
index be30b3c3c8..91ddb87b65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,9 +109,9 @@
3.2.1
1.0.0
5.2.0
- 6.0.1
- 2.6.0
- 1.3.0
+ 6.0.2
+ 2.6.2
+ 1.4.0
1.7.36
2.8.1
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
index e10f944be6..993ba80524 100644
--- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
+++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
@@ -87,7 +87,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
"actionableSwitchesIds" : [ ],
"asymmetrical" : false,
"reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
- "outerLoopNames" : null
+ "outerLoopNames" : null,
+ "useActiveLimits" : true,
+ "lineSearchStateVectorScalingMaxIteration" : 10,
+ "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+ "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+ "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+ "linePerUnitMode" : "IMPEDANCE",
+ "useLoadModel" : false,
+ "dcApproximationType" : "IGNORE_R",
+ "simulateAutomationSystems" : false
}
}
},
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
index 77f4967684..907818ffbd 100644
--- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
+++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
@@ -75,7 +75,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 5000.0,
@@ -117,7 +117,16 @@
"actionableSwitchesIds" : [ ],
"asymmetrical" : false,
"reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
- "outerLoopNames" : null
+ "outerLoopNames" : null,
+ "useActiveLimits" : true,
+ "lineSearchStateVectorScalingMaxIteration" : 10,
+ "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+ "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+ "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+ "linePerUnitMode" : "IMPEDANCE",
+ "useLoadModel" : false,
+ "dcApproximationType" : "IGNORE_R",
+ "simulateAutomationSystems" : false
}
}
},
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
index 47a63c7f7a..111eddeb96 100644
--- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
+++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
@@ -87,7 +87,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
"actionableSwitchesIds" : [ ],
"asymmetrical" : false,
"reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
- "outerLoopNames" : null
+ "outerLoopNames" : null,
+ "useActiveLimits" : true,
+ "lineSearchStateVectorScalingMaxIteration" : 10,
+ "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+ "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+ "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+ "linePerUnitMode" : "IMPEDANCE",
+ "useLoadModel" : false,
+ "dcApproximationType" : "IGNORE_R",
+ "simulateAutomationSystems" : false
}
}
},
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
index 72dc1d0023..046a724915 100644
--- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
+++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
@@ -87,7 +87,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 5000.0,
@@ -129,7 +129,16 @@
"actionableSwitchesIds" : [ ],
"asymmetrical" : false,
"reactivePowerDispatchMode" : "Q_EQUAL_PROPORTION",
- "outerLoopNames" : null
+ "outerLoopNames" : null,
+ "useActiveLimits" : true,
+ "lineSearchStateVectorScalingMaxIteration" : 10,
+ "lineSearchStateVectorScalingStepFold" : 1.3333333333333333,
+ "maxVoltageChangeStateVectorScalingMaxDv" : 0.1,
+ "maxVoltageChangeStateVectorScalingMaxDphi" : 0.17453292519943295,
+ "linePerUnitMode" : "IMPEDANCE",
+ "useLoadModel" : false,
+ "dcApproximationType" : "IGNORE_R",
+ "simulateAutomationSystems" : false
}
}
},
diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
index 8063f979fd..3619c11781 100644
--- a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
+++ b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
@@ -79,7 +79,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 10000.0,
diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
index b24aa7d782..39b2aa1cd9 100644
--- a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
+++ b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
@@ -79,7 +79,7 @@
"open-load-flow-parameters" : {
"slackBusSelectionMode" : "MOST_MESHED",
"slackBusesIds" : [ ],
- "throwsExceptionInCaseOfSlackDistributionFailure" : false,
+ "slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 10000.0,
diff --git a/sensitivity-analysis/src/main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java b/sensitivity-analysis/src/main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java
index ccabb6e8cb..b851817268 100644
--- a/sensitivity-analysis/src/main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java
+++ b/sensitivity-analysis/src/main/java/com/farao_community/farao/sensitivity_analysis/SystematicSensitivityResult.java
@@ -20,6 +20,7 @@
import com.powsybl.sensitivity.*;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
@@ -64,7 +65,7 @@ public enum SensitivityComputationStatus {
private final StateResult nStateResult = new StateResult();
private final Map> postContingencyResults = new EnumMap<>(Instant.class);
- private final Map memoizedStateResultPerCnec = new HashMap<>();
+ private final Map memoizedStateResultPerCnec = new ConcurrentHashMap<>();
public SystematicSensitivityResult() {
this.status = SensitivityComputationStatus.SUCCESS;