feat(balances-adjustment): use current thread for loadflow (#131)

Signed-off-by: Joris Mancini <[email protected]>

Author: TheMaskedTurtle

src/main/java/org/gridsuite/modification/modifications/BalancesAdjustmentModification.java

@@ -10,7 +10,7 @@
 import com.powsybl.balances_adjustment.util.CountryAreaFactory;
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.commons.report.TypedValue;
-import com.powsybl.computation.ComputationManager;
+import com.powsybl.computation.local.LocalComputationManager;
 import com.powsybl.iidm.modification.scalable.ProportionalScalable;
 import com.powsybl.iidm.modification.scalable.Scalable;
 import com.powsybl.iidm.modification.scalable.ScalingParameters;
@@ -19,6 +19,7 @@
 import com.powsybl.loadflow.LoadFlow;
 import com.powsybl.loadflow.LoadFlowParameters;
 import com.powsybl.openloadflow.OpenLoadFlowParameters;
+import lombok.SneakyThrows;
 import org.gridsuite.modification.IFilterService;
 import org.gridsuite.modification.ILoadFlowService;
 import org.gridsuite.modification.dto.*;
@@ -128,19 +129,16 @@ private void overrideBalanceComputationParameters(BalanceComputationParameters p
                 .setSlackDistributionFailureBehavior(OpenLoadFlowParameters.SlackDistributionFailureBehavior.FAIL);
     }
 
+    @SneakyThrows
     @Override
-    public void apply(Network network,
-                      NamingStrategy namingStrategy,
-                      boolean throwException,
-                      ComputationManager computationManager,
-                      ReportNode reportNode) {
+    public void apply(Network network, NamingStrategy namingStrategy, ReportNode reportNode) {
 
         BalanceComputationParameters parameters = createBalanceComputationParameters(reportNode);
 
         List<BalanceComputationArea> areas = createBalanceComputationAreas(network, reportNode);
 
         BalanceComputation balanceComputation = new BalanceComputationFactoryImpl()
-            .create(areas, LoadFlow.find(), computationManager);
+            .create(areas, LoadFlow.find(), new LocalComputationManager(Runnable::run));
 
         balanceComputation
             .run(network, network.getVariantManager().getWorkingVariantId(), parameters, reportNode)

src/test/java/org/gridsuite/modification/modifications/BalancesAdjustmentModificationTest.java

@@ -8,6 +8,7 @@
 package org.gridsuite.modification.modifications;
 
 import com.powsybl.commons.report.ReportNode;
+import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
 import com.powsybl.iidm.network.Country;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.loadflow.LoadFlowParameters;
@@ -102,6 +103,13 @@ protected void checkModification() {
         // No checks implemented for this modification
     }
 
+    @Override
+    @Test
+    public void testApply() throws Exception {
+        buildModification().toModification().apply(getNetwork(), new DefaultNamingStrategy(), ReportNode.NO_OP);
+        assertAfterNetworkModificationApplication();
+    }
+
     @Test
     void testApplyWithLoadFlow() {
         var infos = BalancesAdjustmentModificationInfos.builder()
@@ -149,7 +157,7 @@ void testApplyWithLoadFlow() {
                         .build());
         BalancesAdjustmentModification modification = (BalancesAdjustmentModification) infos.toModification();
         modification.initApplicationContext(null, loadFlowService);
-        modification.apply(getNetwork(), false);
+        modification.apply(getNetwork(), new DefaultNamingStrategy(), ReportNode.NO_OP);
 
         assertEquals(-58d, getNetwork().getGenerator("GH1").getTerminal().getP(), PRECISION);
         assertEquals(-36d, getNetwork().getGenerator("GH2").getTerminal().getP(), PRECISION);
@@ -194,7 +202,7 @@ void testLoadFlowParametersNotFound() {
                 .build();
 
         // Should not throw exception but use default parameters and complete successfully
-        assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
+        assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));
 
         // Verify that the appropriate report message was generated
         TestUtils.assertLogMessage(
@@ -237,7 +245,7 @@ void testLoadFlowProviderNotSpecified() {
                 .build();
 
         // Should not throw exception but use default parameters and complete successfully
-        assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
+        assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));
 
         // Verify that the appropriate report message was generated
         TestUtils.assertLogMessageWithoutRank(
@@ -273,7 +281,7 @@ void testLoadFlowParametersIdNull() {
                 .build();
 
         // Should not throw exception but use default parameters and complete successfully
-        assertDoesNotThrow(() -> modification.apply(network, false, reportNode));
+        assertDoesNotThrow(() -> modification.apply(network, new DefaultNamingStrategy(), reportNode));
 
         // Verify that the appropriate report message was generated
         TestUtils.assertLogMessageWithoutRank(