GridCalEngine 5.1.5__tar.gz → 5.1.7__tar.gz

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/DataStructures/generator_data.py

@@ -306,3 +306,19 @@ class GeneratorData:
         :return:
         """
         return np.where(self.dispatchable == 1)[0]
+
+    def get_dispatchable_active_indices(self) -> IntVec:
+        """
+        Get the indices of dispatchable generators
+        :return:
+        """
+        x = (self.dispatchable * self.active).astype(int)
+        return np.where(x == 1)[0]
+
+    def get_non_dispatchable_indices(self) -> IntVec:
+        """
+        Get the indices of dispatchable generators
+        :return:
+        """
+        x = (~self.dispatchable * self.active).astype(int)
+        return np.where(x == 1)[0]

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/Aggregation/investment.py

@@ -32,15 +32,17 @@ class Investment(EditableDevice):
                  code='',
                  CAPEX=0.0,
                  OPEX=0.0,
+                 status: bool = True,
                  group: InvestmentsGroup = None,
                  comment: str = ""):
         """
-        Contingency
+        Investment
         :param idtag: String. Element unique identifier
         :param name: String. Contingency name
         :param code: String. Contingency code name
         :param CAPEX: Float. Capital expenditures
         :param OPEX: Float. Operating expenditures
+        :param status: If true the investment activates when applied, otherwise is deactivated
         :param group: ContingencyGroup. Contingency group
         :param comment: Comment
         """
@@ -57,12 +59,15 @@ class Investment(EditableDevice):
         self.CAPEX = CAPEX
         self.OPEX = OPEX
         self._group: InvestmentsGroup = group
+        self.status: bool = status
 
         self.register(key='device_idtag', units='', tpe=str, definition='Unique ID')
         self.register(key='CAPEX', units='Me', tpe=float,
                       definition='Capital expenditures. This is the initial investment.')
         self.register(key='OPEX', units='Me', tpe=float,
                       definition='Operation expenditures. Maintenance costs among other recurrent costs.')
+        self.register(key='status', units='', tpe=bool,
+                      definition='If true the investment activates when applied, otherwise is deactivated.')
         self.register(key='group', units='', tpe=DeviceType.InvestmentsGroupDevice, definition='Investment group')
 
     @property

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -138,7 +138,7 @@ class HvdcLine(BranchParent):
 
     def __init__(self, bus_from: Bus = None, bus_to: Bus = None, name='HVDC Line', idtag=None, active=True, code='',
                  rate=1.0, Pset=0.0, r=1e-20, loss_factor=0.0, Vset_f=1.0, Vset_t=1.0, length=1.0, mttf=0.0, mttr=0.0,
-                 overload_cost=1000.0,   min_firing_angle_f=-1.0, max_firing_angle_f=1.0, min_firing_angle_t=-1.0,
+                 overload_cost=1000.0, min_firing_angle_f=-1.0, max_firing_angle_f=1.0, min_firing_angle_t=-1.0,
                  max_firing_angle_t=1.0, contingency_factor=1.0, protection_rating_factor: float = 1.4,
                  control_mode: HvdcControlType = HvdcControlType.type_1_Pset, dispatchable=True, angle_droop=0,
                  capex=0, opex=0, build_status: BuildStatus = BuildStatus.Commissioned, n_lines: int = 1):

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/Branches/line_locations.py

@@ -116,7 +116,7 @@ class LineLocations(EditableDevice):
             values = np.array(data)
             self.set(data=values)
         else:
-            self.data = np.zeros((0, 4))
+            self.data = list()
 
     def set(self, data: np.ndarray):
         """

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/Diagrams/base_diagram.py

@@ -82,14 +82,14 @@ class PointsGroup:
         return points
 
     def parse_data(self,
-                   data: Dict[str, Dict[str, Union[int, float, List[Tuple[float, float]]]]],
+                   data: Dict[str, Dict[str, Union[int, float, bool, List[Tuple[float, float]]]]],
                    obj_dict: Dict[str, ALL_DEV_TYPES],
                    logger: Logger,
                    category: str = "") -> None:
         """
         Parse file data ito this class
         :param data: json dictionary
-        :param obj_dict: dicrtionary of relevant objects (idtag, object)
+        :param obj_dict: dictionary of relevant objects (idtag, object)
         :param logger: Logger
         :param category: category
         """
@@ -101,6 +101,7 @@ class PointsGroup:
 
             if api_object is None:
                 # locations with no API object are not created
+                print()
                 logger.add_error("Diagram location could not find API object",
                                  device_class=category,
                                  device=idtag,)
@@ -111,6 +112,7 @@ class PointsGroup:
                                                             w=location['w'],
                                                             h=location['h'],
                                                             r=location['r'],
+                                                            draw_labels=location.get('draw_labels', True),
                                                             api_object=api_object)
                 if 'latitude' in location:
                     self.locations[idtag] = MapLocation(latitude=location['latitude'],

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/Diagrams/graphic_location.py

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 from typing import Dict, List, Tuple, Union
-from GridCalEngine.Devices.Parents.editable_device import EditableDevice
+from GridCalEngine.Devices.types import ALL_DEV_TYPES
 
 
 class GraphicLocation:
@@ -29,8 +29,9 @@ class GraphicLocation:
                  h: int = 80,
                  w: int = 80,
                  r: float = 0,
-                 poly_line: List[Tuple[int, int]] = list(),
-                 api_object: EditableDevice = None):
+                 poly_line: Union[None, List[Tuple[int, int]]] = None,
+                 draw_labels: bool = True,
+                 api_object: ALL_DEV_TYPES = None):
         """
         GraphicLocation
         :param x: x position (px)
@@ -39,6 +40,7 @@ class GraphicLocation:
         :param w: width (px)
         :param r: rotation (deg)
         :param poly_line: List of poits to represent a polyline, if this object is to use one
+        :param draw_labels: Draw labels?
         :param api_object: object to be linked to this representation
         """
         self.x = x
@@ -46,7 +48,8 @@ class GraphicLocation:
         self.h = h
         self.w = w
         self.r = r
-        self.poly_line = poly_line
+        self.poly_line = list() if poly_line is None else poly_line
+        self.draw_labels = draw_labels
         self.api_object = api_object
 
     def get_properties_dict(self) -> Dict[str, Union[int, str]]:
@@ -60,4 +63,5 @@ class GraphicLocation:
                 'w': self.w,
                 'r': self.r,
                 'poly_line': self.poly_line,
+                'draw_labels': self.draw_labels,
                 'api_object': self.api_object.idtag if self.api_object else ''}

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/Devices/multi_circuit.py

@@ -2437,7 +2437,7 @@ class MultiCircuit:
 
         return data
 
-    def gat_all_elements_dict_by_type(self) -> dict[Callable[[], Any], Union[dict[str, ALL_DEV_TYPES], Any]]:
+    def get_all_elements_dict_by_type(self) -> dict[Callable[[], Any], Union[dict[str, ALL_DEV_TYPES], Any]]:
         """
         Get a dictionary of all elements by type
         :return:

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/cim/cgmes/cgmes_data_parser.py

@@ -356,18 +356,23 @@ class CgmesDataParser(BaseCircuit):
                     self.parsed_data[file_name] = file_cgmes_data
                     profile = model_info.get('profile', '')
 
-                    for prof in profile:
-                        if prof in cgmes2_4_15_uri:
-                            self.cgmes_version = "2.4.15"
-                        elif prof in cgmes3_0_0_uri:
-                            self.cgmes_version = "3.0.0"
-
                     if isinstance(profile, list):
+                        for prof in profile:
+                            if prof in cgmes2_4_15_uri:
+                                self.cgmes_version = "2.4.15"
+                            elif prof in cgmes3_0_0_uri:
+                                self.cgmes_version = "3.0.0"
+
                         if 'Boundary' in profile[0]:
                             merge(self.boudary_set, file_cgmes_data, self.logger)
                         else:
                             merge(self.data, file_cgmes_data, self.logger)
                     else:
+                        if profile in cgmes2_4_15_uri:
+                            self.cgmes_version = "2.4.15"
+                        elif profile in cgmes3_0_0_uri:
+                            self.cgmes_version = "3.0.0"
+
                         if 'Boundary' in profile:
                             merge(self.boudary_set, file_cgmes_data, self.logger)
                         else:

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/cim/cgmes/cgmes_export.py

@@ -154,7 +154,7 @@ class CimExporter:
                         "description": "str"}
 
         for instance in self.cgmes_circuit.FullModel_list:
-            instance_dict = instance.parsed_properties
+            instance_dict = instance.__dict__
             if self.is_in_profile(instance_profiles=instance_dict.get("profile"), model_profile=profile):
                 element = Et.Element("md:FullModel", {"rdf:about": "urn:uuid:" + instance.rdfid})
                 for attr_name, attr_value in instance_dict.items():

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/cim/cgmes/gridcal_to_cgmes.py

@@ -1,6 +1,6 @@
 from GridCalEngine.Devices import MultiCircuit
 from GridCalEngine.Devices.Substation.bus import Bus
-from GridCalEngine.IO.cim.cgmes.base import get_new_rdfid, form_rdfid
+from GridCalEngine.IO.cim.cgmes.base import get_new_rdfid, form_rdfid, rfid2uuid
 from GridCalEngine.IO.cim.cgmes.cgmes_circuit import CgmesCircuit
 from GridCalEngine.IO.cim.cgmes.cgmes_v2_4_15.devices.full_model import FullModel
 from GridCalEngine.IO.cim.cgmes.base import Base
@@ -38,33 +38,36 @@ class ReferenceManager:
 #     pass   # TODO
 
 
-def find_object_by_uuid(object_list, target_uuid):  # TODO move to CGMES utils
+def find_object_by_uuid(cgmes_model: CgmesCircuit, object_list, target_uuid):  # TODO move to CGMES utils
     """
     Finds an object with the specified uuid
      in the given object_list from a CGMES Circuit.
 
     Args:
+        cgmes_model:
         object_list (list[MyObject]): List of MyObject instances.
         target_uuid (str): The uuid to search for.
 
     Returns:
         MyObject or None: The found object or None if not found.
     """
+    boundary_obj_dict = cgmes_model.all_objects_dict_boundary
+    if boundary_obj_dict is not None:
+        for k, obj in boundary_obj_dict.items():
+            if rfid2uuid(k) == target_uuid:
+                return obj
     for obj in object_list:
         if obj.uuid == target_uuid:
             return obj
     return None
 
 
-def find_object_by_tn_uuid(object_list: List[cgmes.VoltageLevel], target_uuid):
-    """ for Voltage Levels.. """
-    for obj in object_list:
-        if obj.TopologicalNode.uuid == target_uuid:
-            return obj
-    return None
-
-
-def find_object_by_vnom(object_list: List[cgmes.BaseVoltage], target_vnom):
+def find_object_by_vnom(cgmes_model: CgmesCircuit, object_list: List[cgmes.BaseVoltage], target_vnom):
+    boundary_obj_list = cgmes_model.elements_by_type_boundary.get("BaseVoltage")
+    if boundary_obj_list is not None:
+        for obj in boundary_obj_list:
+            if obj.nominalVoltage == target_vnom:
+                return obj
     for obj in object_list:
         if obj.nominalVoltage == target_vnom:
             return obj
@@ -174,12 +177,11 @@ def create_cgmes_headers(cgmes_model: CgmesCircuit, desc: str = "", scenariotime
 
         fm_list[0].DependentOn = [eqbd_id]
         fm_list[1].DependentOn = [fm_list[0].rdfid]
+        fm_list[2].DependentOn = [fm_list[0].rdfid]
         if tpbd_id != "":
-            fm_list[2].DependentOn = [eqbd_id, tpbd_id, fm_list[0].rdfid]
-            fm_list[3].DependentOn = [tpbd_id, fm_list[0].rdfid, fm_list[1].rdfid, fm_list[2].rdfid]
+            fm_list[3].DependentOn = [tpbd_id, fm_list[1].rdfid, fm_list[2].rdfid]
         else:
-            fm_list[2].DependentOn = [eqbd_id, fm_list[0].rdfid]
-            fm_list[3].DependentOn = [fm_list[0].rdfid, fm_list[1].rdfid, fm_list[2].rdfid]
+            fm_list[3].DependentOn = [fm_list[1].rdfid, fm_list[2].rdfid]
     except TypeError:
         print("Missing default boundary files")
         fm_list[1].DependentOn = [fm_list[0].rdfid]
@@ -203,6 +205,7 @@ def create_cgmes_terminal(bus: Bus,
     # term.ConductingEquipment = BusBarSection
     term.connected = True
     tn = find_object_by_uuid(
+        cgmes_model=cgmes_model,
         object_list=cgmes_model.TopologicalNode_list,
         target_uuid=bus.idtag
     )
@@ -327,13 +330,22 @@ def get_cgmes_subgeograpical_regions(multi_circuit_model: MultiCircuit,
     pass
 
 
+def get_base_voltage_from_boundary(cgmes_model: CgmesCircuit, vnom: float):
+    bv_list = cgmes_model.elements_by_type_boundary.get("BaseVoltage")
+    if bv_list is not None:
+        for bv in bv_list:
+            if bv.nominalVoltage == vnom:
+                return bv
+    return None
+
+
 def get_cgmes_base_voltages(multi_circuit_model: MultiCircuit,
                             cgmes_model: CgmesCircuit,
                             logger: DataLogger) -> None:
     base_volt_set = set()
     for bus in multi_circuit_model.buses:
 
-        if bus.Vnom not in base_volt_set:
+        if bus.Vnom not in base_volt_set and get_base_voltage_from_boundary(cgmes_model, vnom=bus.Vnom) is None:
             base_volt_set.add(bus.Vnom)
 
             new_rdf_id = get_new_rdfid()
@@ -352,6 +364,7 @@ def get_cgmes_substations(multi_circuit_model: MultiCircuit,
         substation = cgmes.Substation(rdfid=form_rdfid(mc_elm.idtag))
         substation.name = mc_elm.name
         substation.Region = find_object_by_uuid(
+            cgmes_model=cgmes_model,
             object_list=cgmes_model.SubGeographicalRegion_list,
             target_uuid=mc_elm.idtag  # TODO Community.idtag!
         )
@@ -367,6 +380,7 @@ def get_cgmes_voltage_levels(multi_circuit_model: MultiCircuit,
         vl = cgmes.VoltageLevel(rdfid=form_rdfid(mc_elm.idtag))
         vl.name = mc_elm.name
         vl.BaseVoltage = find_object_by_vnom(
+            cgmes_model=cgmes_model,
             object_list=cgmes_model.BaseVoltage_list,
             target_vnom=mc_elm.Vnom
         )
@@ -375,6 +389,7 @@ def get_cgmes_voltage_levels(multi_circuit_model: MultiCircuit,
 
         if mc_elm.substation is not None:
             substation: cgmes.Substation = find_object_by_uuid(
+                cgmes_model=cgmes_model,
                 object_list=cgmes_model.Substation_list,
                 target_uuid=mc_elm.substation.idtag
             )
@@ -397,12 +412,14 @@ def get_cgmes_tn_nodes(multi_circuit_model: MultiCircuit,
         tn = cgmes.TopologicalNode(rdfid=bus.idtag)
         tn.name = bus.name
         tn.BaseVoltage = find_object_by_vnom(
+            cgmes_model=cgmes_model,
             object_list=cgmes_model.BaseVoltage_list,
             target_vnom=bus.Vnom
         )
 
         if bus.voltage_level is not None:  # VoltageLevel
             vl: cgmes.VoltageLevel = find_object_by_uuid(
+                cgmes_model=cgmes_model,
                 object_list=cgmes_model.VoltageLevel_list,
                 target_uuid=bus.voltage_level.idtag
             )
@@ -426,9 +443,9 @@ def get_cgmes_cn_nodes(multi_circuit_model: MultiCircuit,
 
         cn = cgmes.ConnectivityNode(rdfid=form_rdfid(mc_elm.idtag))
         cn.name = mc_elm.name
-        tn = None
         if mc_elm.default_bus is not None:
             tn: cgmes.TopologicalNode = find_object_by_uuid(
+                cgmes_model=cgmes_model,
                 object_list=cgmes_model.TopologicalNode_list,
                 target_uuid=mc_elm.default_bus.idtag
             )
@@ -438,12 +455,12 @@ def get_cgmes_cn_nodes(multi_circuit_model: MultiCircuit,
                 tn.ConnectivityNodes = cn  # link back
             else:
                 logger.add_error(msg='No TopologinalNode found',
-                                 device=cn,
+                                 device=cn.name,
                                  device_class=cn.tpe)
         else:
             logger.add_error(msg='Connectivity Node has no default bus',
-                             device=mc_elm,
-                             device_class=gcdev.ConnectivityNode)
+                             device=mc_elm.name,
+                             device_class=mc_elm.device_type)
             # print(f'Topological node not found for cn: {cn.name}')
 
         cgmes_model.add(cn)
@@ -535,8 +552,9 @@ def get_cgmes_equivalent_injections(multicircuit_model: MultiCircuit,
         ei.name = mc_elm.name
         ei.p = mc_elm.P
         ei.q = mc_elm.Q
-        ei.BaseVoltage = find_object_by_attribute(cgmes_model.BaseVoltage_list, "nominalVoltage",
-                                                  mc_elm.bus.Vnom)
+        ei.BaseVoltage = find_object_by_vnom(cgmes_model=cgmes_model,
+                                             object_list=cgmes_model.BaseVoltage_list,
+                                             target_vnom=mc_elm.bus.Vnom)
 
         cgmes_model.add(ei)
 
@@ -558,11 +576,10 @@ def get_cgmes_ac_line_segments(multicircuit_model: MultiCircuit,
         line = cgmes.ACLineSegment(rdfid=form_rdfid(mc_elm.idtag))
         line.description = mc_elm.code
         line.name = mc_elm.name
-        line.BaseVoltage = find_object_by_attribute(
-            object_list=cgmes_model.BaseVoltage_list,
-            target_attr_name="nominalVoltage",
-            target_value=mc_elm.get_max_bus_nominal_voltage()
-        )  # which Vnom we need?
+        line.BaseVoltage = find_object_by_vnom(cgmes_model=cgmes_model,
+                                               object_list=cgmes_model.BaseVoltage_list,
+                                               target_vnom=mc_elm.get_max_bus_nominal_voltage()
+                                               )  # which Vnom we need?
         vnom = line.BaseVoltage.nominalVoltage
 
         if vnom is not None:

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/file_handler.py

@@ -48,6 +48,8 @@ from GridCalEngine.IO.gridcal.h5_interface import save_h5, open_h5
 from GridCalEngine.IO.raw.rawx_parser_writer import parse_rawx, write_rawx
 from GridCalEngine.IO.others.pypsa_parser import parse_netcdf, parse_hdf5
 from GridCalEngine.Devices.multi_circuit import MultiCircuit
+from GridCalEngine.Simulations.results_template import DriverToSave
+from GridCalEngine.enumerations import CGMESVersions
 
 
 class FileSavingOptions:
@@ -58,21 +60,25 @@ class FileSavingOptions:
     def __init__(self,
                  cgmes_boundary_set: str = "",
                  simulation_drivers: List[DriverTemplate] = None,
-                 sessions: List[Any] = None,
-                 dictionary_of_json_files: Dict[str, Dict[str, Any]] = None):
+                 sessions_data: List[DriverToSave] = None,
+                 dictionary_of_json_files: Dict[str, Dict[str, Any]] = None,
+                 cgmes_version: CGMESVersions = CGMESVersions.v2_4_15):
         """
         Constructor
         :param cgmes_boundary_set: CGMES boundary set zip file path
         :param simulation_drivers: List of Simulation Drivers
-        :param sessions: List of sessions
+        :param sessions_data: List of sessions_data
         :param dictionary_of_json_files: Dictionary of json files
+        :param cgmes_version: Version to use with CGMES
         """
 
+        self.cgmes_vesrion: CGMESVersions = cgmes_version
+
         self.cgmes_boundary_set: str = cgmes_boundary_set
 
         self.simulation_drivers = simulation_drivers if simulation_drivers else list()
 
-        self.sessions = sessions if sessions else list()
+        self.sessions_data: List[DriverToSave] = sessions_data if sessions_data else list()
 
         self.dictionary_of_json_files = dictionary_of_json_files if dictionary_of_json_files else dict()
 
@@ -125,7 +131,7 @@ class FileOpen:
                 _, file_extension = os.path.splitext(f)
                 if file_extension.lower() not in ['.xml', '.zip']:
                     raise Exception('Loading multiple files that are not XML/Zip (xml or zip is for CIM or CGMES)')
-            import time
+
             data_parser = CgmesDataParser(text_func=text_func, progress_func=progress_func, logger=self.cgmes_logger)
             data_parser.load_files(files=self.file_name)
             self.cgmes_circuit = CgmesCircuit(cgmes_version=data_parser.cgmes_version, text_func=text_func,
@@ -398,7 +404,7 @@ class FileSave:
         save_gridcal_data_to_zip(dfs=dfs,
                                  filename_zip=self.file_name,
                                  model_data=model_data,
-                                 sessions=self.options.sessions,
+                                 sessions_data=self.options.sessions_data,
                                  diagrams=self.circuit.diagrams,
                                  json_files=self.options.dictionary_of_json_files,
                                  text_func=self.text_func,

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/gridcal/excel_interface.py

@@ -195,7 +195,7 @@ def load_from_xls(filename: str) -> Dict[str, pd.DataFrame]:
                     # pandas does not read complex numbers right,
                     # so when we expect a complex number input, parse directly
                     for c in df.columns.values:
-                        df[c] = df[c].apply(lambda x: np.complex(x))
+                        df[c] = df[c].apply(lambda x: complex(x))
 
                 data[name] = df
 
@@ -246,16 +246,23 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
                 attr = 'template'
 
             if hasattr(obj_, attr):
-                conv = obj_.registered_properties[attr].tpe  # get the type converter
-                if conv is None:
-                    setattr(obj_, attr, values[a])
-                elif conv is dev.BranchType:
-                    # cbr = BranchTypeConverter(None)
-                    setattr(obj_, attr, dev.BranchType(values[a]))
-                elif isinstance(conv, DeviceType):
-                    pass
+
+                prop = obj_.registered_properties.get(attr, None)
+
+                if prop is not None:
+                    conv = prop.tpe  # get the type converter
+                    if conv is None:
+                        setattr(obj_, attr, values[a])
+                    elif conv is dev.BranchType:
+                        # cbr = BranchTypeConverter(None)
+                        setattr(obj_, attr, dev.BranchType(values[a]))
+                    elif isinstance(conv, DeviceType):
+                        pass
+                    else:
+                        setattr(obj_, attr, conv(values[a]))
                 else:
-                    setattr(obj_, attr, conv(values[a]))
+                    # the property wasn't found
+                    pass
             else:
 
                 if attr in ['Y', 'Z', 'I', 'S', 'seq_resistance', 'seq_admittance', 'Zf']:
@@ -315,7 +322,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
             set_object_attributes(obj, hdr, vals[i, :])
             bus_dict[obj.name] = obj
             circuit.add_bus(obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No buses in the file!')
 
@@ -372,7 +378,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
                 obj.name += f"{circuit.get_loads_number()} @{bus.name}"
 
             circuit.add_load(bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No loads in the file!')
 
@@ -414,7 +419,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_generator(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No controlled generator in the file!')
 
@@ -454,7 +458,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
                 obj.name += str(circuit.get_batteries_number() + 1) + '@' + bus.name
 
             circuit.add_battery(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No battery in the file!')
 
@@ -495,7 +498,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_static_generator(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No static generator in the file!')
 
@@ -525,7 +527,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_shunt(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No shunt in the file!')
 
@@ -635,7 +636,6 @@ def interprete_excel_v2(circuit: MultiCircuit, data):
 
             # set the branch
             circuit.add_branch(obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
 
     else:
         circuit.logger.add_warning('No Branches in the file!')
@@ -732,7 +732,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
             set_object_attributes(obj, hdr, vals[i, :])
             bus_dict[obj.name] = obj
             circuit.add_bus(obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No buses in the file!')
 
@@ -778,7 +777,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_load(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No loads in the file!')
 
@@ -833,7 +831,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_generator(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No controlled generator in the file!')
 
@@ -880,7 +877,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_battery(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No battery in the file!')
 
@@ -931,7 +927,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_static_generator(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No static generator in the file!')
 
@@ -982,7 +977,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             obj.bus = bus
             circuit.add_shunt(bus=bus, api_obj=obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
     else:
         circuit.logger.add_warning('No shunt in the file!')
 
@@ -1099,7 +1093,6 @@ def interpret_excel_v3(circuit: MultiCircuit, data):
 
             # set the branch
             circuit.add_branch(obj)
-            obj.ensure_profiles_exist(circuit.time_profile)
 
             if 'branch_active_prof' in data.keys():
                 val = data['branch_active_prof'].values[:, i]

{GridCalEngine-5.1.5 → GridCalEngine-5.1.7}/GridCalEngine/IO/gridcal/pack_unpack.py

@@ -1315,7 +1315,7 @@ def parse_gridcal_data(data: Dict[str, Union[str, float, Dict, pd.DataFrame, Dic
     if 'diagrams' in data.keys():
 
         if len(data['diagrams']):
-            obj_dict = circuit.gat_all_elements_dict_by_type()
+            obj_dict = circuit.get_all_elements_dict_by_type()
 
             for diagram_dict in data['diagrams']: