GridCalEngine 5.1.28__tar.gz → 5.1.29__tar.gz

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

@@ -14,6 +14,7 @@
 # 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
 
 import os
 import cmath
@@ -1047,66 +1048,86 @@ class MultiCircuit(Assets):
                 lst[k] = 0
         return lst
 
-    def get_area_buses(self, area: dev.Area) -> List[Tuple[int, dev.Bus]]:
+    def get_areas_buses(self, areas: List[dev.Area]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
         :return:
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
-            if bus.area == area:
+            if bus.area in areas:
                 lst.append((k, bus))
         return lst
 
-    def get_areas_buses(self, areas: List[dev.Area]) -> List[Tuple[int, dev.Bus]]:
+    def get_zone_buses(self, zones: List[dev.Zone]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
         :return:
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
-            if bus.area in areas:
+            if bus.zone in zones:
                 lst.append((k, bus))
         return lst
 
-    def get_zone_buses(self, zone: dev.Zone) -> List[Tuple[int, dev.Bus]]:
+    def get_country_buses(self, countries: List[dev.Country]) -> List[Tuple[int, dev.Bus]]:
         """
         Get the selected buses
         :return:
         """
         lst: List[Tuple[int, dev.Bus]] = list()
         for k, bus in enumerate(self._buses):
-            if bus.zone == zone:
+            if bus.country in countries:
                 lst.append((k, bus))
         return lst
 
-    def get_inter_area_branches(self, a1: dev.Area, a2: dev.Area):
+    def get_aggregation_buses(self, aggregations: List[dev.Country] | List[dev.Area] | List[dev.Zone]) -> List[Tuple[int, dev.Bus]]:
         """
-        Get the inter-area Branches
+        Get the selected buses
+        :param aggregations:
+        :return:
+        """
+        if len(aggregations) == 0:
+            return list()
+
+        if isinstance(aggregations[0], dev.Area):
+            return self.get_areas_buses(aggregations)
+
+        if isinstance(aggregations[0], dev.Zone):
+            return self.get_zone_buses(aggregations)
+
+        if isinstance(aggregations[0], dev.Country):
+            return self.get_country_buses(aggregations)
+
+        raise TypeError("Aggregation type not supported")
+
+    def get_inter_areas_branches(self, a1: List[dev.Area], a2: List[dev.Area]) -> List[Tuple[int, object, float]]:
+        """
+        Get the inter-area Branches. HVDC Branches are not considered
         :param a1: Area from
         :param a2: Area to
         :return: List of (branch index, branch object, flow sense w.r.t the area exchange)
         """
         lst: List[Tuple[int, object, float]] = list()
-        for k, branch in enumerate(self.get_branches()):
-            if branch.bus_from.area == a1 and branch.bus_to.area == a2:
+        for k, branch in enumerate(self.get_branches_wo_hvdc()):
+            if branch.bus_from.area in a1 and branch.bus_to.area in a2:
                 lst.append((k, branch, 1.0))
-            elif branch.bus_from.area == a2 and branch.bus_to.area == a1:
+            elif branch.bus_from.area in a2 and branch.bus_to.area in a1:
                 lst.append((k, branch, -1.0))
         return lst
 
-    def get_inter_areas_branches(self, a1: List[dev.Area], a2: List[dev.Area]) -> List[Tuple[int, object, float]]:
+    def get_inter_buses_branches(self, a1: Set[dev.Bus], a2: Set[dev.Bus]) -> List[Tuple[int, object, float]]:
         """
-        Get the inter-area Branches. HVDC Branches are not considered
-        :param a1: Area from
-        :param a2: Area to
+        Get the inter-buese Branches. HVDC Branches are not considered
+        :param a1: Group of Buses 1
+        :param a2: Group of Buses 1
         :return: List of (branch index, branch object, flow sense w.r.t the area exchange)
         """
         lst: List[Tuple[int, object, float]] = list()
         for k, branch in enumerate(self.get_branches_wo_hvdc()):
-            if branch.bus_from.area in a1 and branch.bus_to.area in a2:
+            if branch.bus_from in a1 and branch.bus_to in a2:
                 lst.append((k, branch, 1.0))
-            elif branch.bus_from.area in a2 and branch.bus_to.area in a1:
+            elif branch.bus_from in a2 and branch.bus_to in a1:
                 lst.append((k, branch, -1.0))
         return lst
 
@@ -1125,6 +1146,21 @@ class MultiCircuit(Assets):
                 lst.append((k, branch, -1.0))
         return lst
 
+    def get_inter_buses_hvdc_branches(self, a1: Set[dev.Bus], a2: Set[dev.Bus]) -> List[Tuple[int, object, float]]:
+        """
+        Get the inter-area Branches
+        :param a1: Group of Buses 1
+        :param a2: Group of Buses 1
+        :return: List of (branch index, branch object, flow sense w.r.t the area exchange)
+        """
+        lst: List[Tuple[int, object, float]] = list()
+        for k, branch in enumerate(self._hvdc_lines):
+            if branch.bus_from in a1 and branch.bus_to in a2:
+                lst.append((k, branch, 1.0))
+            elif branch.bus_from in a2 and branch.bus_to in a1:
+                lst.append((k, branch, -1.0))
+        return lst
+
     def get_inter_zone_branches(self, z1: dev.Zone, z2: dev.Zone) -> List[Tuple[int, object, float]]:
         """
         Get the inter-area Branches

{GridCalEngine-5.1.28 → GridCalEngine-5.1.29}/GridCalEngine/Simulations/ATC/available_transfer_capacity_driver.py

@@ -452,7 +452,7 @@ class AvailableTransferCapacityResults(ResultsTemplate):
         if result_type == ResultTypes.AvailableTransferCapacityReport:
             data = np.array(self.report)
             y_label = ''
-            title, _ = result_type.value
+            title = result_type.value
 
             return ResultsTable(data=np.array(self.report),
                                 index=self.report_indices,

{GridCalEngine-5.1.28 → GridCalEngine-5.1.29}/GridCalEngine/Simulations/ATC/available_transfer_capacity_options.py

@@ -102,7 +102,6 @@ class AvailableTransferCapacityOptions(OptionsTemplate):
         self.register(key="inter_area_branch_sense", tpe=SubObjectType.Array)
         self.register(key="Pf", tpe=SubObjectType.Array)
         self.register(key="idx_hvdc_br", tpe=SubObjectType.Array)
-        self.register(key="use_provided_flows", tpe=SubObjectType.Array)
         self.register(key="inter_area_hvdc_branch_sense", tpe=SubObjectType.Array)
         self.register(key="Pf_hvdc", tpe=SubObjectType.Array)
 

{GridCalEngine-5.1.28 → GridCalEngine-5.1.29}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.28"
+__GridCalEngine_VERSION__ = "5.1.29"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.28 → GridCalEngine-5.1.29}/PKG-INFO

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