GridCalEngine 5.1.62__tar.gz → 5.2.0__tar.gz

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -11,7 +11,7 @@ from typing import List, Tuple, Dict, Union, TYPE_CHECKING
 from GridCalEngine.Devices import RemedialAction
 from GridCalEngine.basic_structures import Logger
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
-from GridCalEngine.basic_structures import Vec, IntVec, CxVec
+from GridCalEngine.basic_structures import Vec, IntVec, CxVec, BoolVec
 from GridCalEngine.enumerations import BranchImpedanceMode, BusMode, ContingencyOperationTypes
 import GridCalEngine.Topology.topology as tp
 import GridCalEngine.Topology.simulation_indices as si
@@ -43,7 +43,8 @@ ALL_STRUCTS = Union[
 ]
 
 
-def CheckArr(arr: Vec, arr_expected: Vec, tol: float, name: str, test: str, logger: Logger) -> int:
+def CheckArr(arr: Vec | IntVec | BoolVec | CxVec, arr_expected: Vec | IntVec | BoolVec | CxVec,
+             tol: float, name: str, test: str, logger: Logger) -> int:
     """
 
     :param arr:
@@ -65,12 +66,20 @@ def CheckArr(arr: Vec, arr_expected: Vec, tol: float, name: str, test: str, logg
     if np.allclose(arr, arr_expected, atol=tol):
         return 0
     else:
-        diff = arr - arr_expected
-        logger.add_error(msg="Numeric differences",
-                         device=name,
-                         device_property=test,
-                         value=f"min diff: {diff.min()}, max diff: {diff.max()}",
-                         expected_value=tol)
+        if arr.dtype == np.bool:
+            diff = arr.astype(int) - arr_expected.astype(int)
+            logger.add_error(msg="Numeric differences",
+                             device=name,
+                             device_property=test,
+                             value=f"min diff: {diff.min()}, max diff: {diff.max()}",
+                             expected_value=tol)
+        else:
+            diff = arr - arr_expected
+            logger.add_error(msg="Numeric differences",
+                             device=name,
+                             device_property=test,
+                             value=f"min diff: {diff.min()}, max diff: {diff.max()}",
+                             expected_value=tol)
         return 1
 
 

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Aggregation/branch_group.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MPL-2.0
 from typing import Union
 from GridCalEngine.Devices.Parents.editable_device import EditableDevice, DeviceType
+from GridCalEngine.enumerations import BranchGroupTypes
 
 
 class BranchGroup(EditableDevice):
@@ -11,15 +12,37 @@ class BranchGroup(EditableDevice):
     def __init__(self,
                  name='',
                  code='',
-                 idtag: Union[str, None] = None):
+                 idtag: Union[str, None] = None,
+                 group_type: BranchGroupTypes = BranchGroupTypes.GenericGroup):
         """
         BranchGroup
         :param name: name of the generator fuel
         :param code: secondary id
         :param idtag: UUID code
+        :param group_type: type of branch group
         """
+
         EditableDevice.__init__(self,
                                 name=name,
                                 code=code,
                                 idtag=idtag,
                                 device_type=DeviceType.BranchGroupDevice)
+
+        self._group_type: BranchGroupTypes = group_type
+
+        self.register(key='group_type', units='', tpe=BranchGroupTypes, definition=f'Type of branch group')
+
+    @property
+    def group_type(self) -> BranchGroupTypes:
+        """
+        Type of branch group
+        :return: BranchGroupTypes
+        """
+        return self._group_type
+
+    @group_type.setter
+    def group_type(self, value: BranchGroupTypes):
+        if isinstance(value, BranchGroupTypes):
+            self._group_type = value
+        else:
+            raise TypeError("Invalid group_type data type")

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -130,11 +130,17 @@ class HvdcLine(BranchParent):
                  cn_from: ConnectivityNode = None,
                  cn_to: ConnectivityNode = None,
                  name='HVDC Line', idtag=None, active=True, code='',
-                 rate=1.0, Pset=0.0, r=1e-20, loss_factor=0.0, Vset_f=1.0, Vset_t=1.0, length=1.0, mttf=0.0, mttr=0.0,
-                 overload_cost=1000.0, min_firing_angle_f=-1.0, max_firing_angle_f=1.0, min_firing_angle_t=-1.0,
-                 max_firing_angle_t=1.0, contingency_factor=1.0, protection_rating_factor: float = 1.4,
-                 control_mode: HvdcControlType = HvdcControlType.type_1_Pset, dispatchable=True, angle_droop=0,
-                 capex=0, opex=0, build_status: BuildStatus = BuildStatus.Commissioned,
+                 rate=1.0, Pset=0.0,
+                 r=1e-20, loss_factor=0.0,
+                 Vset_f=1.0, Vset_t=1.0, length=1.0, mttf=0.0, mttr=0.0,
+                 overload_cost=1000.0,
+                 min_firing_angle_f=-1.0, max_firing_angle_f=1.0,
+                 min_firing_angle_t=-1.0, max_firing_angle_t=1.0,
+                 contingency_factor=1.0, protection_rating_factor: float = 1.4,
+                 control_mode: HvdcControlType = HvdcControlType.type_1_Pset,
+                 dispatchable=True, angle_droop=0,
+                 capex=0, opex=0,
+                 build_status: BuildStatus = BuildStatus.Commissioned,
                  dc_link_voltage: float = 200):
         """
         HVDC Line model

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Parents/branch_parent.py

@@ -125,7 +125,7 @@ class BranchParent(PhysicalDevice):
         self._protection_rating_factor = float(protection_rating_factor)
         self._protection_rating_factor_prof = Profile(default_value=protection_rating_factor, data_type=float)
 
-        # List of measurements
+        # group of this branch
         self.group: Union[BranchGroup, None] = None
 
         self.register('bus_from', units="", tpe=DeviceType.BusDevice,

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Parents/editable_device.py

@@ -12,7 +12,7 @@ from GridCalEngine.enumerations import (DeviceType, TimeFrame, BuildStatus, Wind
                                         HvdcControlType, ActionType, AvailableTransferMode, ContingencyMethod,
                                         CpfParametrization, CpfStopAt, InvestmentEvaluationMethod, SolverType,
                                         InvestmentsEvaluationObjectives, NodalCapacityMethod, TimeGrouping,
-                                        ZonalGrouping, MIPSolvers, AcOpfMode, SubstationTypes,
+                                        ZonalGrouping, MIPSolvers, AcOpfMode, SubstationTypes, BranchGroupTypes,
                                         BranchImpedanceMode, FaultType, TapChangerTypes, ContingencyOperationTypes)
 
 # types that can be assigned to a GridCal property
@@ -45,7 +45,8 @@ GCPROP_TYPES = Union[
     Type[FaultType],
     Type[TapChangerTypes],
     Type[SubstationTypes],
-    Type[ContingencyOperationTypes]
+    Type[ContingencyOperationTypes],
+    Type[BranchGroupTypes]
 ]
 
 

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Substation/bus.py

@@ -292,7 +292,7 @@ class Bus(PhysicalDevice):
             p_load[p_load > 0] = 0
             p_gen = p.copy()
             p_gen[p_gen < 0] = 0
-            P_data = {"Load":  p_load, "Gen": p_gen}
+            P_data = {"Load": p_load, "Gen": p_gen}
             t = time_series_driver.results.time_array
             pd.DataFrame(data=v, index=t, columns=['Voltage (p.u.)']).plot(ax=ax_voltage)
             pd.DataFrame(data=P_data, index=t).plot(ax=ax_load)
@@ -321,3 +321,19 @@ class Bus(PhysicalDevice):
         Get tuple of the bus coordinates (longitude, latitude)
         """
         return self.longitude, self.latitude
+
+    def try_to_find_coordinates(self):
+        """
+        Try to find the bus coordinates
+        """
+        lon, lat = self.longitude, self.latitude
+
+        if self.substation is not None:
+            if lon == 0.0:
+                lon = self.substation.longitude
+
+        if self.substation is not None:
+            if lat == 0.0:
+                lat = self.substation.latitude
+
+        return lon, lat

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/Substation/voltage_level.py

@@ -11,8 +11,11 @@ from GridCalEngine.Devices.Substation.substation import Substation
 
 class VoltageLevel(PhysicalDevice):
 
-    def __init__(self, name='VoltageLevel', idtag: Union[str, None] = None, code: str = '',
-                 Vnom: float = 1.0, substation: Union[None, Substation] = None):
+    def __init__(self, name='VoltageLevel',
+                 idtag: Union[str, None] = None,
+                 code: str = '',
+                 Vnom: float = 1.0,
+                 substation: Union[None, Substation] = None):
         """
         Constructor
         :param name: Name

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/Devices/multi_circuit.py

@@ -24,7 +24,7 @@ from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, F
 from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Topology.topology as tp
 from GridCalEngine.Topology.topology_processor import TopologyProcessorInfo, process_grid_topology_at
-from GridCalEngine.enumerations import DeviceType, ActionType
+from GridCalEngine.enumerations import DeviceType, ActionType, SubObjectType
 
 
 def get_system_user() -> str:
@@ -1898,6 +1898,22 @@ class MultiCircuit(Assets):
                                     device_property=prop.name,
                                     value=v2,
                                     expected_value=v1)
+                        elif prop.tpe == SubObjectType.Array:
+                            if len(v1) != len(v2):
+                                logger.add_error(
+                                    msg="Different array length",
+                                    device_class=template_elm.device_type.value,
+                                    device_property=prop.name,
+                                    value=v2,
+                                    expected_value=v1)
+                            else:
+                                if not np.isclose(v1, v2, atol=tolerance):
+                                    logger.add_error(
+                                        msg="Different snapshot values",
+                                        device_class=template_elm.device_type.value,
+                                        device_property=prop.name,
+                                        value=v2,
+                                        expected_value=v1)
                         else:
                             if v1 != v2:
                                 logger.add_error(msg="Different snapshot values",
@@ -1905,7 +1921,6 @@ class MultiCircuit(Assets):
                                                  device_property=prop.name,
                                                  value=v2,
                                                  expected_value=v1)
-
                         if prop.has_profile():
                             p1 = elm1.get_profile_by_prop(prop=prop)
                             p2 = elm1.get_profile_by_prop(prop=prop)

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/IO/cim/cgmes/base.py

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MPL-2.0
 from typing import Dict, List
 from uuid import uuid4, UUID
-from GridCalEngine.IO.cim.cgmes.cgmes_poperty import CgmesProperty
+from GridCalEngine.IO.cim.cgmes.cgmes_property import CgmesProperty
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
 from GridCalEngine.IO.base.units import UnitMultiplier, UnitSymbol
 from GridCalEngine.data_logger import DataLogger

{GridCalEngine-5.1.62 → GridCalEngine-5.2.0}/GridCalEngine/IO/cim/cgmes/cgmes_circuit.py

@@ -15,7 +15,7 @@ from GridCalEngine.IO.cim.cgmes.cgmes_assets.cgmes_2_4_15_assets import Cgmes_2_
 from GridCalEngine.IO.cim.cgmes.cgmes_assets.cgmes_3_0_0_assets import Cgmes_3_0_0_Assets
 # from GridCalEngine.IO.cim.cgmes.cgmes_utils import check_load_response_characteristic, check
 from GridCalEngine.data_logger import DataLogger
-from GridCalEngine.IO.cim.cgmes.cgmes_poperty import CgmesProperty
+from GridCalEngine.IO.cim.cgmes.cgmes_property import CgmesProperty
 from GridCalEngine.IO.base.base_circuit import BaseCircuit
 from GridCalEngine.IO.cim.cgmes.cgmes_enums import cgmesProfile
 from GridCalEngine.IO.cim.cgmes.cgmes_data_parser import CgmesDataParser