VeraGridEngine 5.6.4__tar.gz → 5.6.6__tar.gz

{veragridengine-5.6.4 → veragridengine-5.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: VeraGridEngine
-Version: 5.6.4
+Version: 5.6.6
 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.

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/Devices/Parents/editable_device.py

@@ -5,6 +5,7 @@
 import random
 import uuid
 import numpy as np
+import pandas as pd
 
 from VeraGridEngine.Devices.profile import Profile
 from typing import List, Dict, AnyStr, Any, Union, Type, Tuple
@@ -815,11 +816,12 @@ class EditableDevice:
         # set the profile variable associated with the magnitude
         # setattr(self, self.properties_with_profile[magnitude], prof)
 
-    def ensure_profiles_exist(self, index):
+    def ensure_profiles_exist(self, index: pd.DatetimeIndex, set_profile_default_as_snapshot: bool = False):
         """
         It might be that when loading the VeraGrid Model has properties that the file has not.
         Those properties must be initialized as well
         :param index: Time series index (timestamps)
+        :param set_profile_default_as_snapshot: set the bool default profile value as the snapshot
         """
         if index is not None:
             for magnitude, prof_attr in self.properties_with_profile.items():
@@ -840,9 +842,16 @@ class EditableDevice:
                     # print(self.name, ': created profile for ' + prof_attr)
                     self.create_profile(magnitude=magnitude, index=index)
 
+                if set_profile_default_as_snapshot:
+                    prop = self.registered_properties[magnitude]
+                    if prop.tpe == bool:
+                        val = getattr(self, magnitude)
+                        profile.default_value = val
+
         else:
             raise Exception("ensure_profiles_exist: No index provided")
 
+
     def delete_profiles(self):
         """
         Delete the object profiles (set all to None)

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/Devices/assets.py

@@ -607,7 +607,7 @@ class Assets:
         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(index)
+                elm.ensure_profiles_exist(index, set_profile_default_as_snapshot=True)
 
     def set_time_profile(self, unix_data: IntVec):
         """

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/Devices/profile.py

@@ -180,14 +180,14 @@ class Profile:
             return 0
 
     @default_value.setter
-    def default_value(self, val):
+    def default_value(self, val: Union[bool, int, float, DeviceType]):
         """
 
         :param val:
         :return:
         """
         if self.sparse_array is not None:
-            self.sparse_array.default_value = self.default_value
+            self.sparse_array.default_value = val
 
     @property
     def is_sparse(self) -> bool:

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/IO/dgs/dgs_parser.py

@@ -3,12 +3,12 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 
+from typing import Dict, Tuple, List
 from VeraGridEngine.Devices.multi_circuit import MultiCircuit
 import VeraGridEngine.Devices as dev
 import math
 import numpy as np
-from numpy import array
-from pandas import DataFrame as df
+import pandas as pd
 from warnings import warn
 
 
@@ -128,18 +128,15 @@ def read_DGS(filename):
 
     """
     types_dict = dict()
-    types_dict["a"] = "|S32"
-    types_dict["p"] = "|S32"
-    types_dict["i"] = "<i4"
-    types_dict["r"] = "<f4"
-    types_dict["d"] = "<f4"
+    types_dict["a"] = str
+    types_dict["p"] = str
+    types_dict["i"] = int
+    types_dict["r"] = float
+    types_dict["d"] = float
 
-    types_dict2 = dict()
+    types_dict2: Dict[str, List[Tuple[str, str]]] = dict()
 
     current_type = None
-    data_types = None
-    header = None
-
     Headers = dict()
     # parse the file lines
     for line in lines:
@@ -149,7 +146,6 @@ def read_DGS(filename):
             chnks = line.split(";")
             current_type = chnks[0]
             data[current_type] = list()
-            # print(current_type)
 
             # analyze types
             data_types = list()
@@ -173,15 +169,22 @@ def read_DGS(filename):
                 line = line.strip()
                 chnks = line.split(";")
                 chnks = ["0" if x == "" else x for x in chnks]
-                data[current_type].append(array(tuple(chnks)))
+                data[current_type].append(np.array(tuple(chnks)))
 
     # format keys
     for key in data.keys():
-        # print("Converting " + str(key))
-        table = array([tuple(x) for x in data[key]], dtype=types_dict2[key])
-        table = array([list(x) for x in table], dtype=np.object)
         header = Headers[key]
-        data[key] = df(data=table, columns=header)
+        df = pd.DataFrame(data=data[key], columns=header)
+
+        # parse the stupid numbers separated by comma
+        for col_name, tpe in types_dict2[key]:
+            if tpe == float:
+                df[col_name] = df[col_name].str.replace(',', '.').astype(float)
+            elif tpe == int:
+                df[col_name] = df[col_name].str.replace(',', '.').astype(int)
+            else:
+                pass
+        data[key] = df
 
     # positions dictionary
     obj_id = data['IntGrf']['pDataObj'].values
@@ -194,12 +197,15 @@ def read_DGS(filename):
     return data, pos_dict
 
 
-def data_to_grid_object(data, pos_dict, codification="utf-8") -> MultiCircuit:
+def data_to_grid_object(data: Dict[str, pd.DataFrame],
+                        pos_dict: Dict[str, Tuple[float, float]],
+                        codification: str = "utf-8") -> MultiCircuit:
     """
     Turns the read data dictionary into a VeraGrid MultiCircuit object
     Args:
         data: Dictionary of data read from a DGS file
         pos_dict: Dictionary of objects and their positions read from a DGS file
+        codification: codification type
     Returns: VeraGrid MultiCircuit object
     """
     ###############################################################################
@@ -571,14 +577,18 @@ def data_to_grid_object(data, pos_dict, codification="utf-8") -> MultiCircuit:
     cub_obj_idx = cubicles['obj_id'].values
     cub_term_idx = cubicles['fold_id'].values
 
-    # for i, elm_id in enumerate(cub_obj_idx):
-    #     elm_idx = cub_term_idx[i]
-    #     terminals_dict[elm_id] = elm_idx
-
     ID_idx = 0
     for cla in classes:
         if cla.__len__() > 0:
-            for ID in cla['ID'].values:
+
+            if "ID" in cla:
+                arr = cla['ID'].values
+            elif "FID" in cla:
+                arr = cla['FID'].values
+            else:
+                raise ValueError("No bus ID, FID could be found...")
+
+            for ID in arr:
                 idx = np.where(cubicles == ID)[0]
                 terminals_dict[ID] = cub_term_idx[idx]
 
@@ -612,11 +622,19 @@ def data_to_grid_object(data, pos_dict, codification="utf-8") -> MultiCircuit:
     """
     # print('Parsing terminals')
     buses_dict = dict()
+
+    if "ID" in buses:
+        id_arr = buses['ID'].values
+    elif "FID" in buses:
+        id_arr = buses['FID'].values
+    else:
+        raise ValueError("No bus ID, FID could be found...")
+
     for i in range(len(buses)):
-        ID = buses['ID'][i]
+        ID = int(id_arr[i])
         x, y = pos_dict[ID]
         buses_dict[ID] = i
-        bus_name = buses['loc_name'][i].decode(codification)  # BUS_Name
+        bus_name = buses['loc_name'][i] # .decode(codification)  # BUS_Name
         vnom = buses['uknom'][i]
         bus = dev.Bus(name=bus_name, Vnom=vnom, vmin=0.9, vmax=1.1, xpos=x, ypos=-y, active=True)
         circuit.add_bus(bus)
@@ -1097,7 +1115,12 @@ def data_to_grid_object(data, pos_dict, codification="utf-8") -> MultiCircuit:
     return circuit
 
 
-def dgs_to_circuit(filename) -> MultiCircuit:
+def dgs_to_circuit(filename: str) -> MultiCircuit:
+    """
+
+    :param filename:
+    :return:
+    """
     data, pos_dict = read_DGS(filename)
 
     return data_to_grid_object(data, pos_dict)

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/Simulations/LinearFactors/linear_analysis.py

@@ -1040,7 +1040,7 @@ class LinearAnalysisTs:
         self.time_indices = grid.get_all_time_indices() if time_indices is None else time_indices
 
         # get the states matrix
-        mat: IntMat = grid.get_branch_active_time_array()[self.time_indices, None]
+        mat: IntMat = grid.get_branch_active_time_array()[self.time_indices, :]
 
         # analyze how many PTDF's we need to get
         self.groups, self.mapping = find_different_states(mat)

{veragridengine-5.6.4 → veragridengine-5.6.6}/VeraGridEngine/__version__.py

@@ -6,7 +6,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # remember to keep a three-number version!!!
-__VeraGridEngine_VERSION__ = "5.6.4"
+__VeraGridEngine_VERSION__ = "5.6.6"
 
 url = 'https://github.com/SanPen/VeraGrid'