GridCalEngine 5.1.3__tar.gz → 5.1.4__tar.gz

{GridCalEngine-5.1.3 → GridCalEngine-5.1.4}/GridCalEngine/Devices/profile.py

@@ -21,11 +21,9 @@ import numpy as np
 import numba as nb
 from GridCalEngine.basic_structures import Numeric, NumericVec, IntVec
 from GridCalEngine.enumerations import DeviceType
-from GridCalEngine.Devices.sparse_array import SparseArray
+from GridCalEngine.Devices.sparse_array import SparseArray, PROFILE_TYPES, check_type
 
 
-PROFILE_TYPES = Union[type(bool), type(int), type(float), DeviceType]
-
 @nb.njit()
 def compress_array_numba(arr, base):
     """
@@ -228,7 +226,7 @@ class Profile:
         :param map_data: map with the data
         """
         self._is_sparse = True
-        self._sparse_array = SparseArray()
+        self._sparse_array = SparseArray(data_type=self.dtype)
         if map_data is None:
             self._sparse_array.create(size=size, default_value=default_value)
         else:
@@ -281,7 +279,7 @@ class Profile:
                     base = bool(base)
 
                 self._is_sparse = True
-                self._sparse_array = SparseArray()
+                self._sparse_array = SparseArray(data_type=self.dtype)
 
                 if most_common_count > 1:
                     if isinstance(arr, np.ndarray):
@@ -295,9 +293,9 @@ class Profile:
                 self._sparse_array.create(size=len(arr),
                                           default_value=base,
                                           data=data_map)
-                self.check_type(value=base)
+                check_type(dtype=self.dtype, value=base)
             else:
-                self.check_type(value=arr[0])
+                check_type(dtype=self.dtype, value=arr[0])
                 self._is_sparse = False
                 self._dense_array = arr
         else:
@@ -404,35 +402,17 @@ class Profile:
         else:
             self._dense_array = self._dense_array[indices]
 
-    def check_type(self, value) -> bool:
-        """
-        Checks that the type of value is the declared type in the profile
-        :param value: Any value
-        :return:
-        """
-        tpe = type(value)
-        if tpe in [bool, np.bool_]:
-            assert self.dtype == bool
-        elif tpe in [int, np.int32, np.int64]:
-            assert self.dtype == int
-        elif tpe in [float, np.float32, np.float64]:
-            assert self.dtype == float
-        else:
-            assert isinstance(self.dtype, DeviceType)
-
-        return True
-
     def fill(self, value: Any):
         """
         Fill this profile with the same value
         :param value: any value
         """
-        self.check_type(value=value)
+        check_type(dtype=self.dtype, value=value)
 
         self.default_value = value
         self._is_sparse = True
         if self._sparse_array is None:
-            self._sparse_array = SparseArray()
+            self._sparse_array = SparseArray(data_type=self.dtype)
         self._sparse_array.fill(value)
         self._dense_array = None
 

{GridCalEngine-5.1.3 → GridCalEngine-5.1.4}/GridCalEngine/Devices/sparse_array.py

@@ -18,22 +18,55 @@
 
 from typing import Dict, Any, Union
 import numpy as np
+from GridCalEngine.enumerations import DeviceType
 from GridCalEngine.basic_structures import Numeric, NumericVec, IntVec
 
 
+PROFILE_TYPES = Union[type(bool), type(int), type(float), DeviceType]
+
+
+def check_type(dtype: PROFILE_TYPES, value: Any) -> bool:
+    """
+    Checks that the type of value is the declared type in the profile
+    :param dtype: expected type
+    :param value: Any value
+    :return:
+    """
+    tpe = type(value)
+    if tpe in [bool, np.bool_]:
+        assert dtype == bool
+    elif tpe in [int, np.int32, np.int64]:
+        assert dtype == int or dtype == float
+    elif tpe in [float, np.float32, np.float64]:
+        assert dtype == float
+    else:
+        assert isinstance(dtype, DeviceType)
+
+    return True
+
+
 class SparseArray:
     """
     SparseArray
     """
 
-    def __init__(self) -> None:
+    def __init__(self, data_type: PROFILE_TYPES) -> None:
         """
 
         """
+        self._dtype = data_type
         self._default_value: Numeric = 0
         self._size: int = 0
         self._map: Dict[int, Numeric] = dict()
 
+    @property
+    def dtype(self) -> Union[bool, int, float, DeviceType]:
+        """
+        Get the declared type
+        :return: type
+        """
+        return self._dtype
+
     @property
     def default_value(self):
         """
@@ -49,7 +82,15 @@ class SparseArray:
         :param val:
         :return:
         """
-        self._default_value = val
+        if isinstance(self.dtype, DeviceType):
+            if val == "None":
+                val2 = None
+            else:
+                val2 = val
+        else:
+            val2 = val
+        check_type(dtype=self.dtype, value=val2)
+        self._default_value = val2
 
     def info(self):
         """
@@ -93,7 +134,7 @@ class SparseArray:
         :param default_value: default value
         :param data: data map
         """
-        self._default_value = default_value
+        self.default_value = default_value
         self._size = size
         self._map = data if data is not None else dict()
 
@@ -103,7 +144,7 @@ class SparseArray:
         :param array: NumericVec
         :param default_value: defult value of the array
         """
-        self._default_value = default_value
+        self.default_value = default_value
         self._size = len(array)
         self._map: Dict[int, Numeric] = dict()
 
@@ -119,7 +160,7 @@ class SparseArray:
         :param map_data:
         :return:
         """
-        self._default_value = default_value
+        self.default_value = default_value
         self._size = size
         self._map = map_data
 
@@ -128,7 +169,7 @@ class SparseArray:
         Fill the sparse array with the same value
         :param value: any value
         """
-        self._default_value = value
+        self.default_value = value
         self._map = dict()
 
     def toarray(self) -> NumericVec:

{GridCalEngine-5.1.3 → GridCalEngine-5.1.4}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -361,6 +361,10 @@ def get_profile_from_dict(profile: Profile,
             default_value = collection.get(data['default'], default_value)
             map_data = {int(key): collection.get(val, default_value) for key, val in sp_data['map'].items()}
 
+        if profile.dtype == DeviceType.BusDevice:  # manual correction for buses profile incorrect value
+            if default_value == "None":
+                default_value = profile.default_value
+
         profile.create_sparse(default_value=default_value, size=data['size'], map_data=map_data)
     else:
 

{GridCalEngine-5.1.3 → GridCalEngine-5.1.4}/GridCalEngine/Utils/Filtering/filtering.py

@@ -341,7 +341,7 @@ def parse_single(token: str) -> Union[Filter, None]:
     :param token: Token
     :return: Filter or None if the token is not valid
     """
-    elms = re.split(r'([<>=!]=?|in|starts|ends|like|notlike)', token)
+    elms = re.split(r'(?<=\s)([<>=!]=?|in|starts|ends|like|notlike)(?=\s)', token)
 
     if len(elms) == 3:
 

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

{GridCalEngine-5.1.3 → GridCalEngine-5.1.4}/PKG-INFO

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