VeraGrid 5.6.2__tar.gz → 5.6.4__tar.gz

{veragrid-5.6.2 → veragrid-5.6.4}/PKG-INFO

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

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/CoordinatesInput/coordinates_dialogue.py

@@ -438,26 +438,34 @@ class CoordinatesInputGUI(QtWidgets.QDialog):
             if self.ui.longitudeCheckBox.isChecked():
                 bus.longitude = self.associations.get_longitude_at(i)
 
+                if bus.substation is not None:
+                    if bus.substation.longitude == 0.0:
+                        bus.substation.longitude = bus.longitude
+
             if self.ui.latitudeCheckBox.isChecked():
                 bus.latitude = self.associations.get_latitude_at(i)
 
-        self.close()
-
+                if bus.substation is not None:
+                    if bus.substation.latitude == 0.0:
+                        bus.substation.latitude = bus.latitude
 
-if __name__ == "__main__":
-    app = QtWidgets.QApplication(sys.argv)
-
-    class TestObj:
-        def __init__(self, name, code, x=0, y=0, latitude=0, longitude=0):
-            self.name = name
-            self.code = code
-            self.x = x
-            self.y = y
-            self.latitude = latitude
-            self.longitude = longitude
+        self.close()
 
 
-    window = CoordinatesInputGUI(list_of_objects=[TestObj('Test object', 'code')] * 10)
-    window.resize(1.61 * 700.0, 600.0)  # golden ratio
-    window.show()
-    sys.exit(app.exec())
+# if __name__ == "__main__":
+#     app = QtWidgets.QApplication(sys.argv)
+#
+#     class TestObj:
+#         def __init__(self, name, code, x=0, y=0, latitude=0, longitude=0):
+#             self.name = name
+#             self.code = code
+#             self.x = x
+#             self.y = y
+#             self.latitude = latitude
+#             self.longitude = longitude
+#
+#
+#     window = CoordinatesInputGUI(list_of_objects=[TestObj('Test object', 'code')] * 10)
+#     window.resize(1.61 * 700.0, 600.0)  # golden ratio
+#     window.show()
+#     sys.exit(app.exec())

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/Diagrams/SchematicWidget/diagram_bus_selection_dialogue.py

@@ -3,14 +3,13 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 from __future__ import annotations
-from typing import List, Union, Any, TYPE_CHECKING
-from PySide6 import QtCore, QtGui, QtWidgets
-from PySide6.QtWidgets import (QApplication, QDialog, QTableView, QVBoxLayout, QPushButton, QHBoxLayout,
-                               QLabel, QComboBox, QSpacerItem, QSizePolicy)
+from typing import List, TYPE_CHECKING
+from PySide6 import QtWidgets
+from PySide6.QtWidgets import (QVBoxLayout, QPushButton)
 
 from VeraGrid.Gui.Diagrams.SchematicWidget.schematic_widget import (SchematicWidget, make_diagram_from_buses,
                                                                     SchematicDiagram)
-from VeraGridEngine.Devices.Substation.substation import Substation
+from VeraGridEngine.Devices.Substation.substation import Substation, DeviceType
 from VeraGridEngine.Devices.Substation.bus import Bus
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 
@@ -38,7 +37,7 @@ class DiagramBusSelectorDialogue(QtWidgets.QDialog):
 
         self.layout = QVBoxLayout(self)
 
-        selected_buses = grid.get_buses_from_objects(elements=[substation])
+        selected_buses = grid.get_buses_from_objects(elements=[substation], dtype=DeviceType.SubstationDevice)
 
         if len(selected_buses):
             diagram = make_diagram_from_buses(circuit=grid,

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -4735,7 +4735,7 @@ class SchematicWidget(BaseDiagramWidget):
         vl_wizard.setModal(True)
         vl_wizard.exec()  # waits until closed
 
-        if vl_wizard.closed_ok is not None:
+        if vl_wizard.closed_ok:
             (new_buses,
              conn_buses,
              associated_branches,

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/GridReduce/grid_reduce.py

@@ -10,15 +10,16 @@ import numpy as np
 from VeraGrid.Gui.GridReduce.grid_reduce_gui import Ui_ReduceDialog
 from VeraGrid.Gui.general_dialogues import LogsDialogue
 from VeraGrid.Gui.messages import yes_no_question, warning_msg
-from VeraGrid.Gui.gui_functions import get_list_model
+from VeraGrid.Gui.gui_functions import get_list_model, enums_to_model
 from VeraGrid.Session.session import SimulationSession
 from VeraGridEngine.Devices.Substation.bus import Bus
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 from VeraGridEngine.Topology.GridReduction.di_shi_grid_reduction import di_shi_reduction
-from VeraGridEngine.Topology.GridReduction.ptdf_grid_reduction import ptdf_reduction, ptdf_reduction_projected, ptdf_reduction_ree_bad, ptdf_reduction_ree_less_bad
+from VeraGridEngine.Topology.GridReduction.ptdf_grid_reduction import ptdf_reduction, ptdf_reduction_projected, \
+    ptdf_reduction_ree_bad, ptdf_reduction_ree_less_bad
 from VeraGridEngine.Topology.GridReduction.ward_equivalents import ward_standard_reduction
 from VeraGridEngine.basic_structures import Logger
-from VeraGridEngine.enumerations import GridReductionMethod
+from VeraGridEngine.enumerations import GridReductionMethod, BusReductionMethod
 
 
 class GridReduceDialogue(QtWidgets.QDialog):
@@ -44,12 +45,18 @@ class GridReduceDialogue(QtWidgets.QDialog):
 
         self.ui.listView.setModel(get_list_model(list(selected_buses_set)))
 
-        methods = [GridReductionMethod.PTDF,
-                   GridReductionMethod.PTDFProjected,
-                   GridReductionMethod.DiShi,
-                   GridReductionMethod.Ward]
-        self.methods_dict = {m.value: m for m in methods}
-        self.ui.methodComboBox.setModel(get_list_model([m.value for m in methods]))
+        self.methods_dict, methods_mdl = enums_to_model(
+            [GridReductionMethod.PTDF,
+             GridReductionMethod.PTDFProjected,
+             GridReductionMethod.DiShi,
+             GridReductionMethod.Ward]
+        )
+        self.ui.methodComboBox.setModel(methods_mdl)
+
+        self.bus_methods_dict, bus_methods_mdl = enums_to_model(
+            [BusReductionMethod.Reduce, BusReductionMethod.Keep]
+        )
+        self.ui.busModeComboBox.setModel(bus_methods_mdl)
 
         self._grid: MultiCircuit = grid
         self._session: SimulationSession = session
@@ -59,7 +66,7 @@ class GridReduceDialogue(QtWidgets.QDialog):
 
         self.ui.reduceButton.clicked.connect(self.reduce_grid)
 
-    def reduce_grid(self):
+    def reduce_grid(self) -> None:
         """
         The elements of the grid will be added with new idtags.
         This is useful in the case you want to compose a new grid from grids that are the same.
@@ -67,21 +74,39 @@ class GridReduceDialogue(QtWidgets.QDialog):
         """
         if len(self._selected_buses_set):
 
-            method: GridReductionMethod = self.methods_dict[self.ui.methodComboBox.currentText()]
+            reduction_method: GridReductionMethod = self.methods_dict[self.ui.methodComboBox.currentText()]
+            bus_mode: BusReductionMethod = self.bus_methods_dict[self.ui.busModeComboBox.currentText()]
+
+            if bus_mode == BusReductionMethod.Reduce:
+                text = f"This will delete the selected buses and reintroduce their influence."
+            else:
+                text = "This will keep the selected buses and delete all others, reintroducing their influence."
+
+            text += f"using the {reduction_method.value} equivalent. "
+            "This cannot be undone and it is dangerous if you don't know"
+            "what you are doing \nAre you sure?"
 
             ok = yes_no_question(
-                text="This will delete the selected buses and reintroduce their influence"
-                     "using the Ward equivalent. This cannot be undone and it is dangerous if you don't know"
-                     "what you are doing \nAre you sure?",
+                text=text,
                 title="Grid reduction?")
 
             if ok:
 
-                # convert the set of buses to bus indices
-                reduction_bus_indices = np.array([self._grid.buses.index(b) for b in self._selected_buses_set],
-                                                 dtype=int)
+                if bus_mode == BusReductionMethod.Reduce:
+                    # convert the set of buses to bus indices
+                    reduction_bus_indices = np.array([self._grid.buses.index(b)
+                                                      for b in self._selected_buses_set],
+                                                     dtype=int)
+
+                elif bus_mode == BusReductionMethod.Keep:
+                    # the the other buses that are not in the set
+                    reduction_bus_indices = np.array([i for i in range(self._grid.get_bus_number())
+                                                      if self._grid.buses[i] not in self._selected_buses_set],
+                                                     dtype=int)
+                else:
+                    raise NotImplementedError(f"BusReductionMethod not implemented: {bus_mode.value}")
 
-                if method == GridReductionMethod.DiShi:
+                if reduction_method == GridReductionMethod.DiShi:
 
                     # get the previous power flow
                     _, pf_res = self._session.power_flow
@@ -97,7 +122,7 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         V0=pf_res.voltage
                     )
 
-                elif method == GridReductionMethod.Ward:
+                elif reduction_method == GridReductionMethod.Ward:
 
                     # get the previous power flow
                     _, pf_res = self._session.power_flow
@@ -113,7 +138,7 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         V0=pf_res.voltage,
                     )
 
-                elif method == GridReductionMethod.PTDF:
+                elif reduction_method == GridReductionMethod.PTDF:
 
                     # NOTE: self._grid gets reduced in-place
                     grid_reduced, logger = ptdf_reduction(
@@ -121,16 +146,16 @@ class GridReduceDialogue(QtWidgets.QDialog):
                         reduction_bus_indices=reduction_bus_indices,
                     )
 
-                elif method == GridReductionMethod.PTDFProjected:
+                elif reduction_method == GridReductionMethod.PTDFProjected:
 
                     # NOTE: self._grid gets reduced in-place
-                    
+
                     # get the options from the linear analysis driver
                     lin_drv, _ = self._session.linear_power_flow
                     distribute_slack = True
                     if lin_drv is not None:
                         distribute_slack = lin_drv.options.distribute_slack
-                    
+
                     grid_reduced, logger = ptdf_reduction_projected(
                         grid=self._grid,
                         reduction_bus_indices=reduction_bus_indices,

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/GridReduce/grid_reduce_gui.py

@@ -48,6 +48,11 @@ class Ui_ReduceDialog(object):
         self.horizontalLayout = QHBoxLayout(self.frame)
         self.horizontalLayout.setObjectName(u"horizontalLayout")
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.busModeComboBox = QComboBox(self.frame)
+        self.busModeComboBox.setObjectName(u"busModeComboBox")
+
+        self.horizontalLayout.addWidget(self.busModeComboBox)
+
         self.methodComboBox = QComboBox(self.frame)
         self.methodComboBox.setObjectName(u"methodComboBox")
 
@@ -73,6 +78,8 @@ class Ui_ReduceDialog(object):
 
     def retranslateUi(self, ReduceDialog):
         ReduceDialog.setWindowTitle(QCoreApplication.translate("ReduceDialog", u"Grid Merge", None))
+        self.busModeComboBox.setPlaceholderText(QCoreApplication.translate("ReduceDialog", u"Buses", None))
+        self.methodComboBox.setPlaceholderText(QCoreApplication.translate("ReduceDialog", u"Method", None))
 #if QT_CONFIG(tooltip)
         self.reduceButton.setToolTip(QCoreApplication.translate("ReduceDialog", u"Aply the selected changes", None))
 #endif // QT_CONFIG(tooltip)

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/Main/SubClasses/Model/data_base.py

@@ -407,7 +407,7 @@ class DataBaseTableMain(DiagramsMain):
             source_model = proxy_model.sourceModel()
 
             sel_idx = self.ui.dataStructureTableView.selectedIndexes()
-            objects = source_model.objects if hasattr(source_model, 'objects') else []
+            objects: List[ALL_DEV_TYPES] = source_model.objects if hasattr(source_model, 'objects') else []
 
             if len(objects) > 0:
 
@@ -419,7 +419,8 @@ class DataBaseTableMain(DiagramsMain):
                         sel_obj: ALL_DEV_TYPES = source_model.objects[idx]
                         selected_objects.append(sel_obj)
 
-                    buses = self.circuit.get_buses_from_objects(elements=selected_objects)
+                    buses = self.circuit.get_buses_from_objects(elements=selected_objects,
+                                                                dtype=objects[0].device_type)
 
         return buses, selected_objects
 
@@ -699,8 +700,19 @@ class DataBaseTableMain(DiagramsMain):
             self.grid_reduction_dialogue.exec()
 
             if self.grid_reduction_dialogue.did_reduce:
+
+                # delete from the diagrams
                 self.delete_from_all_diagrams(elements=list(selected_buses))
 
+                # update the view
+                self.view_objects_data()
+                self.update_from_to_list_views()
+                self.update_date_dependent_combos()
+            else:
+                self.show_warning_toast("No reduction done")
+        else:
+            self.show_warning_toast("Select some elements first")
+
     def grid_reduction_from_schematic_selection(self):
         """
         Call the grid reduction dialogue on the schematic selection
@@ -1011,8 +1023,6 @@ class DataBaseTableMain(DiagramsMain):
                         #     # update event
                         #     self.circuit.rms_events[idx] = self.rms_events_Editor_window.get_updated_event()
 
-
-
                     else:
 
                         warning_msg('No editor available.\n'

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/Main/SubClasses/Model/diagrams.py

@@ -1365,7 +1365,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.PowerFlowTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1382,7 +1382,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.StateEstimationDriver.tpe.value:
             if t_idx is None:
@@ -1398,7 +1398,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.ContinuationPowerFlowDriver.tpe.value:
             if t_idx is None:
@@ -1415,7 +1415,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.StochasticPowerFlowDriver.tpe.value:
 
@@ -1445,7 +1445,7 @@ class DiagramsMain(CompiledArraysMain):
                                   max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalPowerFlowDriver.tpe.value:
             if t_idx is None:
@@ -1460,7 +1460,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalPowerFlowTimeSeriesDriver.tpe.value:
 
@@ -1479,7 +1479,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.NodalCapacityTimeSeriesDriver.tpe.value:
 
@@ -1507,7 +1507,7 @@ class DiagramsMain(CompiledArraysMain):
                                      max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.LinearAnalysisTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1525,7 +1525,7 @@ class DiagramsMain(CompiledArraysMain):
                                         max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.ContingencyAnalysisDriver.tpe.value:
 
@@ -1544,7 +1544,7 @@ class DiagramsMain(CompiledArraysMain):
 
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.ContingencyAnalysisTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1562,7 +1562,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.AvailableTransferCapacityDriver.tpe.value:
             self.default_colouring(t_idx=t_idx,
@@ -1599,7 +1599,7 @@ class DiagramsMain(CompiledArraysMain):
                                    max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} only has values for the snapshot")
+                    self.show_warning_toast(f"{current_study} only has values for the snapshot")
 
         elif current_study == sim.OptimalNetTransferCapacityTimeSeriesDriver.tpe.value:
             if t_idx is not None:
@@ -1617,7 +1617,7 @@ class DiagramsMain(CompiledArraysMain):
                                       max_bus_width=max_bus_width)
             else:
                 if allow_popups:
-                    info_msg(f"{current_study} does not have values for the snapshot")
+                    self.show_warning_toast(f"{current_study} does not have values for the snapshot")
 
         elif current_study == sim.InputsAnalysisDriver.tpe.value:
 
@@ -1964,7 +1964,8 @@ class DiagramsMain(CompiledArraysMain):
                      title="Substations schematic")
             return
 
-        selected_buses = self.circuit.get_buses_from_objects(elements=substations)
+        selected_buses = self.circuit.get_buses_from_objects(elements=substations,
+                                                             dtype=DeviceType.SubstationDevice)
 
         if len(selected_buses):
             diagram = make_diagram_from_buses(circuit=self.circuit,
@@ -2005,7 +2006,8 @@ class DiagramsMain(CompiledArraysMain):
             self.show_error_toast("The current diagram is not a schematic :(")
             return
 
-        selected_buses = self.circuit.get_buses_from_objects(elements=substations)
+        selected_buses = self.circuit.get_buses_from_objects(elements=substations,
+                                                             dtype=DeviceType.SubstationDevice)
 
         if len(selected_buses):
             diagram_widget.add_buses(selected_buses)

{veragrid-5.6.2 → veragrid-5.6.4}/VeraGrid/Gui/Main/SubClasses/Model/time_events.py

@@ -158,8 +158,10 @@ class TimeEventsMain(DataBaseTableMain):
                                         if self.profile_input_dialogue.has_profile(i):
                                             # if there was a profile, we want the generator not dispatchable
                                             elm.enabled_dispatch = False
+                                            elm.enabled_dispatch_prof.fill(False)
                                         else:
                                             elm.enabled_dispatch = True
+                                            elm.enabled_dispatch_prof.fill(True)
 
                                     self.show_info_toast("Generators dispatchable status set")
 
@@ -203,6 +205,8 @@ class TimeEventsMain(DataBaseTableMain):
                     self.setup_sim_indices(st=self.start_end_dialogue_window.start_value,
                                            en=self.start_end_dialogue_window.end_value)
 
+                    self.view_objects_data()
+
                     self.show_info_toast("Resampled!")
             else:
                 self.show_error_toast("Empty time series :/")
@@ -239,6 +243,8 @@ class TimeEventsMain(DataBaseTableMain):
 
                             # we need to remove the clustering simulation because it no longer matches the time data
                             self.session.delete_driver(driver_type=SimulationTypes.ClusteringAnalysis_run)
+
+                            self.view_objects_data()
                             self.show_info_toast("Resampled!")
                 else:
                     self.show_error_toast("Run clustering simulation first")