Merge branch 'master' into actions_xsd

itesla · Dec 14, 2016 · 19fb775 · 19fb775
2 parents 43b290b + 46fbd41
commit 19fb775
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplication.java b/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplication.java
@@ -9,7 +9,7 @@
 
 import com.csvreader.CsvWriter;
 import com.google.common.collect.Sets;
-
+import eu.itesla_project.cases.CaseRepository;
 import eu.itesla_project.commons.Version;
 import eu.itesla_project.computation.ComputationManager;
 import eu.itesla_project.computation.ComputationResourcesStatus;
@@ -18,33 +18,26 @@
 import eu.itesla_project.loadflow.api.LoadFlowFactory;
 import eu.itesla_project.mcla.ForecastErrorsDataStorageImpl;
 import eu.itesla_project.merge.MergeOptimizerFactory;
-import eu.itesla_project.cases.CaseRepository;
 import eu.itesla_project.modules.contingencies.ContingenciesAndActionsDatabaseClient;
 import eu.itesla_project.modules.histo.HistoDbClient;
 import eu.itesla_project.modules.mcla.ForecastErrorsDataStorage;
 import eu.itesla_project.modules.mcla.MontecarloSamplerFactory;
-import eu.itesla_project.modules.online.OnlineConfig;
-import eu.itesla_project.modules.online.OnlineDb;
-import eu.itesla_project.modules.online.OnlineWorkflowParameters;
-import eu.itesla_project.modules.online.RulesFacadeFactory;
-import eu.itesla_project.modules.online.TimeHorizon;
+import eu.itesla_project.modules.online.*;
 import eu.itesla_project.modules.optimizer.CorrectiveControlOptimizerFactory;
 import eu.itesla_project.modules.rules.RulesDbClient;
-import eu.itesla_project.security.LimitViolation;
-import eu.itesla_project.security.Security;
-import eu.itesla_project.simulation.*;
 import eu.itesla_project.modules.wca.UncertaintiesAnalyserFactory;
 import eu.itesla_project.modules.wca.WCAFactory;
 import eu.itesla_project.offline.forecast_errors.ForecastErrorsAnalysis;
 import eu.itesla_project.offline.forecast_errors.ForecastErrorsAnalysisConfig;
 import eu.itesla_project.offline.forecast_errors.ForecastErrorsAnalysisParameters;
+import eu.itesla_project.security.LimitViolation;
+import eu.itesla_project.security.Security;
+import eu.itesla_project.simulation.SimulatorFactory;
 import gnu.trove.list.array.TIntArrayList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.management.*;
-
 import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -247,29 +240,20 @@ public void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowPar
             workflow = startParams.getOnlineWorkflowFactoryClass().newInstance().create(computationManager, cadbClient, histoDbClient, rulesDb, wcaFactory, loadFlowFactory, feDataStorage,
                     onlineDb, uncertaintiesAnalyserFactory, correctiveControlOptimizerFactory, simulatorFactory, caseRepository,
                     montecarloSamplerFactory, mergeOptimizerFactory, rulesFacadeFactory, onlineParams, startParams);
-        } catch (InstantiationException | IllegalAccessException e1) {
-            e1.printStackTrace();
-            throw new RuntimeException(e1.getMessage());
-        }
-
-        workflow.addOnlineApplicationListener(this);
+            workflow.addOnlineApplicationListener(this);
 
-        for (OnlineApplicationListener l : listeners)
-            workflow.addOnlineApplicationListener(l);
+            for (OnlineApplicationListener l : listeners)
+                workflow.addOnlineApplicationListener(l);
 
 
-        try {
             if (startParams.getOnlineApplicationListenerFactoryClass() != null) {
                 OnlineApplicationListener listener = startParams.getOnlineApplicationListenerFactoryClass().newInstance().create();
                 workflow.addOnlineApplicationListener(listener);
             }
-        } catch (InstantiationException | IllegalAccessException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-        try {
+
             workflow.start(oCtx);
         } catch (Exception e) {
+            LOGGER.error(e.toString(), e);
             throw new RuntimeException(e);
         } finally {
             workflowLock.unlock();

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java b/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java
@@ -114,7 +114,6 @@ public class OnlineDbMVStore implements OnlineDb {
     private static final String STORED_PC_VIOLATIONS_MAP_PREFIX = "pcviolations_";
     private static final String STORED_PC_LOADFLOW_CONTINGENCIES_MAP_NAME = "storedPCLoadflowContingencies";
     private static final String STORED_PC_LOADFLOW_STATES_MAP_SUFFIX = "_pcloadflowstates";
-    ;
     private static final String STORED_PC_LOADFLOW_STATES_MAP_NAME = "storedPCLoadflowStates";
     private static final String STORED_PC_LOADFLOW_CONTINGENCIES_MAP_SUFFIX = "_pcloadflowcontigencies";
     private static final String STORED_WCA_RULES_RESULTS_MAP_NAME = "wfWcaRulesResults";
@@ -817,8 +816,10 @@ public void storeWorkflowParameters(String workflowId, OnlineWorkflowParameters
         storedParametersMap.put(STORED_PARAMETERS_HANDLE_VIOLATIONS_KEY, Boolean.toString(parameters.isHandleViolationsInN()));
         // store merge constraint margin
         storedParametersMap.put(STORED_PARAMETERS_CONSTRAINT_MARGIN_KEY, Float.toString(parameters.getConstraintMargin()));
-        // store case file name (null if it was not specified)
-        storedParametersMap.put(STORED_PARAMETERS_CASE_FILE_KEY, parameters.getCaseFile());
+        // store case file name
+        if (parameters.getCaseFile() != null) {
+            storedParametersMap.put(STORED_PARAMETERS_CASE_FILE_KEY, parameters.getCaseFile());
+        }
 
         wfMVStore.commit();
     }

diff --git a/wca-integration/src/main/java/eu/itesla_project/wca/WCAImpl.java b/wca-integration/src/main/java/eu/itesla_project/wca/WCAImpl.java
@@ -103,7 +103,7 @@ public class WCAImpl implements WCA, WCAConstants, AmplConstants {
     private static final int DETAILS_LEVEL_NORMAL = 2;
     private static final int DETAILS_LEVEL_DEBUG = 4;
 
-    private static final Pattern CLUSTER_INDEX_PATTERN = Pattern.compile(" WCA Result : contingency_index (\\d*) contingency_cluster_index (\\d*) curative_action_index (\\d*) ");
+    private static final Pattern CLUSTER_INDEX_PATTERN = Pattern.compile(" WCA Result : contingency_index (\\d*) contingency_cluster_index (\\d*) curative_action_index (\\d*)");
     private static final Pattern DOMAINS_RESULTS_PATTERN = Pattern.compile(" WCA Result : basic_violation (\\d*) rule_violation (\\d*)");
 
     private final Network network;