TwoWindings and ThreeWindings new Cgmes conversion

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesImport.java

@@ -193,6 +193,12 @@ private Conversion.Config config(Properties p) {
                                 getFormat(),
                                 p,
                                 STORE_CGMES_CONVERSION_CONTEXT_AS_NETWORK_EXTENSION_PARAMETER,
+                                defaultValueConfig))
+                .setUseNewTransformerConversion(
+                        ConversionParameters.readBooleanParameter(
+                                getFormat(),
+                                p,
+                                TEMP_USE_NEW_TRANSFORMER_CONVERSION_PARAMETER,
                                 defaultValueConfig));
     }
 
@@ -289,6 +295,11 @@ private void copyStream(ReadOnlyDataSource from, DataSource to, String fromName,
             "Store the initial CGMES model as a network extension",
             Boolean.TRUE)
             .addAdditionalNames("storeCgmesModelAsNetworkExtension");
+    private static final Parameter TEMP_USE_NEW_TRANSFORMER_CONVERSION_PARAMETER = new Parameter(
+            "tempUseNewTransformerConversion",
+            ParameterType.BOOLEAN,
+            "Temporal parameter to configure which version of transformer conversion to use",
+            Boolean.TRUE);
 
     private static final List<Parameter> STATIC_PARAMETERS = ImmutableList.of(
             ALLOW_UNSUPPORTED_TAP_CHANGERS_PARAMETER,
@@ -299,7 +310,8 @@ private void copyStream(ReadOnlyDataSource from, DataSource to, String fromName,
             POST_PROCESSORS_PARAMETER,
             POWSYBL_TRIPLESTORE_PARAMETER,
             STORE_CGMES_CONVERSION_CONTEXT_AS_NETWORK_EXTENSION_PARAMETER,
-            STORE_CGMES_MODEL_AS_NETWORK_EXTENSION_PARAMETER);
+            STORE_CGMES_MODEL_AS_NETWORK_EXTENSION_PARAMETER,
+            TEMP_USE_NEW_TRANSFORMER_CONVERSION_PARAMETER);
 
     private final Parameter boundaryLocationParameter;
     private final Map<String, CgmesImportPostProcessor> postProcessors;

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Context.java

@@ -17,10 +17,12 @@
 import com.powsybl.cgmes.conversion.Conversion.Config;
 import com.powsybl.cgmes.conversion.elements.ACLineSegmentConversion;
 import com.powsybl.cgmes.model.CgmesModel;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.cgmes.model.PowerFlow;
 import com.powsybl.iidm.network.ConnectableType;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.Terminal;
+import com.powsybl.triplestore.api.PropertyBag;
 import com.powsybl.triplestore.api.PropertyBags;
 
 /**
@@ -48,8 +50,12 @@ public Context(CgmesModel cgmes, Config config, Network network) {
         currentLimitsMapping = new CurrentLimitsMapping(this);
         regulatingControlMapping = new RegulatingControlMapping(this);
         nodeMapping = new NodeMapping();
+
         ratioTapChangerTables = new HashMap<>();
+        phaseTapChangerTables = new HashMap<>();
         reactiveCapabilityCurveData = new HashMap<>();
+        powerTransformerRatioTapChangers = new HashMap<>();
+        powerTransformerPhaseTapChangers = new HashMap<>();
     }
 
     public CgmesModel cgmes() {
@@ -143,6 +149,28 @@ public PropertyBags reactiveCapabilityCurveData(String curveId) {
         return reactiveCapabilityCurveData.get(curveId);
     }
 
+    public void loadRatioTapChangers() {
+        cgmes.ratioTapChangers().forEach(ratio -> {
+            String id = ratio.getId(CgmesNames.RATIO_TAP_CHANGER);
+            powerTransformerRatioTapChangers.put(id, ratio);
+        });
+    }
+
+    public PropertyBag ratioTapChanger(String id) {
+        return powerTransformerRatioTapChangers.get(id);
+    }
+
+    public void loadPhaseTapChangers() {
+        cgmes.phaseTapChangers().forEach(phase -> {
+            String id = phase.getId(CgmesNames.PHASE_TAP_CHANGER);
+            powerTransformerPhaseTapChangers.put(id, phase);
+        });
+    }
+
+    public PropertyBag phaseTapChanger(String id) {
+        return powerTransformerPhaseTapChangers.get(id);
+    }
+
     public void loadRatioTapChangerTables() {
         PropertyBags rtcpoints = cgmes.ratioTapChangerTablesPoints();
         if (rtcpoints == null) {
@@ -154,10 +182,25 @@ public void loadRatioTapChangerTables() {
         });
     }
 
+    public void loadPhaseTapChangerTables() {
+        PropertyBags ptcpoints = cgmes.phaseTapChangerTablesPoints();
+        if (ptcpoints == null) {
+            return;
+        }
+        ptcpoints.forEach(p -> {
+            String tableId = p.getId("PhaseTapChangerTable");
+            phaseTapChangerTables.computeIfAbsent(tableId, tid -> new PropertyBags()).add(p);
+        });
+    }
+
     public PropertyBags ratioTapChangerTable(String tableId) {
         return ratioTapChangerTables.get(tableId);
     }
 
+    public PropertyBags phaseTapChangerTable(String tableId) {
+        return phaseTapChangerTables.get(tableId);
+    }
+
     public void startLinesConversion() {
         countLines = 0;
         countLinesWithSvPowerFlowsAtEnds = 0;
@@ -222,7 +265,10 @@ public void missing(String what, double defaultValue) {
     private final RegulatingControlMapping regulatingControlMapping;
 
     private final Map<String, PropertyBags> ratioTapChangerTables;
+    private final Map<String, PropertyBags> phaseTapChangerTables;
     private final Map<String, PropertyBags> reactiveCapabilityCurveData;
+    private final Map<String, PropertyBag> powerTransformerRatioTapChangers;
+    private final Map<String, PropertyBag> powerTransformerPhaseTapChangers;
 
     private int countLines;
     private int countLinesWithSvPowerFlowsAtEnds;