Adapt to new sensi API

Author: geofjamg

ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json

@@ -65,7 +65,7 @@
         "sensitivity-provider" : "OpenSensitivityAnalysis",
         "sensitivity-failure-overcost" : 10000.0,
         "sensitivity-parameters" : {
-          "version" : "1.1",
+          "version" : "1.2",
           "load-flow-parameters" : {
             "version" : "1.10",
             "voltageInitMode" : "UNIFORM_VALUES",
@@ -88,7 +88,8 @@
           "flow-flow-sensitivity-value-threshold" : 0.0,
           "voltage-voltage-sensitivity-value-threshold" : 0.0,
           "flow-voltage-sensitivity-value-threshold" : 0.0,
-          "angle-flow-sensitivity-value-threshold" : 0.0
+          "angle-flow-sensitivity-value-threshold" : 0.0,
+          "operator-strategies-calculation-mode" : "NONE"
         }
       },
       "multi-threading" : {

ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json

@@ -65,7 +65,7 @@
         "sensitivity-provider" : "SENSI_PROVIDER",
         "sensitivity-failure-overcost" : 2.0,
         "sensitivity-parameters" : {
-          "version" : "1.1",
+          "version" : "1.2",
           "load-flow-parameters" : {
             "version" : "1.10",
             "voltageInitMode" : "UNIFORM_VALUES",
@@ -173,6 +173,7 @@
           "voltage-voltage-sensitivity-value-threshold" : 0.0,
           "flow-voltage-sensitivity-value-threshold" : 0.0,
           "angle-flow-sensitivity-value-threshold" : 0.0,
+          "operator-strategies-calculation-mode" : "NONE",
           "extensions" : {
             "open-sensitivity-parameters" : {
               "debugDir" : null,

ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json

@@ -50,7 +50,7 @@
         "sensitivity-provider" : "OpenLoadFlow",
         "sensitivity-failure-overcost" : 2.0,
         "sensitivity-parameters" : {
-          "version" : "1.1",
+          "version" : "1.2",
           "load-flow-parameters" : {
             "version" : "1.10",
             "voltageInitMode" : "DC_VALUES",
@@ -158,6 +158,7 @@
           "voltage-voltage-sensitivity-value-threshold" : 0.0,
           "flow-voltage-sensitivity-value-threshold" : 0.0,
           "angle-flow-sensitivity-value-threshold" : 0.0,
+          "operator-strategies-calculation-mode" : "NONE",
           "extensions" : {
             "open-sensitivity-parameters" : {
               "debugDir" : null,

ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json

@@ -57,7 +57,7 @@
         "sensitivity-provider" : "SENSI_PROVIDER",
         "sensitivity-failure-overcost" : 2.0,
         "sensitivity-parameters" : {
-          "version" : "1.1",
+          "version" : "1.2",
           "load-flow-parameters" : {
             "version" : "1.10",
             "voltageInitMode" : "UNIFORM_VALUES",
@@ -165,6 +165,7 @@
           "voltage-voltage-sensitivity-value-threshold" : 0.0,
           "flow-voltage-sensitivity-value-threshold" : 0.0,
           "angle-flow-sensitivity-value-threshold" : 0.0,
+          "operator-strategies-calculation-mode" : "NONE",
           "extensions" : {
             "open-sensitivity-parameters" : {
               "debugDir" : null,

sensitivity-analysis/src/main/java/com/powsybl/openrao/sensitivityanalysis/SystematicSensitivityAdapter.java

@@ -15,10 +15,7 @@
 import com.powsybl.openrao.data.crac.api.Instant;
 import com.powsybl.openrao.data.crac.api.State;
 import com.powsybl.openrao.data.crac.api.cnec.Cnec;
-import com.powsybl.sensitivity.SensitivityAnalysis;
-import com.powsybl.sensitivity.SensitivityAnalysisParameters;
-import com.powsybl.sensitivity.SensitivityAnalysisResult;
-import com.powsybl.sensitivity.SensitivityFactor;
+import com.powsybl.sensitivity.*;
 
 import java.util.Collections;
 import java.util.List;
@@ -139,7 +136,9 @@ static SystematicSensitivityResult runSensitivity(Network network,
                 TECHNICAL_LOGS.error(String.format("Systematic sensitivity analysis failed for state %s : %s", state.getId(), e.getMessage()));
                 SensitivityAnalysisResult failedResult = new SensitivityAnalysisResult(
                     cnecSensitivityProvider.getContingencyFactors(network, contingencyList),
-                    List.of(new SensitivityAnalysisResult.SensitivityContingencyStatus(optContingency.get().getId(), SensitivityAnalysisResult.Status.FAILURE)),
+                    List.of(new SensitivityAnalysisResult.SensitivityStateStatus(SensitivityState.postContingency(optContingency.get().getId()), SensitivityAnalysisResult.Status.FAILURE)),
+                    contingencyList.stream().map(Contingency::getId).toList(),
+                    List.of(),
                     List.of()
                 );
                 result.completeData(failedResult, state.getInstant().getOrder());

sensitivity-analysis/src/main/java/com/powsybl/openrao/sensitivityanalysis/SystematicSensitivityResult.java

@@ -108,7 +108,7 @@ public SystematicSensitivityResult completeData(SensitivityAnalysisResult result
             results.getFactors(),
             SensitivityAnalysisResult.Status.SUCCESS
         ));
-        for (SensitivityAnalysisResult.SensitivityContingencyStatus contingencyStatus : results.getContingencyStatuses()) {
+        for (SensitivityAnalysisResult.SensitivityStateStatus contingencyStatus : results.getStateStatuses()) {
             if (contingencyStatus.getStatus() == SensitivityAnalysisResult.Status.FAILURE) {
                 anyContingencyFailure = true;
             }
@@ -118,10 +118,10 @@ public SystematicSensitivityResult completeData(SensitivityAnalysisResult result
             if (contingencyStateResult.status.equals(SensitivityComputationStatus.SUCCESS)) {
                 this.status = SensitivityComputationStatus.SUCCESS;
             }
-            results.getValues(contingencyStatus.getContingencyId()).forEach(sensitivityValue ->
+            results.getValues(contingencyStatus.getState()).forEach(sensitivityValue ->
                 fillIndividualValue(sensitivityValue, contingencyStateResult, results.getFactors(), contingencyStatus.getStatus())
             );
-            postContingencyResults.get(instantOrder).put(contingencyStatus.getContingencyId(), contingencyStateResult);
+            postContingencyResults.get(instantOrder).put(contingencyStatus.getState().contingencyId(), contingencyStateResult);
         }
         if (!results.getPreContingencyValues().isEmpty()) {
             nStateResult.status = this.status;