GridCalEngine 5.3.52__tar.gz → 5.3.53__tar.gz

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/DataStructures/passive_branch_data.py

@@ -134,50 +134,6 @@ class PassiveBranchData(BranchParentData):
         """
         return 1.0 / (self.R + 1.0j * self.X + 1e-20)
 
-    def get_ac_indices(self) -> IntVec:
-        """
-        Get ac branch indices
-        :return:
-        """
-        return np.where(self.dc == 0)[0]
-
-    def get_dc_indices(self) -> IntVec:
-        """
-        Get dc branch indices
-        :return:
-        """
-        return np.where(self.dc != 0)[0]
-
-    def get_monitor_enabled_indices(self) -> IntVec:
-        """
-        Get monitored branch indices
-        :return:
-        """
-        return np.where(self.monitor_loading == 1)[0]
-
-    def get_contingency_enabled_indices(self) -> IntVec:
-        """
-        Get contingency branch indices
-        :return:
-        """
-        return np.where(self.contingency_enabled == 1)[0]
-
-    def get_inter_areas(self, bus_idx_from: IntVec | Set[int], bus_idx_to: IntVec | Set[int]):
-        """
-        Get the Branches that join two areas
-        :param bus_idx_from: Area from
-        :param bus_idx_to: Area to
-        :return: List of (branch index, flow sense w.r.t the area exchange)
-        """
-
-        lst: List[Tuple[int, float]] = list()
-        for k in range(self.nelm):
-            if self.F[k] in bus_idx_from and self.T[k] in bus_idx_to:
-                lst.append((k, 1.0))
-            elif self.F[k] in bus_idx_to and self.T[k] in bus_idx_from:
-                lst.append((k, -1.0))
-        return lst
-
     def detect_superconductor_at(self, k) -> None:
         """
         There is a beyond terrible practice of setting branches with R=0 and X=0 as "superconductor"....

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/area.py

@@ -8,6 +8,11 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice, Device
 
 
 class GenericAreaGroup(EditableDevice):
+    __slots__ = (
+        'latitude',
+        'longitude',
+        'color',
+    )
 
     def __init__(self, name='', code='', idtag: Union[str, None] = None,
                  device_type=DeviceType.GenericArea, latitude=0.0, longitude=0.0, color: str | None = None):

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/branch_group.py

@@ -8,6 +8,9 @@ from GridCalEngine.enumerations import BranchGroupTypes
 
 
 class BranchGroup(EditableDevice):
+    __slots__ = (
+        '_group_type',
+    )
 
     def __init__(self,
                  name='',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/community.py

@@ -10,6 +10,9 @@ from GridCalEngine.Devices.Aggregation.country import Country
 
 
 class Community(GenericAreaGroup):
+    __slots__ = (
+        'country',
+    )
 
     def __init__(self, name='Country', idtag: Union[str, None] = None, code='', latitude=0.0, longitude=0.0,
                  country: Union[Country, None] = None):

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/contingency.py

@@ -14,6 +14,11 @@ class Contingency(PointerDeviceParent):
     """
     The Contingency object
     """
+    __slots__ = (
+        '_prop',
+        '_value',
+        '_group',
+    )
 
     def __init__(self,
                  device: EditableDevice | None = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/contingency_group.py

@@ -11,6 +11,7 @@ class ContingencyGroup(EditableDevice):
     """
     The Contingency group
     """
+    __slots__ = ('category',)
 
     def __init__(self, idtag: Union[str, None] = None, name="ContingencyGroup", category=''):
         """

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/inter_aggregation_info.py

@@ -22,6 +22,16 @@ class InterAggregationInfo(EditableDevice):
     """
     Class to store information of inter area, inter country, etc
     """
+    __slots__ = (
+        'valid',
+        'lst_from',
+        'lst_to',
+        'lst_br',
+        'lst_br_hvdc',
+        'objects_from',
+        'objects_to',
+        'logger',
+    )
 
     def __init__(self,
                  valid: bool,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/investment.py

@@ -15,6 +15,11 @@ class Investment(PointerDeviceParent):
     """
     Investment
     """
+    __slots__ = (
+        'CAPEX',
+        '_group',
+        'status',
+    )
 
     def __init__(self,
                  device: EditableDevice | None = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/investments_group.py

@@ -11,6 +11,11 @@ class InvestmentsGroup(EditableDevice):
     """
     Investments group
     """
+    __slots__ = (
+        'category',
+        'discount_rate',
+        'CAPEX',
+    )
 
     def __init__(self,
                  idtag: Union[str, None] = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/municipality.py

@@ -10,6 +10,7 @@ from GridCalEngine.Devices.Aggregation.region import Region
 
 
 class Municipality(GenericAreaGroup):
+    __slots__ = ('region',)
 
     def __init__(self, name='Municipality', idtag: Union[str, None] = None, code='', latitude=0.0, longitude=0.0,
                  region: Union[Region, None] = None):
@@ -32,4 +33,4 @@ class Municipality(GenericAreaGroup):
         self.region: Union[Region, None] = region
 
         self.register(key="region", units="", tpe=DeviceType.RegionDevice,
-                      definition="Substation region, altenativelly this can be obtained from the municipality")
+                      definition="Substation region, alternatively this can be obtained from the municipality")

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/region.py

@@ -10,6 +10,7 @@ from GridCalEngine.Devices.Aggregation.community import Community
 
 
 class Region(GenericAreaGroup):
+    __slots__ = ('community',)
 
     def __init__(self, name='Region', idtag: Union[str, None] = None, code='', latitude=0.0, longitude=0.0,
                  community: Union[Community, None] = None):

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/remedial_action.py

@@ -14,6 +14,7 @@ class RemedialAction(PointerDeviceParent):
     """
     The RemedialAction object
     """
+    __slots__ = ('_prop', '_value', '_group')
 
     def __init__(self,
                  device: EditableDevice | None = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/remedial_action_group.py

@@ -13,6 +13,7 @@ class RemedialActionGroup(EditableDevice):
     """
     The RemedialAction group
     """
+    __slots__ = ('category', '_conn_group')
 
     def __init__(self,
                  idtag: Union[str, None] = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Aggregation/zone.py

@@ -9,6 +9,7 @@ from GridCalEngine.Devices.Aggregation.area import GenericAreaGroup, Area
 
 
 class Zone(GenericAreaGroup):
+    __slots__ = ('area',)
 
     def __init__(self, name='Zone',
                  idtag: Union[str, None] = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Associations/association.py

@@ -15,9 +15,14 @@ class Association:
     """
     GridCal relationship object, this handles the unit of association
     """
+    __slots__ = ('api_object', 'value')
 
     def __init__(self, api_object: Union[None, ASSOCIATION_TYPES] = None, value: float = 1.0):
+        """
 
+        :param api_object:
+        :param value:
+        """
         self.api_object: ASSOCIATION_TYPES = api_object
 
         self.value = value
@@ -66,6 +71,7 @@ class Associations:
     """
     GridCal associations object, this handles a set of associations
     """
+    __slots__ = ('_data', '_device_type')
 
     def __init__(self, device_type: DeviceType):
         """

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Associations/emission_gas.py

@@ -11,6 +11,7 @@ from GridCalEngine.Devices.profile import Profile
 
 
 class EmissionGas(EditableDevice):
+    __slots__ = ('cost', '_cost_prof', 'color')
 
     def __init__(self,
                  name: str = '',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Associations/fuel.py

@@ -9,6 +9,7 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice, Device
 
 
 class Fuel(EditableDevice):
+    __slots__ = ('cost', '_cost_prof', 'color')
 
     def __init__(self, name='',
                  code='',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Associations/technology.py

@@ -9,6 +9,7 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice, Device
 
 
 class Technology(EditableDevice):
+    __slots__ = ('name2', 'name3', 'name4', 'color')
 
     def __init__(self, name: str = '',
                  code: str = '',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/dc_line.py

@@ -15,6 +15,21 @@ from GridCalEngine.Devices.Branches.line_locations import LineLocations
 
 
 class DcLine(BranchParent):
+    __slots__ = (
+        'measurements',
+        '_length',
+        'tolerance',
+        'r_fault',
+        'fault_pos',
+        'R',
+        'temp_base',
+        'temp_oper',
+        '_temp_oper_prof',
+        'alpha',
+        'template',
+        '_locations',
+    )
+
     def __init__(self,
                  bus_from: Union[Bus, None] = None,
                  bus_to: Union[Bus, None] = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -125,6 +125,34 @@ class HvdcLine(BranchParent):
     """
     HvdcLine
     """
+    __slots__ = (
+        '_length',
+        'dispatchable',
+        'Pset',
+        'r',
+        'dc_link_voltage',
+        'angle_droop',
+        'loss_factor',
+        'mttf',
+        'mttr',
+        'Vset_f',
+        'Vset_t',
+        'min_firing_angle_f',
+        'max_firing_angle_f',
+        'min_firing_angle_t',
+        'max_firing_angle_t',
+        'capex',
+        'opex',
+        'build_status',
+        'control_mode',
+        '_Pset_prof',
+        '_active_prof',
+        '_Vset_f_prof',
+        '_Vset_t_prof',
+        '_angle_droop_prof',
+        '_locations',
+    )
+
 
     def __init__(self, bus_from: Bus = None, bus_to: Bus = None,
                  cn_from: ConnectivityNode = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/line.py

@@ -41,6 +41,33 @@ def accept_line_connection(V1: float, V2: float, branch_connection_voltage_toler
 
 
 class Line(BranchParent):
+    __slots__ = (
+        '_length',
+        'tolerance',
+        'r_fault',
+        'x_fault',
+        'fault_pos',
+        '_R',
+        '_X',
+        '_B',
+        '_R0',
+        '_X0',
+        '_B0',
+        '_R2',
+        '_X2',
+        '_B2',
+        'temp_base',
+        'temp_oper',
+        '_temp_oper_prof',
+        'alpha',
+        '_circuit_idx',
+        'template',
+        'possible_tower_types',
+        'possible_underground_line_types',
+        'possible_sequence_line_types',
+        '_locations',
+    )
+
 
     def __init__(self,
                  bus_from: Bus = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/line_locations.py

@@ -62,6 +62,8 @@ class LineLocations(EditableDevice):
     LineLocations
     """
 
+    __slots__ = ("data")
+
     def __init__(self,
                  name: str = "",
                  idtag: Union[str, None] = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/overhead_line_type.py

@@ -40,6 +40,16 @@ class WireInTower:
     """
     Wire -> Tower association
     """
+    __slots__ = (
+        'wire',
+        'name',
+        'xpos',
+        'ypos',
+        '_phase',
+        'circuit_index',
+        'phase_type',
+        'device_type',
+    )
 
     def __init__(self, wire: Wire, xpos: float = 0.0, ypos: float = 0.0, phase: int = 1):
         """
@@ -156,6 +166,7 @@ class WireInTower:
 
 
 class ListOfWires:
+    __slots__ = ("data")
 
     def __init__(self):
         self.data: List[WireInTower] = list()
@@ -225,6 +236,25 @@ class ListOfWires:
 
 
 class OverheadLineType(EditableDevice):
+    __slots__ = (
+        'wires_in_tower',
+        '_Vnom',
+        'earth_resistivity',
+        'frequency',
+        '_Imax',
+        '_z_abcn',
+        '_z_phases_abcn',
+        '_z_abc',
+        '_z_phases_abc',
+        '_z_seq',
+        '_z_0123',
+        '_y_abcn',
+        '_y_phases_abcn',
+        '_y_abc',
+        '_y_phases_abc',
+        '_y_seq',
+        '_y_0123',
+    )
 
     def __init__(self, name='Tower', idtag: str | None = None,
                  Vnom: float = 1.0,
@@ -419,8 +449,8 @@ class OverheadLineType(EditableDevice):
             ax.set_ylabel('m', fontsize=8)
             ax.tick_params(axis='x', labelsize=8)
             ax.tick_params(axis='y', labelsize=8)
-            ax.set_xlim([min(0, np.min(x) - 1), np.max(x) + 1])
-            ax.set_ylim([0, np.max(y) + 1])
+            ax.set_xlim((min(0, np.min(x) - 1), np.max(x) + 1))
+            ax.set_ylim((0, np.max(y) + 1))
             ax.patch.set_facecolor('white')
             ax.grid(False)
             ax.grid(which='major', axis='y', linestyle='--')
@@ -429,11 +459,9 @@ class OverheadLineType(EditableDevice):
             pass
 
     def is_computed(self) -> bool:
-
         """
-
-        return: Boolean that tells if the template has already been computed or not
-
+        Boolean that tells if the template has already been computed or not
+        :return: if computed or not
         """
 
         ok = True

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/sequence_line_type.py

@@ -68,6 +68,21 @@ def get_line_impedances_with_b(r_ohm: float, x_ohm: float, b_us: float, length:
 
 
 class SequenceLineType(EditableDevice):
+    __slots__ = (
+        'Imax',
+        'Vnom',
+        'R',
+        'X',
+        'B',
+        'Cnf',
+        'R0',
+        'X0',
+        'B0',
+        'Cnf0',
+        'use_conductance',
+        'n_circuits'
+    )
+
 
     def __init__(self, name='SequenceLine', idtag=None, Imax=1, Vnom=1,
                  R=0, X=0, B=0, R0=0, X0=0, B0=0, CnF=0, CnF0=0, use_conductance: bool = False):
@@ -107,6 +122,8 @@ class SequenceLineType(EditableDevice):
 
         self.use_conductance = use_conductance
 
+        self.n_circuits = 1
+
         self.register(key='Imax', units='kA', tpe=float, definition='Current rating of the line', old_names=['rating'])
         self.register(key='Vnom', units='kV', tpe=float, definition='Voltage rating of the line')
         self.register(key='R', units='Ohm/km', tpe=float, definition='Positive-sequence resistance per km')
@@ -119,6 +136,7 @@ class SequenceLineType(EditableDevice):
         self.register(key='Cnf0', units='nF/km', tpe=float, definition='Zero-sequence shunt conductance per km')
         self.register(key='use_conductance', units='', tpe=bool,
                       definition='Use conductance? else the susceptance is used')
+        self.register(key='n_circuits', units='', tpe=int, definition='number of circuits')
 
     def get_values(self, Sbase: float, freq: float, length: float, line_Vnom: float, ):
         """

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/series_reactance.py

@@ -14,6 +14,22 @@ from GridCalEngine.Devices.profile import Profile
 
 
 class SeriesReactance(BranchParent):
+    __slots__ = (
+        'tolerance',
+        'r_fault',
+        'x_fault',
+        'fault_pos',
+        'R',
+        'X',
+        'R0',
+        'X0',
+        'R2',
+        'X2',
+        'temp_base',
+        'temp_oper',
+        '_temp_oper_prof',
+        'alpha',
+    )
 
     def __init__(self, bus_from: Bus = None, bus_to: Bus = None, cn_from: ConnectivityNode = None,
                  cn_to: ConnectivityNode = None, name='SeriesReactance', idtag=None, code='',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/switch.py

@@ -15,6 +15,13 @@ class Switch(BranchParent):
     The **Switch** class represents the connections between nodes (i.e.
     :ref:`buses<bus>`) in **GridCal**. A Switch is a devices that cuts or allows the flow.
     """
+    __slots__ = (
+        'R',
+        'X',
+        'retained',
+        'normal_open',
+        'rated_current',
+    )
 
     def __init__(self,
                  bus_from: Bus = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/tap_changer.py

@@ -15,6 +15,21 @@ class TapChanger:
     """
     Tap changer
     """
+    __slots__ = (
+        '_asymmetry_angle',
+        '_total_positions',
+        '_dV',
+        '_neutral_position',
+        '_normal_position',
+        '_tap_position',
+        '_tc_type',
+        '_negative_low',
+        '_ndv',
+        '_tau_array',
+        '_m_array',
+        '_k_re_array',
+        '_k_im_array',
+    )
 
     def __init__(self,
                  total_positions: int = 5,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/transformer.py

@@ -19,6 +19,18 @@ from GridCalEngine.Devices.Parents.editable_device import DeviceType
 
 
 class Transformer2W(ControllableBranchParent):
+    __slots__ = (
+        'HV',
+        'LV',
+        'Sn',
+        'Pcu',
+        'Pfe',
+        'I0',
+        'Vsc',
+        'conn',
+        'template',
+        'possible_transformer_types',
+    )
 
     def __init__(self,
                  bus_from: Bus | None = None,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -51,6 +51,43 @@ def star_to_delta(z1: float, z2: float, z3: float) -> Tuple[float, float, float]
 
 
 class Transformer3W(PhysicalDevice):
+    __slots__ = (
+        'bus0',
+        'cn0',
+        '_bus1',
+        '_bus2',
+        '_bus3',
+        '_cn1',
+        '_cn2',
+        '_cn3',
+        'active',
+        '_active_prof',
+        '_V1',
+        '_V2',
+        '_V3',
+        '_r12',
+        '_r23',
+        '_r31',
+        '_x12',
+        '_x23',
+        '_x31',
+        '_rate1',
+        '_rate2',
+        '_rate3',
+        '_Pcu12',
+        '_Pcu23',
+        '_Pcu31',
+        '_Vsc12',
+        '_Vsc23',
+        '_Vsc31',
+        '_Pfe',
+        '_I0',
+        '_winding1',
+        '_winding2',
+        '_winding3',
+        'x',
+        'y',
+    )
 
     def __init__(self, idtag: Union[str, None] = None,
                  code: str = '',

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/transformer_type.py

@@ -10,6 +10,18 @@ from GridCalEngine.Devices.Branches.tap_changer import TapChanger
 
 
 class TransformerType(EditableDevice):
+    __slots__ = (
+        'HV',
+        'LV',
+        'Sn',
+        'Pcu',
+        'Pfe',
+        'I0',
+        'Vsc',
+        'GR_hv1',
+        'GX_hv1',
+        '_tap_changer',
+    )
 
     def __init__(self,
                  hv_nominal_voltage: float = 0.0,

{gridcalengine-5.3.52 → gridcalengine-5.3.53}/GridCalEngine/Devices/Branches/underground_line_type.py

@@ -8,6 +8,17 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice, Device
 
 
 class UndergroundLineType(EditableDevice):
+    __slots__ = (
+        'Imax',
+        'Vnom',
+        'R',
+        'X',
+        'B',
+        'R0',
+        'X0',
+        'B0',
+        'n_circuits'
+    )
 
     def __init__(self, name: str = 'UndergroundLine', idtag: None | str = None, Imax: float = 1.0,
                  Vnom: float = 1.0, R: float = 0.0, X: float = 0.0, B: float = 0.0,
@@ -41,6 +52,8 @@ class UndergroundLineType(EditableDevice):
         self.X0 = float(X0)
         self.B0 = float(B0)
 
+        self.n_circuits = 1
+
         self.register(key='Imax', units='kA', tpe=float, definition='Current rating of the line', old_names=['rating'])
         self.register(key='Vnom', units='kV', tpe=float, definition='Voltage rating of the line')
         self.register(key='R', units='Ohm/km', tpe=float, definition='Positive-sequence resistance per km')
@@ -49,6 +62,7 @@ class UndergroundLineType(EditableDevice):
         self.register(key='R0', units='Ohm/km', tpe=float, definition='Zero-sequence resistance per km')
         self.register(key='X0', units='Ohm/km', tpe=float, definition='Zero-sequence reactance per km')
         self.register(key='B0', units='uS/km', tpe=float, definition='Zero-sequence shunt susceptance per km')
+        self.register(key='n_circuits', units='', tpe=int, definition='number of circuits')
 
     def get_values(self, Sbase: float, length: float):
         """