Merge branch 'master' into print_workflow_id

itesla · Dec 14, 2016 · 5bfd71b · 5bfd71b
2 parents e6fa542 + 46fbd41
commit 5bfd71b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplNetworkWriter.java b/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplNetworkWriter.java
@@ -1381,6 +1381,24 @@ public void write(AmplExportContext context) throws IOException {
         writeShunts(context);
         writeStaticVarCompensators(context);
         writeSubstations(context);
+        writeHVDCLines(context);
+    }
+
+    private void writeHVDCLines(AmplExportContext context) throws IOException {
+        try (TableFormatter formatter = new AmplDatTableFormatter(
+                new OutputStreamWriter(dataSource.newOutputStream("_network_hvdc", "txt", append), StandardCharsets.UTF_8),
+                getTableTitle("HVDC lines"),
+                INVALID_FLOAT_VALUE,
+                !append,
+                LOCALE)) {
+            List<String> skipped = new ArrayList<>();
+            for (HvdcLine hvdcLine : network.getHvdcLines()) {
+                throw new UnsupportedOperationException(); // FIXME
+            }
+            if (skipped.size() > 0) {
+                LOGGER.trace("Skip HVDC lines {} because not connected and not connectable", skipped);
+            }
+        }
     }
 
 }
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
@@ -245,7 +245,6 @@ public String startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowP
             for (OnlineApplicationListener l : listeners)
                 workflow.addOnlineApplicationListener(l);
 
-
             if (startParams.getOnlineApplicationListenerFactoryClass() != null) {
                 OnlineApplicationListener listener = startParams.getOnlineApplicationListenerFactoryClass().newInstance().create();
                 workflow.addOnlineApplicationListener(listener);

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*)");
+    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;