Ampl export : extended exporter

ampl-converter/pom.xml

@@ -89,5 +89,10 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>powsybl-iidm-extensions</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplConstants.java

@@ -29,6 +29,7 @@ private AmplConstants() {
     public static final String MINP = "minP (MW)";
     public static final String MAXP = "maxP (MW)";
     public static final String V_REGUL = "v regul.";
+    public static final String V_REGUL_BUS = "v regul. bus";
     public static final String ACTIVE_POWER = "P (MW)";
     public static final String REACTIVE_POWER = "Q (MVar)";
     public static final String MIN_Q_MAX_P = "minQmaxP (MVar)";

ampl-converter/src/main/java/com/powsybl/ampl/converter/AmplNetworkWriter.java

@@ -781,7 +781,7 @@ private void writeHeaders() throws IOException {
         try (Writer writer = new OutputStreamWriter(
             dataSource.newOutputStream("_headers", "txt", append), StandardCharsets.UTF_8)
         ) {
-            columnsExporter.writeHeaderFile(writer);
+            writer.write("version " + config.getVersion().getExporterId() + "\n");
         }
     }
 }

ampl-converter/src/main/java/com/powsybl/ampl/converter/util/NetworkUtil.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2023, 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/.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+package com.powsybl.ampl.converter.util;
+
+import com.powsybl.iidm.network.Bus;
+import com.powsybl.iidm.network.Terminal;
+import com.powsybl.iidm.network.VoltageLevel;
+import com.powsybl.iidm.network.extensions.SlackTerminal;
+
+/**
+ * @author Nicolas PIERRE {@literal <nicolas.pierre at artelys.com>}
+ */
+public final class NetworkUtil {
+
+    public static boolean isSlackBus(Bus bus) {
+        VoltageLevel vl = bus.getVoltageLevel();
+        SlackTerminal slackTerminal = vl.getExtension(SlackTerminal.class);
+        if (slackTerminal != null) {
+            Terminal terminal = slackTerminal.getTerminal();
+            return terminal.getBusView().getBus() == bus;
+        }
+        return false;
+    }
+
+    private NetworkUtil() {
+    }
+}

ampl-converter/src/main/java/com/powsybl/ampl/converter/version/AmplColumnsExporter.java

@@ -12,22 +12,13 @@
 import com.powsybl.iidm.network.*;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.util.List;
 
 /**
  * @author Nicolas Pierre {@literal <nicolas.pierre at artelys.com>}
  */
 public interface AmplColumnsExporter {
 
-    String VERSION_HEADER_NAME = "version";
-
-    String getExporterId();
-
-    default void writeHeaderFile(Writer headerFileWriter) throws IOException {
-        headerFileWriter.write(VERSION_HEADER_NAME + " " + getExporterId() + "\n");
-    }
-
     List<Column> getRtcColumns();
 
     List<Column> getPtcColumns();

ampl-converter/src/main/java/com/powsybl/ampl/converter/version/AmplExportVersion.java

@@ -24,7 +24,8 @@
  */
 public enum AmplExportVersion {
 
-    V1_0("1.0", BasicAmplExporter.getFactory());
+    V1_0("1.0", BasicAmplExporter::new),
+    V1_1("1.1", ExtendedAmplExporter::new);
 
     public interface Factory {
         AmplColumnsExporter create(AmplExportConfig config, Network network, StringToIntMapper<AmplSubset> mapper,
@@ -63,6 +64,6 @@ public static AmplExportVersion fromExporterId(String exporterId) {
     }
 
     public static AmplExportVersion defaultVersion() {
-        return V1_0;
+        return V1_1;
     }
 }