Pass a ComputationManager to StateAnalyzer

itesla · Sep 5, 2017 · 26b8875 · 26b8875
1 parent b52ea55
commit 26b8875
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/online-workflow/src/main/java/eu/itesla_project/online/OnlineWorkflowImpl.java b/online-workflow/src/main/java/eu/itesla_project/online/OnlineWorkflowImpl.java
@@ -243,7 +243,7 @@ public void start(OnlineWorkflowContext oCtx) throws Exception {
         optimizer.init(new CorrectiveControlOptimizerParameters());
         if (parameters.isHandleViolationsInN() && parameters.analyseBasecase()) { // I need to analyze basecase before initializing the sampler
             new StateAnalyzer(oCtx, sampler, loadflow, rulesFacade, optimizer, stabilization, impactAnalysis, onlineDb, stateListener,
-                    constraintsModifier, parameters).call();
+                    constraintsModifier, parameters, computationManager).call();
         }
         sampler.init(new MontecarloSamplerParameters(oCtx.getTimeHorizon(), parameters.getFeAnalysisId(), parameters.getStates()));
 
@@ -254,7 +254,7 @@ public void start(OnlineWorkflowContext oCtx) throws Exception {
         List<Callable<Void>> tasks = new ArrayList<>(statesNumber);
         for (int i = 0; i < statesNumber; i++) {
             tasks.add(new StateAnalyzer(oCtx, sampler, loadflow, rulesFacade, optimizer, stabilization, impactAnalysis, onlineDb, stateListener,
-                    constraintsModifier, parameters));
+                    constraintsModifier, parameters, computationManager));
         }
         ExecutorService taskExecutor = Executors.newFixedThreadPool(startParameters.getThreads());
         taskExecutor.invokeAll(tasks);

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java b/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java
@@ -10,6 +10,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import eu.itesla_project.computation.ComputationManager;
 import eu.itesla_project.contingency.Contingency;
 import eu.itesla_project.iidm.network.Network;
 import eu.itesla_project.iidm.network.StateManager;
@@ -55,6 +56,7 @@ public class StateAnalyzer implements Callable<Void> {
     private OnlineDb onlineDb;
     private Integer stateId;
     private OnlineWorkflowParameters parameters;
+    private ComputationManager computationManager;
     private StateAnalizerListener stateListener;
     private EnumMap<OnlineTaskType, OnlineTaskStatus> status = new EnumMap<OnlineTaskType, OnlineTaskStatus>(OnlineTaskType.class);
     Map<String, Boolean> loadflowResults = new HashMap<String, Boolean>();
@@ -63,7 +65,7 @@ public class StateAnalyzer implements Callable<Void> {
     public StateAnalyzer(OnlineWorkflowContext context, MontecarloSampler sampler, LoadFlow loadFlow,
                          OnlineRulesFacade rulesFacade, CorrectiveControlOptimizer optimizer, Stabilization stabilization,
                          ImpactAnalysis impactAnalysis, OnlineDb onlineDb, StateAnalizerListener stateListener, ConstraintsModifier constraintsModifier,
-                         OnlineWorkflowParameters parameters) {
+                         OnlineWorkflowParameters parameters, ComputationManager computationManager) {
         Objects.requireNonNull(context);
         Objects.requireNonNull(sampler);
         Objects.requireNonNull(loadFlow);
@@ -430,7 +432,7 @@ private boolean computePostContingencyState(Network network, String stateId, Con
             network.getStateManager().setWorkingState(postContingencyStateId);
             // apply contingency to post contingency state
             logger.info("{}: applying contingency {} to post contingency state {}", stateId, contingency.getId(), postContingencyStateId);
-            contingency.toTask().modify(network, null);
+            contingency.toTask().modify(network, computationManager);
             try {
                 // run load flow on post contingency state
                 logger.info("{}: running load flow on post contingency state {}", stateId, postContingencyStateId);