GridCal 5.3.0__tar.gz → 5.3.0a2__tar.gz

{gridcal-5.3.0 → gridcal-5.3.0a2}/GridCal/Gui/Analysis/AnalysisDialogue.py

@@ -62,7 +62,7 @@ class GridAnalysisGUI(QtWidgets.QMainWindow):
             min_vcc=self.ui.transformerVccMinSpinBox.value(),
             max_vcc=self.ui.transformerVccMaxSpinBox.value(),
             branch_x_threshold=1e-4,
-            condition_number_threshold=1e-4,
+            condition_number_thrshold=1e-4,
             logger=self.log
         )
 

{gridcal-5.3.0 → gridcal-5.3.0a2}/GridCal/Gui/Analysis/object_plot_analysis.py

@@ -370,6 +370,8 @@ def analyze_lines(elements: List[Line],
         V1 = min(elm.bus_to.Vnom, elm.bus_from.Vnom)
         V2 = max(elm.bus_to.Vnom, elm.bus_from.Vnom)
 
+        s = '[' + str(V1) + '-' + str(V2) + ']'
+
         if elm.bus_from is None:
             logger.add(object_type=elm.device_type.value,
                        element_name=elm,
@@ -1138,7 +1140,6 @@ def analyze_static_gen(elements: List[StaticGenerator],
 
     :param elements:
     :param time_profile:
-    :param logger:
     :return:
     """
     Pg = 0.0
@@ -1172,7 +1173,6 @@ def analyze_load(elements: List[Load],
 
     :param elements:
     :param time_profile:
-    :param logger:
     :return:
     """
     Pl = 0.0
@@ -1212,7 +1212,7 @@ def grid_analysis(circuit: MultiCircuit,
                   max_vcc=18,
                   logger=GridErrorLog(),
                   branch_x_threshold=1e-4,
-                  condition_number_threshold=1e4,
+                  condition_number_thrshold=1e4,
                   eps_max: float = 1e20,
                   eps_min: float = 1e-20):
     """
@@ -1230,7 +1230,7 @@ def grid_analysis(circuit: MultiCircuit,
     :param min_vcc: Minimum short circuit voltage (%)
     :param logger: GridErrorLog
     :param branch_x_threshold: Value to compare branches X such that it is numerically stable
-    :param condition_number_threshold: Condition number threshold to report unstability
+    :param condition_number_thrshold: Condition number threshold to report unstability
     :param eps_max: Max epsylon value for comparison
     :param eps_min: Min epsylon value for comparison
     :return: list of fixable error objects
@@ -1396,16 +1396,13 @@ def grid_analysis(circuit: MultiCircuit,
                            propty="Reactive power out of bounds",
                            message='There is too much reactive power imbalance',
                            lower=str(Qmin),
-                           val=float(Ql_prof[t]),
+                           val=Ql_prof[t],
                            upper=str(Qmax))
 
     # analyze the numerical stability
     nc = compile_numerical_circuit_at(circuit, t_idx=None)  # compile the snapshot
 
-    Sbus = nc.get_power_injections()
-    indices = nc.get_simulation_indices(Sbus=Sbus)
-    lin_adm = nc.get_linear_admittance_matrices(indices=indices)
-    rcond, unstable = sparse_instability_svd_test(lin_adm.Bbus, condition_number_thrshold=1.0 / condition_number_threshold)
+    rcond, unstable = sparse_instability_svd_test(nc.Bbus, condition_number_thrshold=1.0 / condition_number_thrshold)
 
     if unstable:
         logger.add(object_type='matrix',
@@ -1416,10 +1413,9 @@ def grid_analysis(circuit: MultiCircuit,
                    message='B matrix is SVD-Unstable: this may make linear power flows output nonsense',
                    lower="",
                    val=str(rcond),
-                   upper=str(1.0 / condition_number_threshold))
+                   upper=str(1.0 / condition_number_thrshold))
 
-    rcond, unstable = sparse_instability_lu_test(lin_adm.get_Bred(pqpv=indices.no_slack),
-                                                 condition_number_thrshold=condition_number_threshold)
+    rcond, unstable = sparse_instability_lu_test(nc.Bpqpv, condition_number_thrshold=condition_number_thrshold)
 
     if unstable:
         logger.add(object_type='matrix',
@@ -1430,7 +1426,7 @@ def grid_analysis(circuit: MultiCircuit,
                    message='B matrix is LU-Unstable: this may make linear power flows output nonsense',
                    lower="",
                    val=str(rcond),
-                   upper=str(condition_number_threshold))
+                   upper=str(condition_number_thrshold))
 
     return fixable_errors
 
@@ -1537,7 +1533,7 @@ def object_histogram_analysis(circuit: MultiCircuit,
                     align='mid',
                     orientation='vertical')
             ax.plot(x, np.zeros(n), 'o')
-            ax.set_title(str(extended_prop[j]))
+            ax.set_title(extended_prop[j])
 
             if log_scale_extended[j]:
                 ax.set_xscale('log')

{gridcal-5.3.0 → gridcal-5.3.0a2}/GridCal/Gui/Diagrams/MapWidget/Tiles/tile_worker.py

@@ -98,8 +98,8 @@ class TileWorker(QThread):
             # try to retrieve the image
             error = False
             pixmap = self.error_image
-            tile_url = self.server + self.tilepath.format(Z=level, X=x, Y=y)
             try:
+                tile_url = self.server + self.tilepath.format(Z=level, X=x, Y=y)
 
                 # Create a Request object with the desired headers
                 response = urlopen(Request(tile_url, headers={'User-Agent': 'GridCal 5'}))

{gridcal-5.3.0 → gridcal-5.3.0a2}/GridCal/Gui/Diagrams/SchematicWidget/schematic_widget.py

@@ -2160,7 +2160,8 @@ class SchematicWidget(BaseDiagramWidget):
         :return: OPTIONAL_PORT, OPTIONAL_PORT
         """
 
-        obj_from, obj_to, is_ok = branch.get_from_and_to_objects(logger=logger,
+        obj_from, obj_to, is_ok = branch.get_from_and_to_objects(t_idx=None,
+                                                                 logger=logger,
                                                                  prefer_node_breaker=prefer_node_breaker)
 
         # Bus provided, search its graphics
@@ -2195,7 +2196,8 @@ class SchematicWidget(BaseDiagramWidget):
         :return: OPTIONAL_PORT, OPTIONAL_PORT
         """
 
-        obj_from, obj_to, is_ok = branch.get_from_and_to_objects(logger=logger,
+        obj_from, obj_to, is_ok = branch.get_from_and_to_objects(t_idx=None,
+                                                                 logger=logger,
                                                                  prefer_node_breaker=prefer_node_breaker)
 
         # Bus provided, search its graphics
@@ -2844,7 +2846,7 @@ class SchematicWidget(BaseDiagramWidget):
 
             if isinstance(elm, Bus):
 
-                if not elm.internal:  # 3w transformer buses are not represented
+                if not elm.is_internal:  # 3w transformer buses are not represented
                     if injections_by_bus is None:
                         injections_by_bus = self.circuit.get_injection_devices_grouped_by_bus()
 
@@ -2967,7 +2969,7 @@ class SchematicWidget(BaseDiagramWidget):
         nn = len(buses)
         for i, bus in enumerate(buses):
 
-            if not bus.internal:  # 3w transformer buses are not represented
+            if not bus.is_internal:  # 3w transformer buses are not represented
 
                 if prog_func is not None:
                     prog_func((i + 1) / nn * 100.0)
@@ -3375,7 +3377,7 @@ class SchematicWidget(BaseDiagramWidget):
         voltage_cmap = viz.get_voltage_color_map()
         loading_cmap = viz.get_loading_color_map()
 
-        """
+        '''
         class BusMode(Enum):
         PQ = 1,
         PV = 2,
@@ -3383,7 +3385,7 @@ class SchematicWidget(BaseDiagramWidget):
         NONE = 4,
         STO_DISPATCH = 5
         PVB = 6
-        """
+        '''
 
         bus_types = ['', 'PQ', 'PV', 'Slack', 'PQV', 'P']
         max_flow = 1
@@ -3454,10 +3456,8 @@ class SchematicWidget(BaseDiagramWidget):
                 else:
                     Sfnorm = Sfabs
 
-                if self.circuit.get_branch_number(add_vsc=False, add_hvdc=False, add_switch=True) == len(Sf):
-                    for i, branch in enumerate(self.circuit.get_branches_iter(add_vsc=False,
-                                                                              add_hvdc=False,
-                                                                              add_switch=True)):
+                if self.circuit.get_branch_number_wo_vsc_hvdc() == len(Sf):
+                    for i, branch in enumerate(self.circuit.get_branches_wo_vsc_hvdc_iter()):
 
                         # try to find the diagram object of the DB object
                         graphic_object = self.graphics_manager.query(branch)
@@ -4429,7 +4429,7 @@ def generate_schematic_diagram(buses: List[Bus],
         if prog_func is not None:
             prog_func((i + 1) / nn * 100.0)
 
-        if not bus.internal:  # 3w transformer buses are not represented
+        if not bus.is_internal:  # 3w transformer buses are not represented
 
             # correct possible nonsense
             if np.isnan(bus.y):

{gridcal-5.3.0 → gridcal-5.3.0a2}/GridCal/Gui/Main/GridCalMain.py

@@ -148,7 +148,7 @@ def runGridCal() -> None:
     h_ = 780
     window_.resize(int(1.7 * h_), h_)  # almost the golden ratio :)
     window_.show()
-    sys.exit(app.exec())
+    sys.exit(app.exec_())
 
 
 if __name__ == "__main__":