# Conflicts:

# dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/AbstractEquipmentGroovyExtension.groovy # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdcModel.java # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLineModel.java # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformerModel.java # dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideConverter.java # dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java # dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java # dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java
powsybl · Jun 22, 2023 · 683f9f8 · 683f9f8
1 parent 4aa7936
commit 683f9f8
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 18 deletions.
diff --git a/...ltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/AbstractEquipmentGroovyExtension.groovy b/...ltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/AbstractEquipmentGroovyExtension.groovy
@@ -33,7 +33,7 @@ abstract class AbstractEquipmentGroovyExtension<T> {
             new EquipmentConfig(
                     it.key as String,
                     it.value.get(MODEL_PREFIX) as String,
-                    it.value.get(MODEL_PROPERTIES).collect { it.toUpperCase() } as String[]
+                    it.value.get(MODEL_PROPERTIES).collect{it.toUpperCase()} as String[]
             )
         }
     }

diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
@@ -30,6 +30,9 @@
 import com.powsybl.dynawaltz.models.loads.*;
 import com.powsybl.dynawaltz.models.svarcs.StaticVarCompensator;
 import com.powsybl.dynawaltz.models.transformers.TransformerFixedRatio;
+import com.powsybl.dynawaltz.models.generators.GridFormingConverter;
+import com.powsybl.dynawaltz.models.generators.SynchronizedWeccGen;
+import com.powsybl.dynawaltz.models.generators.WeccGen;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.iidm.network.test.HvdcTestNetwork;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdcModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/DefaultHvdcModel.java
@@ -7,8 +7,8 @@
  */
 package com.powsybl.dynawaltz.models.hvdc;
 
-import com.powsybl.dynawaltz.models.Side;
 import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel;
+import com.powsybl.dynawaltz.models.Side;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPvDangling.java
@@ -29,8 +29,8 @@ public HvdcPvDangling(String dynamicModelId, HvdcLine hvdc, String parameterSetI
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
         danglingSide.createMacroConnections(
-                this::getVarConnectionsWith,
-                (varCoSupplier, side) -> createMacroConnections(BusUtils.getConnectableBusStaticId(equipment, side), BusModel.class, varCoSupplier, context, side)
+            this::getVarConnectionsWith,
+            (varCoSupplier, side) -> createMacroConnections(BusUtils.getConnectableBusStaticId(equipment, side), BusModel.class, varCoSupplier, context, side)
         );
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscDangling.java
@@ -29,8 +29,8 @@ public HvdcVscDangling(String dynamicModelId, HvdcLine hvdc, String parameterSet
     @Override
     public void createMacroConnections(DynaWaltzContext context) {
         danglingSide.createMacroConnections(
-                this::getVarConnectionsWith,
-                (varCoSupplier, side) -> createMacroConnections(BusUtils.getConnectableBusStaticId(equipment, side), BusModel.class, varCoSupplier, context, side)
+            this::getVarConnectionsWith,
+            (varCoSupplier, side) -> createMacroConnections(BusUtils.getConnectableBusStaticId(equipment, side), BusModel.class, varCoSupplier, context, side)
         );
     }
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLineModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/DefaultLineModel.java
@@ -6,8 +6,8 @@
  */
 package com.powsybl.dynawaltz.models.lines;
 
-import com.powsybl.dynawaltz.models.Side;
 import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel;
+import com.powsybl.dynawaltz.models.Side;
 
 /**
  * @author Florian Dupuy <florian.dupuy at rte-france.com>

diff --git a/...altz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformerModel.java b/...altz/src/main/java/com/powsybl/dynawaltz/models/transformers/DefaultTransformerModel.java
@@ -7,9 +7,9 @@
  */
 package com.powsybl.dynawaltz.models.transformers;
 
+import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel;
 import com.powsybl.dynawaltz.models.Side;
 import com.powsybl.dynawaltz.models.VarConnection;
-import com.powsybl.dynawaltz.models.defaultmodels.AbstractDefaultModel;
 
 import java.util.List;
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideConverter.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/utils/SideConverter.java
@@ -32,11 +32,11 @@ public static Side convert(Branch.Side side) {
 
     public static HvdcLine.Side convert(Side side) {
         switch (side) {
-            case ONE:
+            case ONE :
                 return HvdcLine.Side.ONE;
-            case TWO:
+            case TWO :
                 return HvdcLine.Side.TWO;
-            default:
+            default :
                 throw new IllegalArgumentException("Unexpected Side value: " + side);
         }
     }

diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/DisconnectHvdcEventXmlTest.java
@@ -57,7 +57,7 @@ protected void addDynamicModels(Function< Network, BlackBoxModel> hvdcConstructo
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("provideModels")
-    void writeModel(String dydName, Function<Network, BlackBoxModel> hvdcConstructor, Function<Network, BlackBoxModel> disconnectConstructor) throws SAXException, IOException, XMLStreamException {
+    void writeModel(String dydName, Function< Network, BlackBoxModel> hvdcConstructor, Function< Network, BlackBoxModel> disconnectConstructor) throws SAXException, IOException, XMLStreamException {
         DydXml.write(tmpDir, context);
         ParametersXml.write(tmpDir, context);
         validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME));

diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/HvdcXmlTest.java
@@ -37,7 +37,7 @@ class HvdcXmlTest extends AbstractParametrizedDynamicModelXmlTest {
     private static final String DYN_NAME = "BBM_" + HVDC_NAME;
 
     @BeforeEach
-    void setup(String dydName, Function<Network, BlackBoxModel> constructor) {
+    void setup(String dydName, Function< Network, BlackBoxModel> constructor) {
         setupNetwork();
         addDynamicModels(constructor);
         setupDynawaltzContext();
@@ -47,13 +47,13 @@ protected void setupNetwork() {
         network = HvdcTestNetwork.createVsc();
     }
 
-    protected void addDynamicModels(Function<Network, BlackBoxModel> constructor) {
+    protected void addDynamicModels(Function< Network, BlackBoxModel> constructor) {
         dynamicModels.add(constructor.apply(network));
     }
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("provideHvdc")
-    void writeHvdcModel(String dydName, Function<Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException {
+    void writeHvdcModel(String dydName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException {
         DydXml.write(tmpDir, context);
         validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME));
     }

diff --git a/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java b/dynawaltz/src/test/java/com/powsybl/dynawaltz/xml/WeccGenXmlTest.java
@@ -35,7 +35,7 @@ class WeccGenXmlTest extends AbstractParametrizedDynamicModelXmlTest {
     private static final String DYN_WT_NAME = "BBM_WT";
 
     @BeforeEach
-    void setup(String dydName, String parName, Function<Network, BlackBoxModel> loadConstructor) {
+    void setup(String dydName, String parName, Function< Network, BlackBoxModel> loadConstructor) {
         setupNetwork();
         addDynamicModels(loadConstructor);
         setupDynawaltzContext();
@@ -45,13 +45,13 @@ protected void setupNetwork() {
         network = EurostagTutorialExample1Factory.create();
     }
 
-    protected void addDynamicModels(Function<Network, BlackBoxModel> constructor) {
+    protected void addDynamicModels(Function< Network, BlackBoxModel> constructor) {
         dynamicModels.add(constructor.apply(network));
     }
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("provideWecc")
-    void writeModel(String dydName, String parName, Function<Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException {
+    void writeModel(String dydName, String parName, Function< Network, BlackBoxModel> constructor) throws SAXException, IOException, XMLStreamException {
         DydXml.write(tmpDir, context);
         ParametersXml.write(tmpDir, context);
         validate("dyd.xsd", dydName, tmpDir.resolve(DynaWaltzConstants.DYD_FILENAME));