GridCalEngine 5.1.43__tar.gz → 5.1.45__tar.gz

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/GridCalEngine/Devices/assets.py

@@ -504,11 +504,6 @@ class Assets:
         if self.time_profile is None:
             raise Exception('Cannot ensure profiles existence without a time index. Try format_profiles instead')
 
-        # for key, tpe in self.device_type_name_dict.items():
-        #     elements = self.get_elements_by_type(device_type=tpe)
-        #     for elm in elements:
-        #         elm.ensure_profiles_exist(self.time_profile)
-
         for elm in self.items():
             elm.ensure_profiles_exist(self.time_profile)
 
@@ -4321,7 +4316,6 @@ class Assets:
             for elm in lst:
                 yield elm
 
-
     # ------------------------------------------------------------------------------------------------------------------
     # Load-like devices
     # ------------------------------------------------------------------------------------------------------------------
@@ -4508,28 +4502,28 @@ class Assets:
         """
 
         if device_type == DeviceType.LoadDevice:
-            return self.get_loads()
+            return self._loads
 
         elif device_type == DeviceType.StaticGeneratorDevice:
-            return self.get_static_generators()
+            return self._static_generators
 
         elif device_type == DeviceType.GeneratorDevice:
-            return self.get_generators()
+            return self._generators
 
         elif device_type == DeviceType.BatteryDevice:
-            return self.get_batteries()
+            return self._batteries
 
         elif device_type == DeviceType.ShuntDevice:
-            return self.get_shunts()
+            return self._shunts
 
         elif device_type == DeviceType.ExternalGridDevice:
-            return self.get_external_grids()
+            return self._external_grids
 
         elif device_type == DeviceType.CurrentInjectionDevice:
-            return self.get_current_injections()
+            return self._current_injections
 
         elif device_type == DeviceType.ControllableShuntDevice:
-            return self.get_controllable_shunts()
+            return self._controllable_shunts
 
         elif device_type == DeviceType.LineDevice:
             return self._lines
@@ -4641,15 +4635,6 @@ class Assets:
         elif device_type == DeviceType.EmissionGasDevice:
             return self._emission_gases
 
-        # elif device_type == DeviceType.GeneratorTechnologyAssociation:
-        #     return self._generators_technologies
-        #
-        # elif device_type == DeviceType.GeneratorFuelAssociation:
-        #     return self._generators_fuels
-        #
-        # elif device_type == DeviceType.GeneratorEmissionAssociation:
-        #     return self._generators_emissions
-
         elif device_type == DeviceType.ConnectivityNodeDevice:
             return self._connectivity_nodes
 
@@ -5296,7 +5281,7 @@ class Assets:
 
         return found
 
-    def get_all_elements_dict(self, logger = Logger()) -> Tuple[Dict[str, ALL_DEV_TYPES], bool]:
+    def get_all_elements_dict(self, logger=Logger()) -> Tuple[Dict[str, ALL_DEV_TYPES], bool]:
         """
         Get a dictionary of all elements
         :param: logger: Logger

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/GridCalEngine/Devices/multi_circuit.py

@@ -1309,6 +1309,32 @@ class MultiCircuit(Assets):
         # assign the new base
         self.Sbase = Sbase_new
 
+    def get_injection_devices_grouped_by_substation(self) -> Dict[dev.Substation, Dict[DeviceType, List[INJECTION_DEVICE_TYPES]]]:
+        """
+        Get the injection devices grouped by bus and by device type
+        :return: Dict[bus, Dict[DeviceType, List[Injection devs]]
+        """
+        groups: Dict[dev.Substation, Dict[DeviceType, List[INJECTION_DEVICE_TYPES]]] = dict()
+
+        for lst in self.get_injection_devices_lists():
+
+            for elm in lst:
+
+                if elm.bus.substation is not None:
+
+                    devices_by_type = groups.get(elm.bus.substation, None)
+
+                    if devices_by_type is None:
+                        groups[elm.bus.substation] = {elm.device_type: [elm]}
+                    else:
+                        lst = devices_by_type.get(elm.device_type, None)
+                        if lst is None:
+                            devices_by_type[elm.device_type] = [elm]
+                        else:
+                            devices_by_type[elm.device_type].append(elm)
+
+        return groups
+
     def get_injection_devices_grouped_by_bus(self) -> Dict[dev.Bus, Dict[DeviceType, List[INJECTION_DEVICE_TYPES]]]:
         """
         Get the injection devices grouped by bus and by device type

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/GridCalEngine/Devices/profile.py

@@ -19,6 +19,8 @@ from typing import Union, Dict, Tuple, List, Any
 from collections import Counter
 import numpy as np
 import numba as nb
+from numpy import dtype
+
 from GridCalEngine.basic_structures import Numeric, NumericVec, IntVec
 from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.Utils.Sparse.sparse_array import SparseArray, PROFILE_TYPES, check_type
@@ -336,7 +338,16 @@ class Profile:
         if self._is_sparse:
             return self._sparse_array[key]
         else:
-            return self._dense_array[key]
+
+            if self._dense_array is None:
+                # WTF, initialize sparse
+                self._is_sparse = True
+                self._sparse_array = SparseArray(data_type=self.dtype)
+                self._sparse_array.default_value = self.default_value
+                print("Initializing sparse when querying, this signals a mis initilaization")
+                return self.default_value
+            else:
+                return self._dense_array[key]
 
     def __setitem__(self, key: int, value):
         """
@@ -392,7 +403,12 @@ class Profile:
                 if self._is_sparse:
                     self._sparse_array.resize(n=n)
                 else:
-                    self._dense_array.resize(n)
+                    try:
+                        self._dense_array.resize(n)
+                    except ValueError:
+                        new_arr = np.zeros(n, dtype=self._dense_array.dtype)
+                        new_arr[:len(self._dense_array)] = self._dense_array
+                        self._dense_array = new_arr  # this is to avoid ValueError when resizing a numpy array of Objects
             else:
                 self._initialized = True
                 self.create_sparse(size=n, default_value=self.default_value)

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -267,8 +267,7 @@ def profile_todict(profile: Profile) -> Dict[str, str]:
         return {
             'is_sparse': True,
             'size': s,
-            'default': profile.default_value
-            if profile.sparse_array is None else profile.sparse_array.default_value,
+            'default': profile.default_value if profile.sparse_array is None else profile.sparse_array.default_value,
             'sparse_data': {
                 'map': dict()
             }
@@ -288,8 +287,9 @@ def profile_todict_idtag(profile: Profile) -> Dict[str, str]:
             'size': profile.size(),
             'default': default,
             'sparse_data': {
-                'map': {key: val.idtag for key, val in profile.sparse_array.get_map().items()}
-                if profile.sparse_array else dict()
+                'map': {key: val.idtag if hasattr(val, 'idtag') else None
+                        for key, val in profile.sparse_array.get_map().items()}
+                if profile.sparse_array is not None else dict()
             }
         }
     else:
@@ -297,7 +297,8 @@ def profile_todict_idtag(profile: Profile) -> Dict[str, str]:
             'is_sparse': profile.is_sparse,
             'size': profile.size(),
             'default': default,
-            'dense_data': [e.idtag for e in profile.dense_array] if profile.dense_array else list(),
+            'dense_data': [e.idtag if hasattr(e, 'idtag') else None for e in profile.dense_array]
+            if profile.dense_array is not None else list(),
         }
 
 
@@ -434,6 +435,10 @@ def gather_model_as_jsons(circuit: MultiCircuit) -> Dict[str, Dict[str, str]]:
     :param circuit:
     :return:
     """
+
+    if circuit.has_time_series:
+        circuit.ensure_profiles_exist()
+
     data: Dict[str, Union[Dict[str, str], List[Dict[str, str]]]] = dict()
 
     # declare objects to iterate  name: [sample object, list of objects, headers]
@@ -1469,4 +1474,7 @@ def parse_gridcal_data(data: Dict[str, Union[str, float, pd.DataFrame, Dict[str,
     if text_func is not None:
         text_func("Done!")
 
+    if circuit.has_time_series:
+        circuit.ensure_profiles_exist()
+
     return circuit

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/GridCalEngine/Simulations/results_table.py

@@ -374,3 +374,36 @@ class ResultsTable:
             df.plot(ax=ax, legend=plot_legend, stacked=stacked)
         except TypeError:
             print('No numeric data to plot...')
+
+    def plot_device(self, ax=None, device_idx: int = 0, stacked=False):
+        """
+        Plot the data model
+        :param ax: Matplotlib axis
+        :param device_idx: list of selected column indices
+        :param stacked: Stack plot?
+        """
+        index, columns, data = self.get_data()
+
+        columns = [columns[device_idx]]
+        data = data[:, device_idx]
+
+        if ax is None:
+            fig = plt.figure(figsize=(12, 6))
+            ax = fig.add_subplot(111)
+
+        if 'voltage' in self.title.lower():
+            data[data == 0] = 'nan'  # to avoid plotting the zeros
+
+        if len(columns) > 15:
+            plot_legend = False
+        else:
+            plot_legend = True
+
+        df = pd.DataFrame(data=data, index=index, columns=columns)
+        ax.set_title(self.title, fontsize=14)
+        ax.set_ylabel(self.y_label, fontsize=11)
+        ax.set_xlabel(self.x_label, fontsize=11)
+        try:
+            df.plot(ax=ax, legend=plot_legend, stacked=stacked)
+        except TypeError:
+            print('No numeric data to plot...')

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/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.43"
+__GridCalEngine_VERSION__ = "5.1.45"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.43
+Version: 5.1.45
 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.

{GridCalEngine-5.1.43 → GridCalEngine-5.1.45}/setup.py

@@ -56,7 +56,7 @@ dependencies = ['setuptools>=41.0.1',
                 "scipy>=1.0.0",
                 "networkx>=2.1",
                 "pandas>=1.0",
-                "ortools>=9.8.0,<=9.9.3963",
+                "ortools>=9.10.0",
                 "xlwt>=1.3.0",
                 "xlrd>=1.1.0",
                 "matplotlib>=2.1.1",