VeraGridEngine 5.6.18__tar.gz → 5.6.20__tar.gz

{veragridengine-5.6.18 → veragridengine-5.6.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.6.18
+Version: 5.6.20
 Summary: VeraGrid is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/VeraGrid
 Author: Santiago Peñate Vera et. Al.

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/Compilers/circuit_to_gslv.py

@@ -2321,6 +2321,7 @@ def gslv_pf(circuit: MultiCircuit,
             logger: Logger = Logger()) -> "pg.PowerFlowResults":
     """
     GSLV power flow
+    :param logger:
     :param circuit: MultiCircuit instance
     :param pf_opt: Power Flow Options
     :param time_series: Compile with VeraGrid time series?
@@ -2407,7 +2408,7 @@ def translate_gslv_pf_results(grid: MultiCircuit, res: "pg.PowerFlowResults", lo
     results.loading_hvdc = res.loading_hvdc[0, :]
     results.losses_hvdc = res.losses_hvdc[0, :]
 
-    results.Pfp_vsc = res.Pfp_vsc[0, :]
+    results.Pfp_vsc = res.Pf_vsc[0, :]
     results.St_vsc = res.St_vsc[0, :]
     results.loading_vsc = res.loading_vsc[0, :]
     results.losses_vsc = res.losses_vsc[0, :]

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/file_handler.py

@@ -47,6 +47,7 @@ from VeraGridEngine.IO.ucte.devices.ucte_circuit import UcteCircuit
 from VeraGridEngine.IO.ucte.ucte_to_veragrid import convert_ucte_to_veragrid
 from VeraGridEngine.IO.others.rte_parser import rte2veragrid
 from VeraGridEngine.IO.others.anarede import PWFParser
+from VeraGridEngine.IO.iidm.iidm_parser_pypowsybl import IidmParser
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.Simulations.driver_template import DriverToSave
 from VeraGridEngine.Simulations.PowerFlow.power_flow_results import PowerFlowResults
@@ -336,7 +337,7 @@ class FileOpen:
                 elif file_extension.lower() == '.gch5':
                     self.circuit = open_h5(self.file_name, text_func=text_func, prog_func=progress_func)
 
-                elif file_extension.lower() == '.m':
+                elif file_extension.lower() in ['.m', '.matpower']:
                     m_grid = MatpowerCircuit()
                     m_grid.read_file(file_name=self.file_name)
                     self.circuit = matpower_to_veragrid(m_grid, self.logger)
@@ -461,6 +462,10 @@ class FileOpen:
                     ucte_grid.parse_file(files=[self.file_name], logger=self.logger)
                     self.circuit = convert_ucte_to_veragrid(ucte_grid=ucte_grid, logger=self.logger)
 
+                elif file_extension.lower() == '.iidm' or file_extension.lower() == '.xiidm':
+                    parser = IidmParser(self.file_name, self.logger)
+                    self.circuit = parser.parse()
+
             else:
                 # warn('The file does not exist.')
                 self.logger.add_error('Does not exist', self.file_name)
@@ -761,7 +766,10 @@ class FileSave:
         from VeraGridEngine.Compilers.circuit_to_pgm import save_pgm
         logger = Logger()
 
-        save_pgm(filename=self.file_name, circuit=self.circuit, logger=logger, time_series=self.circuit.has_time_series)
+        save_pgm(filename=self.file_name,
+                 circuit=self.circuit,
+                 logger=logger,
+                 time_series=self.circuit.has_time_series)
 
         return logger
 

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/rte_area.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_area.py

@@ -2,12 +2,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 from VeraGridEngine.Devices.Aggregation.area import Area
 
 
-class RteArea(RteObject):
-    def __init__(self, _id: str, name: str = "", area_type: str = "", interchange_target: float = 0.0):
+class IidmArea(IidmObject):
+    def __init__(self, _id: str,
+                 name: str = "",
+                 area_type: str = "",
+                 interchange_target: float = 0.0):
+        """
+
+        :param _id:
+        :param name:
+        :param area_type:
+        :param interchange_target:
+        """
         super().__init__("Area")
         self.id = _id
         self.name = name
@@ -18,7 +28,8 @@ class RteArea(RteObject):
         self.register_property("name", str, description="Human-readable name of the Area")
         self.register_property("area_type", str, description="The type of Area.")
         self.register_property("interchange_target", float,
-                               description="The optional target interchange of this area in MW, using load sign convention (negative is export, positive is import)")
+                               description="The optional target interchange of this area in MW, "
+                                           "using load sign convention (negative is export, positive is import)")
 
     def to_veragrid(self) -> Area:
         """

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/rte_bus.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_bus.py

@@ -3,19 +3,28 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from typing import List, Dict
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 from VeraGridEngine.Devices.Substation.bus import Bus, Area
 
 
-class RteBus(RteObject):
+class IidmBus(IidmObject):
     def __init__(self, _id: str, area_number: int, status: str, nodes: List[int]):
+        """
+
+        :param _id:
+        :param area_number:
+        :param status:
+        :param nodes:
+        """
         super().__init__("Bus")
         self.id = _id
         self.area_number: int = area_number
-        self.status = status
+        self.status: str = status
         self.nodes: List[int] = nodes
 
         self.register_property("id", str, description="Bus ID")
+        self.register_property("area_number", str, description="Area number")
+        self.register_property("status", str, description="Status")
 
     def to_veragrid(self, area_dict: Dict[int, Area]) -> Bus:
         """
@@ -25,4 +34,4 @@ class RteBus(RteObject):
             name="",
             code=self.id,
             area=area_dict.get(self.area_number, None)
-        )
+        )

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/rte_busbar_section.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_busbar_section.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class RteBusbarSection(RteObject):
+class IidmBusbarSection(IidmObject):
     def __init__(self, _id: str):
         super().__init__("BusbarSection")
         self.id = _id

veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_circuit.py

@@ -0,0 +1,34 @@
+# 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 https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+from typing import List
+from VeraGridEngine.IO.iidm.devices.rtesubstation import IidmSubstation
+from VeraGridEngine.IO.iidm.devices.voltage_level import IidmVoltageLevel
+from VeraGridEngine.IO.iidm.devices.rte_area import IidmArea
+from VeraGridEngine.IO.iidm.devices.rte_bus import IidmBus
+from VeraGridEngine.IO.iidm.devices.generator import IidmGenerator
+from VeraGridEngine.IO.iidm.devices.load import Load
+from VeraGridEngine.IO.iidm.devices.line import IidmLine
+from VeraGridEngine.IO.iidm.devices.two_winding_transformer import TwoWindingsTransformer
+from VeraGridEngine.IO.iidm.devices.rte_dangling_line import IidmDanglingLine
+from VeraGridEngine.IO.iidm.devices.shunt import Shunt
+from VeraGridEngine.IO.iidm.devices.switch import Switch
+from VeraGridEngine.IO.iidm.devices.rte_busbar_section import IidmBusbarSection
+from VeraGridEngine.IO.iidm.devices.static_var_compensator import StaticVarCompensator
+
+class IidmCircuit:
+    def __init__(self):
+        self.substations: List[IidmSubstation] = []
+        self.voltage_levels: List[IidmVoltageLevel] = []
+        self.areas: List[IidmArea] = []
+        self.buses: List[IidmBus] = []
+        self.generators: List[IidmGenerator] = []
+        self.loads: List[Load] = []
+        self.lines: List[IidmLine] = []
+        self.transformers: List[TwoWindingsTransformer] = []
+        self.dangling_lines: List[IidmDanglingLine] = []
+        self.shunts: List[Shunt] = []
+        self.switches: List[Switch] = []
+        self.busbar_sections: List[IidmBusbarSection] = []
+        self.svcs: List[StaticVarCompensator] = []

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/rte_dangling_line.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_dangling_line.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class RteDanglingLine(RteObject):
+class IidmDanglingLine(IidmObject):
     def __init__(self, _id: str, bus: str, p0: float, q0: float, u0: float, r: float, x: float, g: float, b: float):
         super().__init__("DanglingLine")
         self.id = _id

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/discrete_measurement.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_discrete_measurement.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class DiscreteMeasurement(RteObject):
+class IidmDiscreteMeasurement(IidmObject):
     def __init__(self, id: str, equipmentId: str, value: bool):
         super().__init__("DiscreteMeasurement")
         self.id = id

veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_generator.py

@@ -0,0 +1,56 @@
+# 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 https://mozilla.org/MPL/2.0/.
+# SPDX-License-Identifier: MPL-2.0
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
+
+
+class IidmGeneratorShortCircuit(IidmObject):
+    def __init__(self, generatorId: str, voltageFactor: float, k: float):
+        super().__init__("GeneratorShortCircuit")
+        self.generatorId = generatorId
+        self.voltageFactor = voltageFactor
+        self.k = k
+
+        self.register_property("generatorId",
+                               str,
+                               description="Associated generator ID")
+        self.register_property("voltageFactor",
+                               float,
+                               description="Voltage factor")
+        self.register_property("k",
+                               float,
+                               description="Short circuit ratio k")
+
+
+class IidmGenerator(IidmObject):
+    def __init__(self, id_, bus, targetP, targetQ, targetV):
+        super().__init__("Generator")
+        self.id = id_
+        self.bus = bus
+        self.targetP = targetP
+        self.targetQ = targetQ
+        self.targetV = targetV
+
+        self.register_property("id",
+                               str,
+                               description="Generator ID")
+
+        self.register_property("bus",
+                               str,
+                               description="Connected bus")
+
+        self.register_property("targetP",
+                               float,
+                               Unit.get_kw(),
+                               description="Active power set-point")
+
+        self.register_property("targetQ",
+                               float,
+                               Unit.get_mvar(),
+                               description="Reactive power set-point")
+
+        self.register_property("targetV",
+                               float,
+                               Unit.get_kv(),
+                               description="Voltage set-point")

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/identifiable_short_circuit.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_identifiable_short_circuit.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class IdentifiableShortCircuit(RteObject):
+class IidmIdentifiableShortCircuit(IidmObject):
     def __init__(self, id: str, voltageSource: bool):
         super().__init__("IdentifiableShortCircuit")
         self.id = id

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/line.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_line.py

@@ -2,12 +2,33 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class Line(RteObject):
-    def __init__(self, id: str, voltageLevelId1: str, bus1: str, voltageLevelId2: str, bus2: str,
-                 r: float, x: float, g1: float, b1: float, g2: float, b2: float):
+class IidmLine(IidmObject):
+    def __init__(self, 
+                 id: str, 
+                 voltageLevelId1: str, 
+                 bus1: str, 
+                 voltageLevelId2: str, 
+                 bus2: str,
+                 r: float, x: float, 
+                 g1: float, b1: float, 
+                 g2: float, b2: float):
+        """
+        
+        :param id: 
+        :param voltageLevelId1: 
+        :param bus1: 
+        :param voltageLevelId2: 
+        :param bus2: 
+        :param r: 
+        :param x: 
+        :param g1: 
+        :param b1: 
+        :param g2: 
+        :param b2: 
+        """
         super().__init__("Line")
         self.id = id
         self.voltageLevelId1 = voltageLevelId1

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/load.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_load.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class Load(RteObject):
+class IidmLoad(IidmObject):
     def __init__(self, id, bus, p0, q0):
         super().__init__("Load")
         self.id = id

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/node_breaker_topology.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_node_breaker_topology.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class NodeBreakerTopology(RteObject):
+class IidmNodeBreakerTopology(IidmObject):
     def __init__(self, id: str):
         super().__init__("NodeBreakerTopology")
         self.id = id

veragridengine-5.6.18/VeraGridEngine/IO/iidm/devices/rte_object.py → veragridengine-5.6.20/VeraGridEngine/IO/iidm/devices/iidm_object.py

@@ -9,7 +9,7 @@ from VeraGridEngine.IO.base.units import Unit
 from VeraGridEngine.IO.base.base_property import BaseProperty
 
 
-class RteObject:
+class IidmObject:
     """
     RteObject
     """

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/observability_area.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class ObservabilityArea(RteObject):
+class ObservabilityArea(IidmObject):
     def __init__(self, id: str, name: str):
         super().__init__("ObservabilityArea")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/operating_status.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class OperatingStatus(RteObject):
+class OperatingStatus(IidmObject):
     def __init__(self, id: str, inService: bool):
         super().__init__("OperatingStatus")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/rtesubstation.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class RteSubstation(RteObject):
+class IidmSubstation(IidmObject):
     def __init__(self, id, country, tso, geographicalTags):
         super().__init__("Substation")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/shunt.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class Shunt(RteObject):
+class Shunt(IidmObject):
     def __init__(self, id: str, bus: str, g: float, b: float):
         super().__init__("Shunt")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/standby_automation.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class StandbyAutomaton(RteObject):
+class StandbyAutomaton(IidmObject):
     def __init__(self, id: str, enabled: bool):
         super().__init__("StandbyAutomaton")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/startup.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class Startup(RteObject):
+class Startup(IidmObject):
     def __init__(self, generatorId: str, startupTime: float):
         super().__init__("Startup")
         self.generatorId = generatorId

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/static_var_compensator.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class StaticVarCompensator(RteObject):
+class StaticVarCompensator(IidmObject):
     def __init__(self, id: str, bus: str, bMin: float, bMax: float, voltageSetPoint: float):
         super().__init__("StaticVarCompensator")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/switch.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject
 
 
-class Switch(RteObject):
+class Switch(IidmObject):
     def __init__(self, id: str, bus1: str, bus2: str, kind: str, open: bool, retained: bool):
         super().__init__("Switch")
         self.id = id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/two_winding_transformer.py

@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 
 
-class RatioTapChangerStep(RteObject):
+class RatioTapChangerStep(IidmObject):
     def __init__(self, rho: float, r: float = 0.0, x: float = 0.0, g: float = 0.0, b: float = 0.0):
         super().__init__("RatioTapChangerStep")
         self.rho = rho
@@ -21,7 +21,7 @@ class RatioTapChangerStep(RteObject):
         self.register_property("b", "step:b", float, Unit("S"), description="Step susceptance")
 
 
-class RatioTapChanger(RteObject):
+class RatioTapChanger(IidmObject):
     def __init__(self, lowTapPosition: int, tapPosition: int,
                  regulationMode: str, regulationValue: float,
                  loadTapChangingCapabilities: bool, regulating: bool, targetDeadband: float):
@@ -47,7 +47,7 @@ class RatioTapChanger(RteObject):
 
 
 
-class PhaseTapChanger(RteObject):
+class PhaseTapChanger(IidmObject):
     def __init__(self, regulationMode: str, tapPosition: int, regulationValue: float, regulating: bool):
         super().__init__("PhaseTapChanger")
         self.regulationMode = regulationMode
@@ -62,7 +62,7 @@ class PhaseTapChanger(RteObject):
 
 
 
-class TwoWindingsTransformer(RteObject):
+class TwoWindingsTransformer(IidmObject):
     def __init__(self, id: str,
                  voltageLevelId1: str, bus1: str,
                  voltageLevelId2: str, bus2: str,

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/devices/voltage_level.py

@@ -3,11 +3,11 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 
-from VeraGridEngine.IO.iidm.devices.rte_object import RteObject, Unit
+from VeraGridEngine.IO.iidm.devices.iidm_object import IidmObject, Unit
 from VeraGridEngine.Devices.Substation.voltage_level import VoltageLevel
 
 
-class RteVoltageLevel(RteObject):
+class IidmVoltageLevel(IidmObject):
     def __init__(self, _id, nominalV, topologyKind, name=""):
         super().__init__("VoltageLevel")
         self.id = _id

{veragridengine-5.6.18 → veragridengine-5.6.20}/VeraGridEngine/IO/iidm/iidm_parser.py

@@ -5,18 +5,18 @@
 from typing import List
 import bz2
 import xml.etree.ElementTree as ET
-from VeraGridEngine.IO.iidm.devices.rtesubstation import RteSubstation
-from VeraGridEngine.IO.iidm.devices.voltage_level import RteVoltageLevel
-from VeraGridEngine.IO.iidm.devices.rte_area import RteArea
-from VeraGridEngine.IO.iidm.devices.rte_bus import RteBus
-from VeraGridEngine.IO.iidm.devices.generator import Generator
+from VeraGridEngine.IO.iidm.devices.rtesubstation import IidmSubstation
+from VeraGridEngine.IO.iidm.devices.voltage_level import IidmVoltageLevel
+from VeraGridEngine.IO.iidm.devices.rte_area import IidmArea
+from VeraGridEngine.IO.iidm.devices.rte_bus import IidmBus
+from VeraGridEngine.IO.iidm.devices.generator import IidmGenerator
 from VeraGridEngine.IO.iidm.devices.load import Load
-from VeraGridEngine.IO.iidm.devices.line import Line
+from VeraGridEngine.IO.iidm.devices.line import IidmLine
 from VeraGridEngine.IO.iidm.devices.two_winding_transformer import TwoWindingsTransformer
-from VeraGridEngine.IO.iidm.devices.rte_dangling_line import RteDanglingLine
+from VeraGridEngine.IO.iidm.devices.rte_dangling_line import IidmDanglingLine
 from VeraGridEngine.IO.iidm.devices.shunt import Shunt
 from VeraGridEngine.IO.iidm.devices.switch import Switch
-from VeraGridEngine.IO.iidm.devices.rte_busbar_section import RteBusbarSection
+from VeraGridEngine.IO.iidm.devices.rte_busbar_section import IidmBusbarSection
 from VeraGridEngine.IO.iidm.devices.static_var_compensator import StaticVarCompensator
 from VeraGridEngine.IO.iidm.devices.iidm_circuit import IidmCircuit
 
@@ -57,7 +57,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
         tag = strip_ns(elem.tag)
 
         if tag == "substation":
-            circuit.substations.append(RteSubstation(
+            circuit.substations.append(IidmSubstation(
                 id=elem.attrib.get("id", ""),
                 country=elem.attrib.get("country", ""),
                 tso=elem.attrib.get("tso", ""),
@@ -65,7 +65,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "voltageLevel":
-            circuit.voltage_levels.append(RteVoltageLevel(
+            circuit.voltage_levels.append(IidmVoltageLevel(
                 _id=elem.attrib.get("id", ""),
                 name=elem.attrib.get("name", ""),
                 nominalV=float(elem.attrib.get("nominalV", 0)),
@@ -73,7 +73,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "area":
-            circuit.areas.append(RteArea(
+            circuit.areas.append(IidmArea(
                 _id=elem.attrib.get("id", ""),
                 name=elem.attrib.get("Name", ""),
                 area_type=elem.attrib.get("AreaType", ""),
@@ -81,7 +81,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "bus":
-            circuit.buses.append(RteBus(
+            circuit.buses.append(IidmBus(
                 _id=elem.attrib.get("id", ""),
                 area_number=elem.attrib.get("areaNumber", -1),
                 status=elem.attrib.get("status", ""),
@@ -89,7 +89,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "generator":
-            circuit.generators.append(Generator(
+            circuit.generators.append(IidmGenerator(
                 id=elem.attrib.get("id", ""),
                 bus=elem.attrib.get("bus", ""),
                 targetP=float(elem.attrib.get("targetP", 0)),
@@ -106,7 +106,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "line":
-            circuit.lines.append(Line(
+            circuit.lines.append(IidmLine(
                 id=elem.attrib.get("id", ""),
                 voltageLevelId1=elem.attrib.get("voltageLevelId1", ""),
                 bus1=elem.attrib.get("bus1", ""),
@@ -136,7 +136,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "danglingLine":
-            circuit.dangling_lines.append(RteDanglingLine(
+            circuit.dangling_lines.append(IidmDanglingLine(
                 _id=elem.attrib.get("id", ""),
                 bus=elem.attrib.get("bus", ""),
                 p0=float(elem.attrib.get("p0", 0)),
@@ -167,7 +167,7 @@ def parse_xiidm_file(file_path: str) -> IidmCircuit:
             ))
 
         elif tag == "busbarSection":
-            circuit.busbar_sections.append(RteBusbarSection(
+            circuit.busbar_sections.append(IidmBusbarSection(
                 _id=elem.attrib.get("id", "")
             ))