GridCal 5.3.40__tar.gz → 5.3.41__tar.gz

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/Diagrams/Editors/line_editor.py

@@ -238,8 +238,6 @@ class LineEditor(QDialog):
                 self.line.set_length(val=length)
                 self.line.set_circuit_idx(val=int(self.circuit_idx.value()), obj=self.selected_template)
                 template = self.selected_template
-                if isinstance(template, OverheadLineType):
-                    template.compute()
                 self.line.apply_template(obj=template, Sbase=self.Sbase, freq=self.frequency)
                 self.line.enable_auto_updates()
                 self.accept()

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/Diagrams/MapWidget/Substation/substation_graphic_item.py

@@ -656,18 +656,10 @@ class SubstationGraphicItem(NodeTemplate, QGraphicsRectItem):
                                 line.bus_to = recipient_buses[line.bus_to.Vnom]
                                 line_graphic = self.editor.graphics_manager.query(elm=line)
                                 line_graphic.calculate_total_length()
-                        for load in self.editor.circuit.loads:
-                            if load.bus in removed_buses:
-                                load.bus = recipient_buses[load.bus.Vnom]
-                        for gen in self.editor.circuit.generators:
-                            if gen.bus in removed_buses:
-                                gen.bus = recipient_buses[gen.bus.Vnom]
-                        for sh in self.editor.circuit.shunts:
-                            if sh.bus in removed_buses:
-                                sh.bus = recipient_buses[sh.bus.Vnom]
-                        for csh in self.editor.circuit.controllable_shunts:
-                            if csh.bus in removed_buses:
-                                csh.bus = recipient_buses[csh.bus.Vnom]
+
+                        for inj in self.editor.circuit.get_injection_devices_iter():
+                            if inj.bus in removed_buses:
+                                inj.bus = recipient_buses[inj.bus.Vnom]
 
                         for bus in removed_buses:
                             self.editor.circuit.delete_bus(obj=bus, delete_associated=False)

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/Diagrams/MapWidget/grid_map_widget.py

@@ -1807,7 +1807,7 @@ class GridMapWidget(BaseDiagramWidget):
                         bus_from=bus_from, bus_to=bus_to,
                         length=line1.length + line2.length, circuit_idx=circ_idx)
         new_line.color = line1.color
-        line1.template.compute()
+
         new_line.apply_template(obj=line1.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         previous_coordinates = [0, 0]
@@ -2058,14 +2058,8 @@ class GridMapWidget(BaseDiagramWidget):
                      protection_rating_factor=line_api.protection_rating_factor,
                      circuit_idx=line_api.circuit_idx)
 
-        if isinstance(line_api.template, OverheadLineType):
-            template = line_api.template
-            template.compute()
-        else:
-            template = line_api.template
-
-        line1.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
-        line2.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):
@@ -2490,14 +2484,8 @@ class GridMapWidget(BaseDiagramWidget):
                      protection_rating_factor=line_api.protection_rating_factor,
                      circuit_idx=line_api.circuit_idx)
 
-        if isinstance(line_api.template, OverheadLineType):
-            template = line_api.template
-            template.compute()
-        else:
-            template=line_api.template
-
-        line1.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
-        line2.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        line1.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        line2.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):
@@ -2538,13 +2526,7 @@ class GridMapWidget(BaseDiagramWidget):
                                protection_rating_factor=line_api.protection_rating_factor,
                                circuit_idx=line_api.circuit_idx)
 
-        if isinstance(line_api.template, OverheadLineType):
-            template = line_api.template
-            template.compute()
-        else:
-            template = line_api.template
-
-        connection_line.apply_template(template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
+        connection_line.apply_template(line_api.template, Sbase=self.circuit.Sbase, freq=self.circuit.fBase)
 
         # Copy other properties from the original line
         if hasattr(line_api, 'color'):

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/Main/SubClasses/simulations.py

@@ -310,7 +310,7 @@ class SimulationsMain(TimeEventsMain):
             self.ui.solver_comboBox.setModel(gf.get_list_model(list(self.solvers_dict.keys())))
             self.ui.solver_comboBox.setCurrentIndex(0)
 
-            mip_solvers = get_newton_mip_solvers_list()
+            mip_solvers = get_available_mip_solvers()
             self.ui.mip_solver_comboBox.setModel(gf.get_list_model(mip_solvers))
 
         elif eng == EngineType.NewtonPA:
@@ -1946,7 +1946,7 @@ class SimulationsMain(TimeEventsMain):
         """
         # get the power flow options from the GUI
         solver = self.lp_solvers_dict[self.ui.lpf_solver_comboBox.currentText()]
-        mip_solver = self.mip_solvers_dict[self.ui.mip_solver_comboBox.currentText()]
+        mip_solver = self.mip_solvers_dict.get(self.ui.mip_solver_comboBox.currentText(), MIPSolvers.HIGHS.value)
         time_grouping = self.opf_time_groups[self.ui.opf_time_grouping_comboBox.currentText()]
         zonal_grouping = self.opf_zonal_groups[self.ui.opfZonalGroupByComboBox.currentText()]
         pf_options = self.get_selected_power_flow_options()

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/TowerBuilder/LineBuilderDialogue.py

@@ -36,6 +36,11 @@ class TowerBuilderGUI(QtWidgets.QDialog):
         # create the tower driver
         self.tower_driver = TowerModel(edit_callback=self.compute, tower=tower)
 
+        self.ui.name_lineEdit.setText(self.tower_driver.tower.name)
+        self.ui.rho_doubleSpinBox.setValue(self.tower_driver.tower.earth_resistivity)
+        self.ui.frequency_doubleSpinBox.setValue(self.tower_driver.tower.frequency)
+        self.ui.voltage_doubleSpinBox.setValue(self.tower_driver.tower.Vnom)
+
         if wires_catalogue is not None:
             for wire in wires_catalogue:
                 self.wires_table.add(wire)
@@ -49,10 +54,6 @@ class TowerBuilderGUI(QtWidgets.QDialog):
         self.ui.matrixViewComboBox.addItem("Shunt admittance (no neutral) [μS/km]")
         self.ui.matrixViewComboBox.addItem("Shunt admittance (sequence) [μS/km]")
 
-        self.ui.name_lineEdit.setText(self.tower_driver.tower.name)
-        self.ui.rho_doubleSpinBox.setValue(self.tower_driver.tower.earth_resistivity)
-        self.ui.frequency_doubleSpinBox.setValue(self.tower_driver.tower.frequency)
-        self.ui.voltage_doubleSpinBox.setValue(self.tower_driver.tower.Vnom)
 
         # set models
         self.ui.wires_tableView.setModel(self.wires_table)

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Gui/TowerBuilder/table_models.py

@@ -267,9 +267,9 @@ class TowerModel(QtCore.QAbstractTableModel):
         QtCore.QAbstractTableModel.__init__(self)
 
         if tower is None:
-            self.tower = OverheadLineType()
+            self._tower = OverheadLineType()
         else:
-            self.tower = tower
+            self._tower = tower
 
         # other properties
         self.edit_callback = edit_callback
@@ -280,6 +280,10 @@ class TowerModel(QtCore.QAbstractTableModel):
         self.converter = {0: str, 1: float, 2: float, 3: int, 4: int, 5: str}
         self.editable_wire = [False, True, True, True, False, False]
 
+    @property
+    def tower(self) -> OverheadLineType:
+        return self._tower
+
     def __str__(self):
         return self.tower.name
 

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/Session/session.py

@@ -3,7 +3,6 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
-import numpy as np
 from uuid import uuid4
 import pandas as pd
 from PySide6.QtCore import QThread, Signal
@@ -11,10 +10,6 @@ from typing import Dict, Union, List, Tuple, Any, Generator
 from collections.abc import Callable
 from warnings import warn
 
-from GridCalEngine.Simulations import (ContingencyAnalysisOptions, AvailableTransferCapacityOptions,
-                                       ContinuationPowerFlowOptions, ContinuationPowerFlowInput, PowerFlowOptions,
-                                       ClusteringAnalysisOptions,
-                                       InvestmentsEvaluationOptions)
 from GridCalEngine.Simulations.ATC.available_transfer_capacity_driver import (AvailableTransferCapacityDriver,
                                                                               AvailableTransferCapacityResults)
 from GridCalEngine.Simulations.ATC.available_transfer_capacity_ts_driver import (
@@ -41,7 +36,7 @@ from GridCalEngine.Simulations.ShortCircuitStudies.short_circuit_driver import S
 from GridCalEngine.Simulations.Stochastic.stochastic_power_flow_driver import (StochasticPowerFlowDriver,
                                                                                StochasticPowerFlowResults)
 from GridCalEngine.Simulations.Clustering.clustering_driver import ClusteringDriver, ClusteringResults
-from GridCalEngine.Simulations.Stochastic.blackout_driver import CascadingResults, CascadingDriver
+from GridCalEngine.Simulations.Reliability.blackout_driver import CascadingResults, CascadingDriver
 from GridCalEngine.Simulations.InputsAnalysis.inputs_analysis_driver import InputsAnalysisResults, InputsAnalysisDriver
 from GridCalEngine.Simulations.InvestmentsEvaluation.investments_evaluation_driver import (InvestmentsEvaluationDriver,
                                                                                            InvestmentsEvaluationResults)
@@ -335,92 +330,6 @@ class SimulationSession:
 
         time_indices = data_dict.get('time_indices', grid.get_all_time_indices())
 
-        # # get the results' object dictionary
-        # if study_name == AvailableTransferCapacityDriver.tpe.value:
-        #     drv = AvailableTransferCapacityDriver(grid=grid,
-        #                                           options=AvailableTransferCapacityOptions())
-        #
-        # elif study_name == AvailableTransferCapacityTimeSeriesDriver.tpe.value:
-        #     drv = AvailableTransferCapacityTimeSeriesDriver(grid=grid,
-        #                                                     options=AvailableTransferCapacityOptions(),
-        #                                                     time_indices=time_indices,
-        #                                                     clustering_results=None)
-        #
-        # elif study_name == ContingencyAnalysisDriver.tpe.value:
-        #     drv = ContingencyAnalysisDriver(grid=grid,
-        #                                     options=ContingencyAnalysisOptions())
-        #
-        # elif study_name == ContingencyAnalysisTimeSeriesDriver.tpe.value:
-        #     drv = ContingencyAnalysisTimeSeriesDriver(grid=grid,
-        #                                               options=ContingencyAnalysisOptions(),
-        #                                               time_indices=time_indices,
-        #                                               clustering_results=None)
-        #
-        # elif study_name == ContinuationPowerFlowDriver.tpe.value:
-        #     n = grid.get_bus_number()
-        #     drv = ContinuationPowerFlowDriver(grid=grid,
-        #                                       options=ContinuationPowerFlowOptions(),
-        #                                       inputs=ContinuationPowerFlowInput(
-        #                                           Sbase=np.zeros(n), Vbase=np.zeros(n), Starget=np.zeros(n)
-        #                                       ),
-        #                                       pf_options=PowerFlowOptions(),
-        #                                       opf_results=None)
-        #
-        # elif study_name == LinearAnalysisDriver.tpe.value:
-        #     drv = LinearAnalysisDriver(grid=grid, options=None)
-        #
-        # elif study_name == ContinuationPowerFlowDriver.tpe.value:
-        #     drv = LinearAnalysisTimeSeriesDriver(grid=grid,
-        #                                          options=None,
-        #                                          time_indices=time_indices,
-        #                                          clustering_results=None)
-        #
-        # elif study_name == OptimalPowerFlowDriver.tpe.value:
-        #     drv = OptimalPowerFlowDriver(grid=grid, options=None)
-        #
-        # elif study_name == OptimalPowerFlowTimeSeriesDriver.tpe.value:
-        #     drv = OptimalPowerFlowTimeSeriesDriver(grid=grid,
-        #                                            options=None,
-        #                                            time_indices=time_indices,
-        #                                            clustering_results=None)
-        #
-        # elif study_name == NodalCapacityTimeSeriesDriver.tpe.value:
-        #     drv = NodalCapacityTimeSeriesDriver(grid=grid,
-        #                                         options=None,
-        #                                         time_indices=time_indices,
-        #                                         clustering_results=None)
-        #
-        # elif study_name == PowerFlowDriver.tpe.value:
-        #     drv = PowerFlowDriver(grid=grid, options=PowerFlowOptions())
-        #
-        # elif study_name == PowerFlowTimeSeriesDriver.tpe.value:
-        #     drv = PowerFlowTimeSeriesDriver(grid=grid,
-        #                                     options=PowerFlowOptions(),
-        #                                     time_indices=time_indices,
-        #                                     clustering_results=None)
-        #
-        # elif study_name == ShortCircuitDriver.tpe.value:
-        #     drv = ShortCircuitDriver(grid=grid,
-        #                              options=None,
-        #                              pf_options=None,
-        #                              pf_results=None,
-        #                              opf_results=None)
-        #
-        # elif study_name == StochasticPowerFlowDriver.tpe.value:
-        #     drv = StochasticPowerFlowDriver(grid=grid, options=PowerFlowOptions())
-        #
-        # elif study_name == ClusteringDriver.tpe.value:
-        #     drv = ClusteringDriver(grid=grid, options=ClusteringAnalysisOptions(0))
-        #
-        # elif study_name == InvestmentsEvaluationDriver.tpe.value:
-        #     drv = InvestmentsEvaluationDriver(grid=grid,
-        #                                       options=InvestmentsEvaluationOptions(max_eval=0,
-        #                                                                            pf_options=PowerFlowOptions()), )
-        #
-        # else:
-        #     warn(f"Session {study_name} not implemented for disk retrieval :/")
-        #     return logger
-
         driver_tpe = SimulationTypes(study_name)
 
         drv: DRIVER_OBJECTS | None = create_driver(

{gridcal-5.3.40 → gridcal-5.3.41}/GridCal/__version__.py

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

{gridcal-5.3.40 → gridcal-5.3.41}/PKG-INFO

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