GridCal 5.1.28__tar.gz → 5.1.30__tar.gz

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/MainWindow.py

@@ -31,7 +31,7 @@ class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
         if not mainWindow.objectName():
             mainWindow.setObjectName(u"mainWindow")
-        mainWindow.resize(1346, 820)
+        mainWindow.resize(1249, 820)
         mainWindow.setBaseSize(QSize(0, 0))
         font = QFont()
         font.setPointSize(10)
@@ -3326,38 +3326,48 @@ class Ui_mainWindow(object):
         self.frame_34.setObjectName(u"frame_34")
         self.frame_34.setFrameShape(QFrame.NoFrame)
         self.frame_34.setFrameShadow(QFrame.Raised)
-        self.verticalLayout_29 = QVBoxLayout(self.frame_34)
-        self.verticalLayout_29.setObjectName(u"verticalLayout_29")
+        self.gridLayout_9 = QGridLayout(self.frame_34)
+        self.gridLayout_9.setObjectName(u"gridLayout_9")
         self.label_41 = QLabel(self.frame_34)
         self.label_41.setObjectName(u"label_41")
         self.label_41.setFont(font1)
 
-        self.verticalLayout_29.addWidget(self.label_41)
+        self.gridLayout_9.addWidget(self.label_41, 0, 0, 1, 1)
 
-        self.areaFromListView = QListView(self.frame_34)
-        self.areaFromListView.setObjectName(u"areaFromListView")
-        self.areaFromListView.setFont(font1)
+        self.fromComboBox = QComboBox(self.frame_34)
+        self.fromComboBox.setObjectName(u"fromComboBox")
 
-        self.verticalLayout_29.addWidget(self.areaFromListView)
+        self.gridLayout_9.addWidget(self.fromComboBox, 0, 1, 1, 1)
+
+        self.fromListView = QListView(self.frame_34)
+        self.fromListView.setObjectName(u"fromListView")
+        self.fromListView.setFont(font1)
+
+        self.gridLayout_9.addWidget(self.fromListView, 1, 0, 1, 2)
 
         self.splitter_2.addWidget(self.frame_34)
         self.frame_35 = QFrame(self.splitter_2)
         self.frame_35.setObjectName(u"frame_35")
         self.frame_35.setFrameShape(QFrame.NoFrame)
         self.frame_35.setFrameShadow(QFrame.Raised)
-        self.verticalLayout_19 = QVBoxLayout(self.frame_35)
-        self.verticalLayout_19.setObjectName(u"verticalLayout_19")
+        self.gridLayout_30 = QGridLayout(self.frame_35)
+        self.gridLayout_30.setObjectName(u"gridLayout_30")
         self.label_21 = QLabel(self.frame_35)
         self.label_21.setObjectName(u"label_21")
         self.label_21.setFont(font1)
 
-        self.verticalLayout_19.addWidget(self.label_21)
+        self.gridLayout_30.addWidget(self.label_21, 0, 0, 1, 1)
+
+        self.toComboBox = QComboBox(self.frame_35)
+        self.toComboBox.setObjectName(u"toComboBox")
+
+        self.gridLayout_30.addWidget(self.toComboBox, 0, 1, 1, 1)
 
-        self.areaToListView = QListView(self.frame_35)
-        self.areaToListView.setObjectName(u"areaToListView")
-        self.areaToListView.setFont(font1)
+        self.toListView = QListView(self.frame_35)
+        self.toListView.setObjectName(u"toListView")
+        self.toListView.setFont(font1)
 
-        self.verticalLayout_19.addWidget(self.areaToListView)
+        self.gridLayout_30.addWidget(self.toListView, 1, 0, 1, 2)
 
         self.splitter_2.addWidget(self.frame_35)
 
@@ -4427,7 +4437,7 @@ class Ui_mainWindow(object):
         mainWindow.setCentralWidget(self.centralwidget)
         self.menuBar = QMenuBar(mainWindow)
         self.menuBar.setObjectName(u"menuBar")
-        self.menuBar.setGeometry(QRect(0, 0, 1346, 21))
+        self.menuBar.setGeometry(QRect(0, 0, 1249, 21))
         self.menuBar.setFont(font)
         self.menuProject = QMenu(self.menuBar)
         self.menuProject.setObjectName(u"menuProject")

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/SubClasses/Model/objects.py

@@ -527,7 +527,7 @@ class ObjectsTableMain(DiagramsMain):
 
                 # update the view
                 self.view_objects_data()
-                self.update_area_combos()
+                self.update_from_to_list_views()
                 self.update_date_dependent_combos()
 
     def add_objects_to_current_diagram(self):
@@ -573,45 +573,45 @@ class ObjectsTableMain(DiagramsMain):
 
             if elm_type == DeviceType.SubstationDevice.value:
                 self.circuit.add_substation(dev.Substation(name=f'SE {self.circuit.get_substation_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.VoltageLevelDevice.value:
                 self.circuit.add_voltage_level(dev.VoltageLevel(
                     name=f'VL {self.circuit.get_voltage_levels_number() + 1}')
                 )
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.BusBarDevice.value:
                 self.circuit.add_bus_bar(dev.BusBar(name=f'BB {self.circuit.get_bus_bars_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.ZoneDevice.value:
                 self.circuit.add_zone(dev.Zone(name=f'Zone {self.circuit.get_zone_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.AreaDevice.value:
                 self.circuit.add_area(dev.Area(name=f'Area {self.circuit.get_area_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.CountryDevice.value:
                 self.circuit.add_country(dev.Country(name=f'Country {self.circuit.get_country_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.CommunityDevice.value:
                 self.circuit.add_community(dev.Community(
                     name=f'Community {self.circuit.get_communities_number() + 1}')
                 )
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.RegionDevice.value:
                 self.circuit.add_region(dev.Region(name=f'Region {self.circuit.get_regions_number() + 1}'))
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.MunicipalityDevice.value:
                 self.circuit.add_municipality(dev.Municipality(
                     name=f'Municipalities {self.circuit.get_municipalities_number() + 1}')
                 )
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
             elif elm_type == DeviceType.BusDevice.value:
                 self.circuit.add_bus(dev.Bus(name=f'Bus {self.circuit.get_bus_number() + 1}'))

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/SubClasses/Model/time_events.py

@@ -115,7 +115,7 @@ class TimeEventsMain(ObjectsTableMain):
                 self.circuit.delete_profiles()
                 self.ui.profiles_tableView.setModel(None)
                 self.update_date_dependent_combos()
-                self.update_area_combos()
+                self.update_from_to_list_views()
             else:
                 pass
         else:

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/SubClasses/base_gui.py

@@ -34,7 +34,7 @@ from PySide6 import QtGui, QtWidgets, QtCore
 # Engine imports
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
 import GridCalEngine.Simulations as sim
-from GridCalEngine.enumerations import EngineType
+from GridCalEngine.enumerations import EngineType, DeviceType
 from GridCalEngine.DataStructures.numerical_circuit import NumericalCircuit, compile_numerical_circuit_at
 
 from GridCalEngine.Compilers.circuit_to_bentayga import BENTAYGA_AVAILABLE
@@ -149,7 +149,7 @@ class BaseMainGui(QMainWindow):
 
         self.current_boundary_set: str = ""
 
-        # threads --------------------------------------------------------------------------------------------------
+        # threads ------------------------------------------------------------------------------------------------------
         self.painter = None
         self.open_file_thread_object = None
         self.save_file_thread_object = None
@@ -164,7 +164,7 @@ class BaseMainGui(QMainWindow):
         self.simulation_start_index: int = -1
         self.simulation_end_index: int = -1
 
-        # window pointers ------------------------------------------------------------------------------------------
+        # window pointers ----------------------------------------------------------------------------------------------
         self.file_sync_window: Union[SyncDialogueWindow, None] = None
         self.sigma_dialogue: Union[SigmaAnalysisGUI, None] = None
         self.grid_generator_dialogue: Union[GridGeneratorGUI, None] = None
@@ -181,7 +181,7 @@ class BaseMainGui(QMainWindow):
         self.contingency_checks_diag: Union[CheckListDialogue, None] = None
         self.start_end_dialogue_window: Union[StartEndSelectionDialogue, None] = None
 
-        # available engines
+        # available engines --------------------------------------------------------------------------------------------
         engine_lst = [EngineType.GridCal]
         if NEWTON_PA_AVAILABLE:
             engine_lst.append(EngineType.NewtonPA)
@@ -194,10 +194,19 @@ class BaseMainGui(QMainWindow):
         self.ui.engineComboBox.setCurrentIndex(0)
         self.engine_dict = {x.value: x for x in engine_lst}
 
-        # dark mode detection
+        # available engines --------------------------------------------------------------------------------------------
+        exchange_places = [DeviceType.AreaDevice, DeviceType.CountryDevice]
+        exchange_places_mdl = gf.get_list_model([x.value for x in exchange_places])
+        self.ui.fromComboBox.setModel(exchange_places_mdl)
+        self.ui.fromComboBox.setCurrentIndex(0)
+        self.ui.toComboBox.setModel(exchange_places_mdl)
+        self.ui.toComboBox.setCurrentIndex(0)
+        self.exchange_places_dict = {x.value: x for x in exchange_places}
+
+        # dark mode detection ------------------------------------------------------------------------------------------
         self.ui.dark_mode_checkBox.setChecked(IS_DARK)
 
-        # Console
+        # Console ------------------------------------------------------------------------------------------------------
         self.console: Union[ConsoleWidget, None] = None
         try:
             self.create_console()
@@ -206,7 +215,7 @@ class BaseMainGui(QMainWindow):
 
         self.calculation_inputs_to_display = None
 
-        # ----------------------------------------------------------------------------------------------------------
+        # --------------------------------------------------------------------------------------------------------------
         self.ui.actionClear_stuff_running_right_now.triggered.connect(self.clear_stuff_running)
         self.ui.actionAbout.triggered.connect(self.about_box)
         self.ui.actionAuto_rate_branches.triggered.connect(self.auto_rate_branches)
@@ -230,21 +239,9 @@ class BaseMainGui(QMainWindow):
 
         self.ui.grid_name_line_edit.textChanged.connect(self.change_circuit_name)
 
-    def add_data_to_circuit(self, filename):
-        df = self.catalogue_dialogue.read_csv_file(filename)
-        print(df.head())
-
-        if self.catalogue_dialogue.ui.checkBox.isChecked():
-            # or self.catalogue_dialogue.ui.checkBox_5.isChecked()
-            transformers = self.catalogue_dialogue.get_transformer_catalogue(df)
-            self.circuit.transformer_types += transformers
-
-        elif self.catalogue_dialogue.ui.checkBox_2.isChecked():
-            self.circuit.underground_cable_types += self.catalogue_dialogue.get_cables_catalogue(df)
-
-        elif self.catalogue_dialogue.ui.checkBox_3.isChecked():
-            # or self.catalogue_dialogue.ui.checkBox_6.isChecked()
-            self.circuit.sequence_line_types += self.catalogue_dialogue.get_sequence_lines_catalogue(df)
+        # comboboxes
+        self.ui.fromComboBox.currentTextChanged.connect(self.update_from_to_list_views)
+        self.ui.toComboBox.currentTextChanged.connect(self.update_from_to_list_views)
 
     def LOCK(self, val: bool = True) -> None:
         """
@@ -591,20 +588,23 @@ class BaseMainGui(QMainWindow):
         self.ui.vs_target_comboBox.setModel(mdl)
         self.setup_time_sliders()
 
-    def update_area_combos(self):
+    def update_from_to_list_views(self):
         """
-        Update the area dependent combos
+        Update the exchange area, countries, etc... dependent combos
         """
-        n = len(self.circuit.areas)
-        mdl1 = gf.get_list_model([str(elm) for elm in self.circuit.areas], checks=True)
-        mdl2 = gf.get_list_model([str(elm) for elm in self.circuit.areas], checks=True)
+        same_type = self.ui.fromComboBox.currentText() == self.ui.toComboBox.currentText()
+
+        devs_from = self.circuit.get_elements_by_type(self.exchange_places_dict[self.ui.fromComboBox.currentText()])
+        mdl1 = gf.get_list_model([str(elm) for elm in devs_from], checks=True)
+        self.ui.fromListView.setModel(mdl1)
 
-        self.ui.areaFromListView.setModel(mdl1)
-        self.ui.areaToListView.setModel(mdl2)
+        devs_to = self.circuit.get_elements_by_type(self.exchange_places_dict[self.ui.toComboBox.currentText()])
+        mdl2 = gf.get_list_model([str(elm) for elm in devs_to], checks=True)
+        self.ui.toListView.setModel(mdl2)
 
-        if n > 1:
-            self.ui.areaFromListView.model().item(0).setCheckState(QtCore.Qt.CheckState.Checked)
-            self.ui.areaToListView.model().item(1).setCheckState(QtCore.Qt.CheckState.Checked)
+        if len(devs_from) > 1 and same_type:
+            self.ui.fromListView.model().item(0).setCheckState(QtCore.Qt.CheckState.Checked)
+            self.ui.toListView.model().item(1).setCheckState(QtCore.Qt.CheckState.Checked)
 
     def fix_generators_active_based_on_the_power(self, ask_before=True):
         """

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/SubClasses/io.py

@@ -376,7 +376,7 @@ class IoMain(ConfigurationMain):
 
                 # update the drop-down menus that display dates
                 self.update_date_dependent_combos()
-                self.update_area_combos()
+                self.update_from_to_list_views()
 
                 # get the session tree structure
                 session_data_dict = self.open_file_thread_object.get_session_tree()
@@ -793,7 +793,7 @@ class IoMain(ConfigurationMain):
 
             # update the drop down menus that display dates
             self.update_date_dependent_combos()
-            self.update_area_combos()
+            self.update_from_to_list_views()
 
             # clear the results
             self.clear_results()

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -27,6 +27,7 @@ from PySide6 import QtGui, QtWidgets
 from matplotlib.colors import LinearSegmentedColormap
 import GridCal.Gui.GuiFunctions as gf
 import GridCal.Gui.Visualization.visualization as viz
+from GridCal.Gui.GeneralDialogues import LogsDialogue
 from GridCal.Gui.Diagrams.SchematicWidget.schematic_widget import SchematicWidget
 from GridCal.Gui.Diagrams.MapWidget.grid_map_widget import MapWidget
 from GridCal.Gui.messages import yes_no_question, error_msg, warning_msg, info_msg
@@ -43,6 +44,7 @@ from GridCalEngine.IO.file_system import get_create_gridcal_folder
 from GridCalEngine.IO.gridcal.remote import RemoteInstruction
 from GridCalEngine.DataStructures.numerical_circuit import compile_numerical_circuit_at
 from GridCalEngine.Simulations.types import DRIVER_OBJECTS
+from GridCalEngine.basic_structures import Logger
 from GridCalEngine.enumerations import (DeviceType, AvailableTransferMode, SolverType, MIPSolvers, TimeGrouping,
                                         ZonalGrouping, ContingencyMethod, InvestmentEvaluationMethod, EngineType,
                                         BranchImpedanceMode, ResultTypes, SimulationTypes, NodalCapacityMethod,
@@ -583,44 +585,31 @@ class SimulationsMain(TimeEventsMain):
         self.ui.resultsTableView.setModel(None)
         self.ui.resultsLogsTreeView.setModel(None)
 
-    def get_compatible_areas_from_to(self) -> Tuple[
-        bool,
-        List[Tuple[int, dev.Bus]],
-        List[Tuple[int, dev.Bus]],
-        List[Tuple[int, object, float]],
-        List[Tuple[int, object, float]],
-        List[dev.Area], List[dev.Area]]:
+    def get_compatible_from_to_buses_and_inter_branches(self) -> dev.InterAggregationInfo:
         """
         Get the lists that help defining the inter area objects
-        :return: success?,
-                 list of tuples bus idx, Bus in the areas from,
-                 list of tuples bus idx, Bus in the areas to,
-                 List of inter area Branches (branch index, branch object, flow sense w.r.t the area exchange),
-                 List of inter area HVDC (branch index, branch object, flow sense w.r.t the area exchange),
-                 List of areas from,
-                 List of areas to
-        """
-        areas_from_idx = gf.get_checked_indices(self.ui.areaFromListView.model())
-        areas_to_idx = gf.get_checked_indices(self.ui.areaToListView.model())
-        areas_from = [self.circuit.areas[i] for i in areas_from_idx]
-        areas_to = [self.circuit.areas[i] for i in areas_to_idx]
-
-        for a1 in areas_from:
-            if a1 in areas_to:
-                error_msg("The area from '{0}' is in the list of areas to. This cannot be.".format(a1.name),
-                          'Incompatible areas')
-                return False, [], [], [], [], [], []
-        for a2 in areas_to:
-            if a2 in areas_from:
-                error_msg("The area to '{0}' is in the list of areas from. This cannot be.".format(a2.name),
-                          'Incompatible areas')
-                return False, [], [], [], [], [], []
-
-        lst_from = self.circuit.get_areas_buses(areas_from)
-        lst_to = self.circuit.get_areas_buses(areas_to)
-        lst_br = self.circuit.get_inter_areas_branches(areas_from, areas_to)
-        lst_br_hvdc = self.circuit.get_inter_areas_hvdc_branches(areas_from, areas_to)
-        return True, lst_from, lst_to, lst_br, lst_br_hvdc, areas_from, areas_to
+        :return: InterAggregationInfo
+        """
+        dev_tpe_from = self.exchange_places_dict[self.ui.fromComboBox.currentText()]
+        devs_from = self.circuit.get_elements_by_type(dev_tpe_from)
+        from_idx = gf.get_checked_indices(self.ui.fromListView.model())
+        objects_from = [devs_from[i] for i in from_idx]
+
+        dev_tpe_to = self.exchange_places_dict[self.ui.toComboBox.currentText()]
+        devs_to = self.circuit.get_elements_by_type(dev_tpe_to)
+        to_idx = gf.get_checked_indices(self.ui.toListView.model())
+        objects_to = [devs_to[i] for i in to_idx]
+
+        info: dev.InterAggregationInfo = self.circuit.get_inter_aggregation_info(objects_from=objects_from,
+                                                                                 objects_to=objects_to)
+
+        if info.logger.has_logs():
+            # Show dialogue
+            dlg = LogsDialogue(name="Add selected DB objects to current diagram", logger=info.logger)
+            dlg.setModal(True)
+            dlg.exec()
+
+        return info
 
     def get_selected_power_flow_options(self) -> sim.PowerFlowOptions:
         """
@@ -1271,20 +1260,19 @@ class SimulationsMain(TimeEventsMain):
                 threshold = self.ui.atcThresholdSpinBox.value()
                 max_report_elements = 5  # TODO: self.ui.ntcReportLimitingElementsSpinBox.value()
                 # available transfer capacity inter areas
-                (compatible_areas, lst_from, lst_to, lst_br,
-                 lst_hvdc_br, areas_from, areas_to) = self.get_compatible_areas_from_to()
+                info: dev.InterAggregationInfo = self.get_compatible_from_to_buses_and_inter_branches()
 
-                if not compatible_areas:
+                if not info.valid:
                     return
 
-                idx_from = np.array([i for i, bus in lst_from])
-                idx_to = np.array([i for i, bus in lst_to])
-                idx_br = np.array([i for i, bus, sense in lst_br])
-                sense_br = np.array([sense for i, bus, sense in lst_br])
+                idx_from = info.idx_bus_from
+                idx_to = info.idx_bus_to
+                idx_br = info.idx_branches
+                sense_br = info.sense_branches
 
                 # HVDC
-                idx_hvdc_br = np.array([i for i, bus, sense in lst_hvdc_br])
-                sense_hvdc_br = np.array([sense for i, bus, sense in lst_hvdc_br])
+                idx_hvdc_br = info.idx_hvdc
+                sense_hvdc_br = info.sense_hvdc
 
                 if self.ui.usePfValuesForAtcCheckBox.isChecked():
                     pf_results = self.session.power_flow
@@ -1386,21 +1374,19 @@ class SimulationsMain(TimeEventsMain):
                     max_report_elements = 5  # TODO: self.ui.ntcReportLimitingElementsSpinBox.value()
 
                     # available transfer capacity inter areas
-                    (compatible_areas,
-                     lst_from, lst_to, lst_br,
-                     lst_hvdc_br, areas_from, areas_to) = self.get_compatible_areas_from_to()
+                    info: dev.InterAggregationInfo = self.get_compatible_from_to_buses_and_inter_branches()
 
-                    if not compatible_areas:
+                    if not info.valid:
                         return
 
-                    idx_from = np.array([i for i, bus in lst_from])
-                    idx_to = np.array([i for i, bus in lst_to])
-                    idx_br = np.array([i for i, bus, sense in lst_br])
-                    sense_br = np.array([sense for i, bus, sense in lst_br])
+                    idx_from = info.idx_bus_from
+                    idx_to = info.idx_bus_to
+                    idx_br = info.idx_branches
+                    sense_br = info.sense_branches
 
                     # HVDC
-                    idx_hvdc_br = np.array([i for i, bus, sense in lst_hvdc_br])
-                    sense_hvdc_br = np.array([sense for i, bus, sense in lst_hvdc_br])
+                    idx_hvdc_br = info.idx_hvdc
+                    sense_hvdc_br = info.sense_hvdc
 
                     if self.ui.usePfValuesForAtcCheckBox.isChecked():
                         pf_results = self.session.power_flow_ts
@@ -1520,19 +1506,19 @@ class SimulationsMain(TimeEventsMain):
 
                     if self.ui.atcRadioButton.isChecked():
                         use_alpha = True
-                        compatible_areas, lst_from, lst_to, lst_br, lst_hvdc_br, areas_from, areas_to = self.get_compatible_areas_from_to()
+                        info: dev.InterAggregationInfo = self.get_compatible_from_to_buses_and_inter_branches()
 
-                        if compatible_areas:
-                            idx_from = [i for i, bus in lst_from]
-                            idx_to = [i for i, bus in lst_to]
+                        if info.valid:
+                            idx_from = info.idx_bus_from
+                            idx_to = info.idx_bus_to
 
                             alpha_vec[idx_from] *= 2
                             alpha_vec[idx_to] *= -2
                             sel_bus_idx = np.zeros(0, dtype=int)  # for completeness
 
                             # HVDC
-                            idx_hvdc_br = np.array([i for i, bus, sense in lst_hvdc_br])
-                            sense_hvdc_br = np.array([sense for i, bus, sense in lst_hvdc_br])
+                            idx_hvdc_br = info.idx_hvdc
+                            sense_hvdc_br = info.sense_hvdc
                         else:
                             sel_bus_idx = np.zeros(0, dtype=int)  # for completeness
                             # incompatible areas...exit
@@ -1882,23 +1868,17 @@ class SimulationsMain(TimeEventsMain):
 
         # available transfer capacity inter areas
         if maximize_flows:
-            (compatible_areas, lst_from, lst_to,
-             lst_br, lst_hvdc_br, areas_from, areas_to) = self.get_compatible_areas_from_to()
-            idx_from = np.array([i for i, bus in lst_from])
-            idx_to = np.array([i for i, bus in lst_to])
+            inter_aggregation_info: dev.InterAggregationInfo = self.get_compatible_from_to_buses_and_inter_branches()
 
-            if len(idx_from) == 0:
+            if len(inter_aggregation_info.lst_from) == 0:
                 error_msg('The area "from" has no buses!')
                 return None
 
-            if len(idx_to) == 0:
+            if len(inter_aggregation_info.lst_to) == 0:
                 error_msg('The area "to" has no buses!')
                 return None
         else:
-            idx_from = None
-            idx_to = None
-            areas_from = None
-            areas_to = None
+            inter_aggregation_info = None
 
         ips_method = self.ips_solvers_dict[self.ui.ips_method_comboBox.currentText()]
         ips_tolerance = 1.0 / (10.0 ** self.ui.ips_tolerance_spinBox.value())
@@ -1917,10 +1897,7 @@ class SimulationsMain(TimeEventsMain):
                                               skip_generation_limits=skip_generation_limits,
                                               lodf_tolerance=lodf_tolerance,
                                               maximize_flows=maximize_flows,
-                                              area_from_bus_idx=idx_from,
-                                              area_to_bus_idx=idx_to,
-                                              areas_from=areas_from,
-                                              areas_to=areas_to,
+                                              inter_aggregation_info=inter_aggregation_info,
                                               unit_commitment=unit_commitment,
                                               export_model_fname=export_model_fname,
                                               generate_report=generate_report,
@@ -2097,16 +2074,15 @@ class SimulationsMain(TimeEventsMain):
         """
 
         # available transfer capacity inter areas
-        (compatible_areas, lst_from, lst_to, lst_br,
-         lst_hvdc_br, areas_from, areas_to) = self.get_compatible_areas_from_to()
+        info: dev.InterAggregationInfo = self.get_compatible_from_to_buses_and_inter_branches()
 
-        if not compatible_areas:
+        if not info.valid:
             error_msg('There are no compatible areas')
             return None
 
-        idx_from = np.array([i for i, bus in lst_from])
-        idx_to = np.array([i for i, bus in lst_to])
-        idx_br = np.array([i for i, bus, sense in lst_br])
+        idx_from = info.idx_bus_from
+        idx_to = info.idx_bus_to
+        idx_br = info.idx_branches
 
         if len(idx_from) == 0:
             error_msg('The area "from" has no buses!')

{GridCal-5.1.28 → GridCal-5.1.30}/GridCal/__version__.py

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

{GridCal-5.1.28 → GridCal-5.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCal
-Version: 5.1.28
+Version: 5.1.30
 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.