Add macroConnections package and move related classes (#290)

Signed-off-by: lisrte <[email protected]>
powsybl · Sep 28, 2023 · 819694d · 819694d
1 parent 663120c
commit 819694d
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 11 deletions.
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
@@ -16,6 +16,9 @@
 import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizerModel;
 import com.powsybl.dynawaltz.models.frequencysynchronizers.OmegaRef;
 import com.powsybl.dynawaltz.models.frequencysynchronizers.SetPoint;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnect;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnector;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
 import com.powsybl.dynawaltz.xml.MacroStaticReference;
 import com.powsybl.iidm.network.Identifiable;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java
@@ -8,6 +8,8 @@
 
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.DynaWaltzParameters;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionSuffix;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
 import com.powsybl.iidm.network.Identifiable;
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java
@@ -7,6 +7,7 @@
 package com.powsybl.dynawaltz.models;
 
 import com.powsybl.dynamicsimulation.DynamicModel;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 
 import java.util.List;
 

diff --git a/...tz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java b/...tz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel;
-import com.powsybl.dynawaltz.models.MeasurementPoint;
+import com.powsybl.dynawaltz.models.macroconnections.MeasurementPoint;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.buses.BusModel;
 import com.powsybl.dynawaltz.models.transformers.TapChangerModel;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel;
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.iidm.network.Bus;
 
 import java.util.ArrayList;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java
@@ -1,6 +1,6 @@
 package com.powsybl.dynawaltz.models.defaultmodels;
 
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.dynawaltz.models.Model;
 import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants;
 

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
@@ -9,7 +9,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.DynaWaltzParameters;
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.buses.BusModel;
 import com.powsybl.dynawaltz.parameters.ParametersSet;

diff --git a/...owsybl/dynawaltz/models/MacroConnect.java → ...models/macroconnections/MacroConnect.java b/...owsybl/dynawaltz/models/MacroConnect.java → ...models/macroconnections/MacroConnect.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;

diff --git a/...nawaltz/models/MacroConnectAttribute.java → ...croconnections/MacroConnectAttribute.java b/...nawaltz/models/MacroConnectAttribute.java → ...croconnections/MacroConnectAttribute.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>

diff --git a/...nawaltz/models/MacroConnectionSuffix.java → ...croconnections/MacroConnectionSuffix.java b/...nawaltz/models/MacroConnectionSuffix.java → ...croconnections/MacroConnectionSuffix.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>

diff --git a/...sybl/dynawaltz/models/MacroConnector.java → ...dels/macroconnections/MacroConnector.java b/...sybl/dynawaltz/models/MacroConnector.java → ...dels/macroconnections/MacroConnector.java
@@ -4,7 +4,10 @@
  * 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/.
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
+
+import com.powsybl.dynawaltz.models.Side;
+import com.powsybl.dynawaltz.models.VarConnection;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;

diff --git a/...bl/dynawaltz/models/MeasurementPoint.java → ...ls/macroconnections/MeasurementPoint.java b/...bl/dynawaltz/models/MeasurementPoint.java → ...ls/macroconnections/MeasurementPoint.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java
@@ -9,8 +9,8 @@
 
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.BlackBoxModel;
-import com.powsybl.dynawaltz.models.MacroConnect;
-import com.powsybl.dynawaltz.models.MacroConnector;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnect;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnector;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;