Fix rebase

Signed-off-by: p-arvy <pierre.arvy@artelys.com>

Author: p-arvy

src/main/java/com/powsybl/openloadflow/dc/fastdc/ConnectivityBreakAnalysis.java

@@ -48,8 +48,6 @@ public static final class ConnectivityAnalysisResult {
 
         private final Set<LfBus> slackConnectedComponent; // buses of connected component where the slack is
 
-        private final DisabledElements disabledElements;
-
         private final int createdSynchronousComponents;
 
         private final DisabledElements disabledElements;
@@ -104,9 +102,11 @@ public record ConnectivityBreakAnalysisResults(List<PropagatedContingency> nonBr
                                                    List<ConnectivityAnalysisResult> connectivityAnalysisResults,
                                                    DenseMatrix contingenciesStates,
                                                    Map<String, ComputedContingencyElement> contingencyElementByBranch) {
+
     }
 
     private ConnectivityBreakAnalysis() {
+
     }
 
     private static void detectPotentialConnectivityBreak(LfNetwork lfNetwork, DenseMatrix states, List<PropagatedContingency> contingencies,

src/main/java/com/powsybl/openloadflow/sa/WoodburyDcSecurityAnalysis.java

@@ -425,8 +425,6 @@ protected SecurityAnalysisResult runSimulations(LfNetwork lfNetwork, List<Propag
                     connectivityAnalysisResult, connectivityBreakAnalysisResults.contingencyElementByBranch(), operatorStrategyLfActions, tapPositionChangeElementsByBranchId, actionsStates, reportNode);
             ToStates toStates = new ToStates(toPostContingencyStates, toPostContingencyAndOperatorStrategyStates);
 
-            ToStates toStates = new ToStates(toPostContingencyStates, toPostContingencyAndOperatorStrategyStates);
-
             LOGGER.info("Processing post contingency results for contingencies with no connectivity break");
             connectivityBreakAnalysisResults.nonBreakingConnectivityContingencies().forEach(nonBreakingConnectivityContingency -> {
                 ConnectivityBreakAnalysis.ConnectivityAnalysisResult connectivityAnalysisResult = new ConnectivityBreakAnalysis.ConnectivityAnalysisResult(nonBreakingConnectivityContingency, lfNetwork);

src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java

@@ -4237,67 +4237,6 @@ void testDcSaHvdcLineWithoutPowerAfterContingency(boolean dcFastMode) {
         assertEquals(network.getLine("l23").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l23").getP1(), LoadFlowAssert.DELTA_POWER);
     }
 
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void testDcSaHvdcLineWithPowerAfterContingency(boolean dcFastMode) {
-        Network network = HvdcNetworkFactory.createNetworkWithGenerators2();
-
-        SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters();
-        securityAnalysisParameters.getLoadFlowParameters().setDc(true);
-        OpenSecurityAnalysisParameters openSecurityAnalysisParameters = new OpenSecurityAnalysisParameters();
-        openSecurityAnalysisParameters.setDcFastMode(dcFastMode);
-        securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, openSecurityAnalysisParameters);
-
-        List<StateMonitor> monitors = createAllBranchesMonitors(network);
-        List<Contingency> contingencies = List.of(new Contingency("l25", List.of(new LineContingency("l25"))));
-        SecurityAnalysisResult result = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters);
-
-        // apply contingency by hand
-        network.getLine("l25").disconnect();
-        // run load flow to compare results
-        loadFlowRunner.run(network, securityAnalysisParameters.getLoadFlowParameters());
-
-        // post-contingency tests
-        PostContingencyResult postContingencyResult = getPostContingencyResult(result, "l25");
-        assertEquals(1, postContingencyResult.getConnectivityResult().getCreatedSynchronousComponentCount());
-        assertEquals(3, postContingencyResult.getNetworkResult().getBranchResults().size()); // only branches in main synchronous component
-        assertEquals(network.getLine("l12").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l12").getP1(), LoadFlowAssert.DELTA_POWER);
-        assertEquals(network.getLine("l13").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l13").getP1(), LoadFlowAssert.DELTA_POWER);
-        assertEquals(network.getLine("l23").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l23").getP1(), LoadFlowAssert.DELTA_POWER);
-    }
-
-    @ParameterizedTest
-    @ValueSource(booleans = {false, true})
-    void testDcSaHvdcLineWithoutPowerAfterContingency(boolean dcFastMode) {
-        Network network = HvdcNetworkFactory.createWithHvdcInAcEmulation();
-
-        SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters();
-        securityAnalysisParameters.getLoadFlowParameters().setDc(true);
-        OpenSecurityAnalysisParameters openSecurityAnalysisParameters = new OpenSecurityAnalysisParameters();
-        openSecurityAnalysisParameters.setDcFastMode(dcFastMode);
-        securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, openSecurityAnalysisParameters);
-
-        List<StateMonitor> monitors = createAllBranchesMonitors(network);
-        List<Contingency> contingencies = List.of(new Contingency("l25+l45+l46",
-                List.of(new LineContingency("l25"), new LineContingency("l45"), new LineContingency("l46"))));
-        SecurityAnalysisResult result = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters);
-
-        // apply contingency by hand
-        network.getLine("l25").disconnect();
-        network.getLine("l45").disconnect();
-        network.getLine("l46").disconnect();
-        // run load flow to compare results
-        loadFlowRunner.run(network, securityAnalysisParameters.getLoadFlowParameters());
-
-        // post-contingency tests
-        PostContingencyResult postContingencyResult = getPostContingencyResult(result, "l25+l45+l46");
-        assertEquals(2, postContingencyResult.getConnectivityResult().getCreatedSynchronousComponentCount());
-        assertEquals(3, postContingencyResult.getNetworkResult().getBranchResults().size()); // only branches in main synchronous component
-        assertEquals(network.getLine("l12").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l12").getP1(), LoadFlowAssert.DELTA_POWER);
-        assertEquals(network.getLine("l13").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l13").getP1(), LoadFlowAssert.DELTA_POWER);
-        assertEquals(network.getLine("l23").getTerminal1().getP(), postContingencyResult.getNetworkResult().getBranchResult("l23").getP1(), LoadFlowAssert.DELTA_POWER);
-    }
-
     @ParameterizedTest
     @ValueSource(booleans = {false, true})
     void testDcSaHvdcLineInAcEmulationContingency(boolean dcFastMode) {