GridCalEngine 5.1.29__tar.gz → 5.1.30__tar.gz

{GridCalEngine-5.1.29 → GridCalEngine-5.1.30}/GridCalEngine/Compilers/circuit_to_newton_pa.py

@@ -1257,11 +1257,11 @@ def get_newton_pa_linear_opf_options(opf_opt: OptimalPowerFlowOptions,
     opt.use_ramp_constraints = False
     opt.lodf_threshold = opf_opt.lodf_tolerance
 
-    if opf_opt.areas_from is not None:
-        opt.areas_from = [area_dict[e] for e in opf_opt.areas_from]
+    if opf_opt.aggregations_from is not None:
+        opt.areas_from = [area_dict[e] for e in opf_opt.aggregations_from]
 
-    if opf_opt.areas_to is not None:
-        opt.areas_to = [area_dict[e] for e in opf_opt.areas_to]
+    if opf_opt.aggregations_to is not None:
+        opt.areas_to = [area_dict[e] for e in opf_opt.aggregations_to]
 
     return opt
 

{GridCalEngine-5.1.29 → GridCalEngine-5.1.30}/GridCalEngine/Devices/Aggregation/__init__.py

@@ -27,3 +27,4 @@ from GridCalEngine.Devices.Aggregation.region import Region
 from GridCalEngine.Devices.Aggregation.municipality import Municipality
 from GridCalEngine.Devices.Aggregation.branch_group import BranchGroup
 from GridCalEngine.Devices.Aggregation.modelling_authority import ModellingAuthority
+from GridCalEngine.Devices.Aggregation.inter_aggregation_info import InterAggregationInfo

GridCalEngine-5.1.30/GridCalEngine/Devices/Aggregation/inter_aggregation_info.py

@@ -0,0 +1,125 @@
+# GridCal
+# Copyright (C) 2015 - 2024 Santiago Peñate Vera
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+from __future__ import annotations
+from typing import List, Tuple, TYPE_CHECKING
+import numpy as np
+from GridCalEngine.Devices.Parents.editable_device import EditableDevice, DeviceType
+from GridCalEngine.basic_structures import IntVec, Vec
+from GridCalEngine.basic_structures import Logger
+
+if TYPE_CHECKING:
+    from GridCalEngine.Devices.Substation.bus import Bus
+    from GridCalEngine.Devices.Aggregation.area import Area
+    from GridCalEngine.Devices.Aggregation.zone import Zone
+    from GridCalEngine.Devices.Aggregation.country import Country
+    from GridCalEngine.Devices.Branches.hvdc_line import HvdcLine
+    from GridCalEngine.Devices.types import BRANCH_TYPES
+
+
+class InterAggregationInfo(EditableDevice):
+    """
+    Class to store information of inter area, inter country, etc
+    """
+
+    def __init__(self,
+                 valid: bool,
+                 lst_from: List[Tuple[int, Bus]],
+                 lst_to: List[Tuple[int, Bus]],
+                 lst_br: List[Tuple[int, BRANCH_TYPES, float]],
+                 lst_br_hvdc: List[Tuple[int, HvdcLine, float]],
+                 objects_from: List[Area | Zone | Country],
+                 objects_to: List[Area | Zone | Country],
+                 logger: Logger = Logger()):
+        """
+
+        :param valid:
+        :param lst_from: list of tuples bus idx, Bus in the areas from
+        :param lst_to: list of tuples bus idx, Bus in the areas to
+        :param lst_br: List of inter area Branches (branch index, branch object, flow sense w.r.t the area exchange),
+        :param lst_br_hvdc: List of inter area HVDC (branch index, branch object, flow sense w.r.t the area exchange),
+        :param objects_from:  List of areas from
+        :param objects_to: List of areas to
+        :param logger: Logger object
+        """
+        EditableDevice.__init__(self,
+                                name="",
+                                code="",
+                                idtag=None,
+                                device_type=DeviceType.InterAggregationInfo)
+
+        self.valid: float = valid
+
+        # store the bus index and the bus object ptr
+        self.lst_from: List[Tuple[int, Bus]] = lst_from
+        self.lst_to: List[Tuple[int, Bus]] = lst_to
+
+        # store the branch index, the branch ptr and the sense
+        self.lst_br: List[Tuple[int, BRANCH_TYPES, float]] = lst_br
+        self.lst_br_hvdc = lst_br_hvdc
+
+        self.objects_from: List[Area | Zone | Country] = objects_from
+        self.objects_to: List[Area | Zone | Country] = objects_to
+
+        self.logger = logger
+
+    @property
+    def idx_bus_from(self) -> IntVec:
+        """
+        Get bus of the aggregation "from" indices
+        :return: IntVec
+        """
+        return np.array([i for i, bus in self.lst_from])
+
+    @property
+    def idx_bus_to(self) -> IntVec:
+        """
+        Get bus of the aggregation "to" indices
+        :return: IntVec
+        """
+        return np.array([i for i, bus in self.lst_to])
+
+    @property
+    def idx_branches(self) -> IntVec:
+        """
+        Get array of tie-branches indices
+        :return: IntVec
+        """
+        return np.array([i for i, bus, sense in self.lst_br])
+
+    @property
+    def sense_branches(self) -> Vec:
+        """
+        Get array of tie-branch sense values (1 for from->to, -1 for to->from)
+        :return: IntVec
+        """
+        return np.array([sense for i, bus, sense in self.lst_br])
+
+    @property
+    def idx_hvdc(self) -> IntVec:
+        """
+
+        :return:
+        """
+        return np.array([i for i, bus, sense in self.lst_br_hvdc])
+
+    @property
+    def sense_hvdc(self) -> Vec:
+        """
+
+        :return:
+        """
+        return np.array([sense for i, bus, sense in self.lst_br_hvdc])

{GridCalEngine-5.1.29 → GridCalEngine-5.1.30}/GridCalEngine/Devices/assets.py

@@ -471,7 +471,7 @@ class Assets:
 
     def format_profiles(self, index: pd.DatetimeIndex):
         """
-        Format the pandas profiles in place using a time index.
+        Format the profiles in place using a time index.
         :param index: Time profile
         """
 
@@ -480,7 +480,7 @@ class Assets:
         for key, tpe in self.device_type_name_dict.items():
             elements = self.get_elements_by_type(device_type=tpe)
             for elm in elements:
-                elm.create_profiles(index)
+                elm.ensure_profiles_exist(index)
 
     def set_time_profile(self, unix_data: IntVec):
         """
@@ -605,7 +605,7 @@ class Assets:
                                device=obj.idtag)
         else:
             if self.time_profile is not None:
-                obj.create_profiles(self.time_profile)
+                obj.ensure_profiles_exist(self.time_profile)
             self._lines.append(obj)
 
         return obj
@@ -647,7 +647,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._dc_lines.append(obj)
 
     def delete_dc_line(self, obj: dev.DcLine):
@@ -701,7 +701,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._transformers2w.append(obj)
 
     def delete_transformer2w(self, obj: dev.Transformer2W):
@@ -755,7 +755,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._hvdc_lines.append(obj)
 
     def delete_hvdc_line(self, obj: dev.HvdcLine):
@@ -802,7 +802,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._vsc_devices.append(obj)
 
     def delete_vsc_converter(self, obj: dev.VSC):
@@ -842,7 +842,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._upfc_devices.append(obj)
 
     def delete_upfc_converter(self, obj: dev.UPFC):
@@ -889,7 +889,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._switch_devices.append(obj)
 
         return obj
@@ -946,7 +946,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._transformers3w.append(obj)
         if add_middle_bus:
             self.add_bus(obj.bus0)  # add the middle transformer
@@ -1009,7 +1009,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._windings.append(obj)
 
     def delete_winding(self, obj: dev.Winding):
@@ -1091,7 +1091,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._series_reactances.append(obj)
 
     def delete_series_reactance(self, obj: dev.SeriesReactance) -> None:
@@ -1176,7 +1176,7 @@ class Assets:
             obj = dev.Bus()
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
 
         self._buses.append(obj)
 
@@ -1392,7 +1392,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._voltage_levels.append(obj)
 
     def delete_voltage_level(self, obj: dev.VoltageLevel) -> None:
@@ -2039,7 +2039,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._pi_measurements.append(obj)
 
     def delete_pi_measurement(self, obj: dev.PiMeasurement) -> None:
@@ -2101,7 +2101,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._qi_measurements.append(obj)
 
     def delete_qi_measurement(self, obj: dev.QiMeasurement) -> None:
@@ -2164,7 +2164,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._vm_measurements.append(obj)
 
     def delete_vm_measurement(self, obj: dev.VmMeasurement) -> None:
@@ -2227,7 +2227,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._pf_measurements.append(obj)
 
     def delete_pf_measurement(self, obj: dev.PfMeasurement) -> None:
@@ -2290,7 +2290,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._qf_measurements.append(obj)
 
     def delete_qf_measurement(self, obj: dev.QfMeasurement) -> None:
@@ -2353,7 +2353,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._if_measurements.append(obj)
 
     def delete_if_measurement(self, obj: dev.IfMeasurement) -> None:
@@ -2617,7 +2617,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._branch_groups.append(obj)
 
     def delete_branch_group(self, obj: dev.BranchGroup) -> None:
@@ -2902,7 +2902,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._communities.append(obj)
 
     def delete_community(self, obj: dev.Community) -> None:
@@ -2973,7 +2973,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._regions.append(obj)
 
     def delete_region(self, obj: dev.Region) -> None:
@@ -3040,7 +3040,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._municipalities.append(obj)
 
     def delete_municipality(self, obj: dev.Municipality) -> None:
@@ -3453,7 +3453,7 @@ class Assets:
         """
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
         self._modelling_authorities.append(obj)
 
     def delete_modelling_authority(self, obj: dev.ModellingAuthority) -> None:
@@ -3745,7 +3745,7 @@ class Assets:
         self._fluid_nodes.append(obj)
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
 
     def delete_fluid_node(self, obj: dev.FluidNode):
         """
@@ -3804,7 +3804,7 @@ class Assets:
         self._fluid_paths.append(obj)
 
         if self.time_profile is not None:
-            obj.create_profiles(self.time_profile)
+            obj.ensure_profiles_exist(self.time_profile)
 
     def delete_fluid_path(self, obj: dev.FluidPath):
         """

{GridCalEngine-5.1.29 → GridCalEngine-5.1.30}/GridCalEngine/Devices/multi_circuit.py

@@ -32,7 +32,7 @@ from GridCalEngine.Devices.Parents.editable_device import EditableDevice
 from GridCalEngine.basic_structures import IntVec, Vec, Mat, CxVec, IntMat, CxMat
 
 import GridCalEngine.Devices as dev
-from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES
+from GridCalEngine.Devices.types import ALL_DEV_TYPES, INJECTION_DEVICE_TYPES, FLUID_TYPES, AREA_TYPES
 from GridCalEngine.basic_structures import Logger
 import GridCalEngine.Topology.topology as tp
 from GridCalEngine.Topology.topology_processor import TopologyProcessorInfo, process_grid_topology_at
@@ -1000,7 +1000,7 @@ class MultiCircuit(Assets):
 
         return logger
 
-    def import_bus_lat_lon(self, df: pd.DataFrame, bus_col, lat_col, lon_col) -> Logger:
+    def import_bus_lat_lon(self, df: pd.DataFrame, bus_col: str, lat_col: str, lon_col: str) -> Logger:
         """
         Import the buses' latitude and longitude
         :param df: Pandas DataFrame with the information
@@ -1051,7 +1051,7 @@ class MultiCircuit(Assets):
     def get_areas_buses(self, areas: List[dev.Area]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
-        :return:
+        :return: list of bus indices and bus ptr
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
@@ -1062,7 +1062,7 @@ class MultiCircuit(Assets):
     def get_zone_buses(self, zones: List[dev.Zone]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
-        :return:
+        :return: list of bus indices and bus ptr
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
@@ -1073,7 +1073,7 @@ class MultiCircuit(Assets):
     def get_country_buses(self, countries: List[dev.Country]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
-        :return:
+        :return: list of bus indices and bus ptr
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
@@ -1081,11 +1081,11 @@ class MultiCircuit(Assets):
                 lst.append((k, bus))
         return lst
 
-    def get_aggregation_buses(self, aggregations: List[dev.Country] | List[dev.Area] | List[dev.Zone]) -> List[Tuple[int, dev.Bus]]:
+    def get_aggregation_buses(self, aggregations: List[AREA_TYPES]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
         :param aggregations:
-        :return:
+        :return: list of bus indices and bus ptr
         """
         if len(aggregations) == 0:
             return list()
@@ -1234,6 +1234,57 @@ class MultiCircuit(Assets):
 
         return area_names, bus_area_indices, F, T, hvdc_F, hvdc_T
 
+    def get_inter_aggregation_info(self,
+                                   objects_from: List[AREA_TYPES],
+                                   objects_to: List[AREA_TYPES]) -> dev.InterAggregationInfo:
+        """
+        Get the lists that help defining the inter area objects
+        :param objects_from: list of objects from
+        :param objects_to: list of objects to
+        :return: InterAggregationInfo
+        """
+        logger = Logger()
+
+        if len(objects_from) == 0 or len(objects_to) == 0:
+            logger.add_error(msg=f'One of the lists has no elements')
+            return dev.InterAggregationInfo(valid=False, lst_from=[], lst_to=[], lst_br=[], lst_br_hvdc=[],
+                                            objects_from=[], objects_to=[], logger=logger)
+
+        # find the buses in the aggregation from
+        lst_from = self.get_aggregation_buses(objects_from)
+        buses_from_set = {x[1] for x in lst_from}
+
+        # find the buses in the aggregation to
+        lst_to = self.get_aggregation_buses(objects_to)
+        buses_to_set = {x[1] for x in lst_to}
+
+        buses_intersection = buses_from_set & buses_to_set
+
+        if len(buses_intersection) > 0:
+            dev_tpe_from = objects_from[0].device_type
+            dev_tpe_to = objects_to[0].device_type
+
+            for bus in buses_intersection:
+                logger.add_error(msg=f'Bus in both selected {dev_tpe_from.value} to {dev_tpe_to.value}',
+                                 device_class=bus.device_type.value,
+                                 device=bus.name)
+
+            return dev.InterAggregationInfo(valid=False, lst_from=[], lst_to=[], lst_br=[], lst_br_hvdc=[],
+                                            objects_from=[], objects_to=[], logger=logger)
+
+        # find the tie branches
+        lst_br = self.get_inter_buses_branches(buses_from_set, buses_to_set)
+        lst_br_hvdc = self.get_inter_buses_hvdc_branches(buses_from_set, buses_to_set)
+
+        return dev.InterAggregationInfo(valid=True,
+                                        lst_from=lst_from,
+                                        lst_to=lst_to,
+                                        lst_br=lst_br,
+                                        lst_br_hvdc=lst_br_hvdc,
+                                        objects_from=objects_from,
+                                        objects_to=objects_to,
+                                        logger=logger)
+
     def change_base(self, Sbase_new: float):
         """
         Change the elements base impedance
@@ -1744,7 +1795,7 @@ class MultiCircuit(Assets):
         # for each category
         # for key, template_elms_list in self.categorized_template_objects_dict.items():
 
-            # for each object type
+        # for each object type
         for template_elm in self.template_items():
 
             # get all objects of the type

{GridCalEngine-5.1.29 → GridCalEngine-5.1.30}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -373,6 +373,8 @@ def get_profile_from_dict(profile: Profile,
         else:
             arr = [collection.get(i, default_value) for i in data['dense_data']]
         profile.set(np.array(arr))
+
+    # mark as initialized
     profile.set_initialized()
 
 
@@ -1126,6 +1128,7 @@ def parse_object_type_from_json(template_elm: ALL_DEV_TYPES,
                                                               gc_prop=gc_prop,
                                                               elm=elm,
                                                               property_value=val)
+                                print()
 
                             elif gc_prop.tpe == int:
                                 # set the value directly