Skip to content

Commit 7422823

Browse files
committed
Debug computation mode (migration with ws-commons)
Signed-off-by: Thang PHAM <[email protected]>
1 parent f03b2ff commit 7422823

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5050
<sonar.organization>gridsuite</sonar.organization>
5151
<sonar.projectKey>org.gridsuite:security-analysis-server</sonar.projectKey>
52+
<!-- FIXME: powsybl-ws-commons modules'version is overloaded in the dependencies section to be removed at next powsybl-ws-dependencies.version upgrade -->
53+
<powsybl-ws-commons.version>1.25.0-SNAPSHOT</powsybl-ws-commons.version>
5254
</properties>
5355

5456
<build>
@@ -146,6 +148,7 @@
146148
<dependency>
147149
<groupId>com.powsybl</groupId>
148150
<artifactId>powsybl-ws-commons</artifactId>
151+
<version>${powsybl-ws-commons.version}</version>
149152
</dependency>
150153
<dependency>
151154
<groupId>org.springframework.cloud</groupId>

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
import org.springframework.stereotype.Service;
4141
import org.springframework.util.CollectionUtils;
4242

43-
import java.util.*;
43+
import java.util.ArrayList;
44+
import java.util.List;
45+
import java.util.Objects;
46+
import java.util.UUID;
4447
import java.util.concurrent.CompletableFuture;
4548
import java.util.concurrent.TimeUnit;
4649
import java.util.concurrent.atomic.AtomicReference;
@@ -129,7 +132,7 @@ protected CompletableFuture<SecurityAnalysisResult> getCompletableFuture(Securit
129132

130133
SecurityAnalysisRunParameters runParameters = new SecurityAnalysisRunParameters()
131134
.setSecurityAnalysisParameters(runContext.getParameters().securityAnalysisParameters())
132-
.setComputationManager(executionService.getComputationManager())
135+
.setComputationManager(runContext.getComputationManager())
133136
.setFilter(LimitViolationFilter.load())
134137
.setLimitReductions(limitReductions)
135138
.setReportNode(runContext.getReportNode());
@@ -173,6 +176,8 @@ private LimitReduction createLimitReduction(IdentifiableCriterion voltageLevelCr
173176

174177
@Override
175178
protected void preRun(SecurityAnalysisRunContext runContext) {
179+
super.preRun(runContext);
180+
176181
LOGGER.info("Run security analysis on contingency lists: {}", runContext.getContingencyListNames().stream().map(LogUtils::sanitizeParam).toList());
177182

178183
List<ContingencyInfos> contingencies = observer.observe("contingencies.fetch", runContext,

0 commit comments

Comments
 (0)