Merge pull request #151 from itesla/wca_domains_preventive_actions

WCA: Added preventive actions to 'domains' task input
itesla · Nov 30, 2016 · 76b8332 · 76b8332
2 parents 0156b5a + 152c057
commit 76b8332
Show file tree

Hide file tree

Showing 14 changed files with 1,204 additions and 1,105 deletions.
diff --git a/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplExportConfig.java b/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplExportConfig.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
+ * Copyright (c) 2016, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -17,20 +18,38 @@ public enum ExportScope {
         ONLY_MAIN_CC_AND_CONNECTABLE_GENERATORS_AND_SHUNTS,
         ONLY_MAIN_CC_AND_CONNECTABLE_GENERATORS_AND_SHUNTS_AND_ALL_LOADS,
     }
+
+    public enum ExportActionType {
+        CURATIVE("curative"),
+        PREVENTIVE("preventive");
+
+        private final String label;
+
+        private ExportActionType(String label) {
+            this.label = label;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+    }
 
     private ExportScope exportScope;
 
     private boolean exportXNodes;
 
+    private ExportActionType actionType;
+
     private boolean exportRatioTapChangerVoltageTarget;
 
-    public AmplExportConfig(ExportScope exportScope, boolean exportXNodes) {
-        this(exportScope, exportXNodes, false);
+    public AmplExportConfig(ExportScope exportScope, boolean exportXNodes, ExportActionType actionType) {
+        this(exportScope, exportXNodes, actionType, false);
     }
 
-    public AmplExportConfig(ExportScope exportScope, boolean exportXNodes, boolean exportRatioTapChangerVoltageTarget) {
+    public AmplExportConfig(ExportScope exportScope, boolean exportXNodes, ExportActionType actionType, boolean exportRatioTapChangerVoltageTarget) {
         this.exportScope = exportScope;
         this.exportXNodes = exportXNodes;
+        this.actionType = actionType;
         this.exportRatioTapChangerVoltageTarget = exportRatioTapChangerVoltageTarget;
     }
 
@@ -50,6 +69,10 @@ public void setExportXNodes(boolean exportXNodes) {
         this.exportXNodes = exportXNodes;
     }
 
+    public ExportActionType getActionType() {
+        return actionType;
+    }
+
     public boolean isExportRatioTapChangerVoltageTarget() {
         return exportRatioTapChangerVoltageTarget;
     }

diff --git a/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplExporter.java b/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplExporter.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
+ * Copyright (c) 2016, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -37,7 +38,7 @@ public void export(Network network, Properties parameters, DataSource dataSource
             throw new ITeslaException("network is null");
         }
         try {
-            new AmplNetworkWriter(network, dataSource, new AmplExportConfig(AmplExportConfig.ExportScope.ONLY_MAIN_CC_AND_CONNECTABLE_GENERATORS_AND_SHUNTS, false)).write();
+            new AmplNetworkWriter(network, dataSource, new AmplExportConfig(AmplExportConfig.ExportScope.ONLY_MAIN_CC_AND_CONNECTABLE_GENERATORS_AND_SHUNTS, false, AmplExportConfig.ExportActionType.CURATIVE)).write();
         } catch (IOException e) {
             throw new ITeslaException(e);
         }

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
diff --git a/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplSubset.java b/ampl-export/src/main/java/eu/itesla_project/iidm/export/ampl/AmplSubset.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2016, All partners of the iTesla project (http://www.itesla-project.eu/consortium)
+ * Copyright (c) 2016, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -26,7 +27,8 @@ public enum AmplSubset implements IntCounter {
     TEMPORARY_CURRENT_LIMIT(1),
     THREE_WINDINGS_TRANSFO(1),
     FAULT(1),
-    CURATIVE_ACTION(1);
+    CURATIVE_ACTION(1),
+    PREVENTIVE_ACTION(1);
 
     private final int initialValue;
 

diff --git a/ampl-export/src/test/java/eu/itesla_project/iidm/export/ampl/AmplNetworkWriterTest.java b/ampl-export/src/test/java/eu/itesla_project/iidm/export/ampl/AmplNetworkWriterTest.java
@@ -33,7 +33,7 @@ public void write() throws Exception {
         Network network = EurostagTutorialExample1Factory.create();
 
         MemDataSource dataSource = new MemDataSource();
-        new AmplNetworkWriter(network, dataSource, new AmplExportConfig(AmplExportConfig.ExportScope.ALL, true))
+        new AmplNetworkWriter(network, dataSource, new AmplExportConfig(AmplExportConfig.ExportScope.ALL, true, AmplExportConfig.ExportActionType.CURATIVE))
                 .write();
 
         assertEqualsToRef(dataSource, "_network_substations", "eurostag-tutorial-example1-substations.txt");