GridCalEngine 5.1.1__tar.gz → 5.1.3__tar.gz

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Compilers/circuit_to_data.py

@@ -63,10 +63,10 @@ def get_bus_data(circuit: MultiCircuit,
         bus_data.angle_max[i] = bus.angle_max
 
         if bus.is_slack:
-            bus_data.bus_types[i] = 3  # VD
+            bus_data.bus_types[i] = BusMode.Slack.value  # VD
         else:
             # bus.determine_bus_type().value
-            bus_data.bus_types[i] = 1  # PQ by default, later it is modified by generators and batteries
+            bus_data.bus_types[i] = BusMode.PQ.value  # PQ by default, later it is modified by generators and batteries
 
         if bus.substation is not None:
             bus_data.substations[i] = substation_dict[bus.substation]
@@ -172,11 +172,11 @@ def get_load_data(circuit: MultiCircuit,
 
         # change stuff depending on the modes
         if elm.mode == ExternalGridMode.VD:
-            bus_data.bus_types[i] = 3  # set as Slack
+            bus_data.bus_types[i] = BusMode.Slack.value  # set as Slack
 
         elif elm.mode == ExternalGridMode.PV:
-            if bus_data.bus_types[i] != 3:  # if it is not Slack
-                bus_data.bus_types[i] = 2  # set as PV
+            if bus_data.bus_types[i] != BusMode.Slack.value:  # if it is not Slack
+                bus_data.bus_types[i] = BusMode.PV.value  # set as PV
 
                 if not use_stored_guess:
 
@@ -381,8 +381,8 @@ def get_generator_data(circuit: MultiCircuit,
 
                 if elm.is_controlled:
 
-                    if bus_data.bus_types[i] != 3:  # if it is not Slack
-                        bus_data.bus_types[i] = 2  # set as PV
+                    if bus_data.bus_types[i] != BusMode.Slack.value:  # if it is not Slack
+                        bus_data.bus_types[i] = BusMode.PV.value  # set as PV
 
                         if not use_stored_guess:
                             if Vbus[i].real == 1.0:
@@ -410,8 +410,8 @@ def get_generator_data(circuit: MultiCircuit,
                     bus_data.srap_availbale_power[i] += data.p[k]
 
                 if elm.is_controlled:
-                    if bus_data.bus_types[i] != 3:  # if it is not Slack
-                        bus_data.bus_types[i] = 2  # set as PV
+                    if bus_data.bus_types[i] != BusMode.Slack.value:  # if it is not Slack
+                        bus_data.bus_types[i] = BusMode.PV.value  # set as PV
 
                     if not use_stored_guess:
                         if Vbus[i].real == 1.0:
@@ -519,8 +519,8 @@ def get_battery_data(circuit: MultiCircuit,
                     bus_data.srap_availbale_power[i] += data.p[k]
 
                 if elm.is_controlled:
-                    if bus_data.bus_types[i] != 3:  # if it is not Slack
-                        bus_data.bus_types[i] = 2  # set as PV
+                    if bus_data.bus_types[i] != BusMode.Slack.value:  # if it is not Slack
+                        bus_data.bus_types[i] = BusMode.PV.value  # set as PV
 
                         if not use_stored_guess:
                             if Vbus[i].real == 1.0:
@@ -548,8 +548,8 @@ def get_battery_data(circuit: MultiCircuit,
                     bus_data.srap_availbale_power[i] += data.p[k]
 
                 if elm.is_controlled:
-                    if bus_data.bus_types[i] != 3:  # if it is not Slack
-                        bus_data.bus_types[i] = 2  # set as PV
+                    if bus_data.bus_types[i] != BusMode.Slack.value:  # if it is not Slack
+                        bus_data.bus_types[i] = BusMode.PV.value  # set as PV
 
                     if not use_stored_guess:
                         if Vbus[i].real == 1.0:
@@ -1228,9 +1228,13 @@ def get_fluid_node_data(circuit: MultiCircuit,
         if time_series:
             data.inflow[k] = elm.inflow_prof[t_idx]
             data.spillage_cost[k] = elm.spillage_cost_prof[t_idx]
+            data.max_soc[k] = elm.max_soc_prof[t_idx]
+            data.min_soc[k] = elm.min_soc_prof[t_idx]
         else:
             data.inflow[k] = elm.inflow
             data.spillage_cost[k] = elm.spillage_cost
+            data.max_soc[k] = elm.max_soc
+            data.min_soc[k] = elm.min_soc
 
     return data, plant_dict
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/DataStructures/fluid_node_data.py

@@ -35,8 +35,9 @@ class FluidNodeData:
 
         self.min_level = np.zeros(nelm, dtype=float)
         self.max_level = np.zeros(nelm, dtype=float)
+        self.min_soc = np.zeros(nelm, dtype=float)
+        self.max_soc = np.zeros(nelm, dtype=float)
         self.initial_level = np.zeros(nelm, dtype=float)
-        # self.bus_index = np.empty()  # TODO: check if relevant
         self.inflow = np.zeros(nelm, dtype=float)
         self.spillage_cost = np.zeros(nelm, dtype=float)
 
@@ -61,6 +62,8 @@ class FluidNodeData:
 
         data.min_level = self.min_level.copy()
         data.max_level = self.max_level.copy()
+        data.min_soc = self.min_soc.copy()
+        data.max_soc = self.max_soc.copy()
         data.initial_level = self.initial_level.copy()
 
         data.inflow = self.inflow.copy()

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/DataStructures/numerical_circuit.py

@@ -827,15 +827,14 @@ class NumericalCircuit:
     def get_simulation_indices(self) -> si.SimulationIndices:
         """
         Get the simulation indices
-        :return:
+        :return: SimulationIndices
         """
         return si.SimulationIndices(bus_types=self.bus_data.bus_types,
                                     Pbus=self.Sbus.real,
                                     control_mode=self.branch_data.control_mode,
                                     F=self.branch_data.F,
                                     T=self.branch_data.T,
-                                    dc=self.branch_data.dc
-                                    )
+                                    dc=self.branch_data.dc)
 
     def get_connectivity_matrices(self) -> tp.ConnectivityMatrices:
         """

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Aggregation/__init__.py

@@ -29,3 +29,4 @@ from GridCalEngine.Devices.Aggregation.community import Community
 from GridCalEngine.Devices.Aggregation.region import Region
 from GridCalEngine.Devices.Aggregation.municipality import Municipality
 from GridCalEngine.Devices.Aggregation.branch_group import BranchGroup
+from GridCalEngine.Devices.Aggregation.modelling_authority import ModellingAuthority

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Aggregation/emission_gas.py

@@ -46,7 +46,7 @@ class EmissionGas(EditableDevice):
 
         self.cost = cost
 
-        self._cost_prof = Profile(default_value=cost)
+        self._cost_prof = Profile(default_value=cost, data_type=float)
 
         self.color = color if color is not None else self.rnd_color()
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Aggregation/fuel.py

@@ -43,7 +43,7 @@ class Fuel(EditableDevice):
 
         self.cost = cost
 
-        self._cost_prof = Profile(default_value=cost)
+        self._cost_prof = Profile(default_value=cost, data_type=float)
 
         self.color = color if color is not None else self.rnd_color()
 

GridCalEngine-5.1.1/GridCalEngine/Devices/Diagrams/node_breaker_diagram.py → GridCalEngine-5.1.3/GridCalEngine/Devices/Aggregation/modelling_authority.py

@@ -15,19 +15,21 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from GridCalEngine.Devices.Diagrams.base_diagram import BaseDiagram
-from GridCalEngine.enumerations import DiagramType
 
+from typing import Union
+from GridCalEngine.Devices.Parents.editable_device import EditableDevice, DeviceType
 
-class NodeBreakerDiagram(BaseDiagram):
-    """
-    Diagram
-    """
 
-    def __init__(self, idtag=None, name=''):
-        """
+class ModellingAuthority(EditableDevice):
 
-        :param name: Diagram name
+    def __init__(self, name='', code='', idtag: Union[str, None] = None):
         """
-        BaseDiagram.__init__(self, idtag=idtag, name=name, diagram_type=DiagramType.NodeBreaker)
 
+        :param name:
+        :param idtag:
+        """
+        EditableDevice.__init__(self,
+                                name=name,
+                                code=code,
+                                idtag=idtag,
+                                device_type=DeviceType.ModellingAuthority)

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/branch.py

@@ -162,7 +162,7 @@ class Branch(BranchParent):
         # Conductor base and operating temperatures in ºC
         self.temp_base = temp_base
         self.temp_oper = temp_oper
-        self._temp_oper_prof = Profile(default_value=temp_oper)
+        self._temp_oper_prof = Profile(default_value=temp_oper, data_type=float)
 
         # Conductor thermal constant (1/ºC)
         self.alpha = alpha
@@ -182,7 +182,7 @@ class Branch(BranchParent):
 
         # branch rating in MVA
         self.rate = rate
-        self._rate_prof = Profile(default_value=rate)
+        self._rate_prof = Profile(default_value=rate, data_type=float)
 
         # branch type: Line, Transformer, etc...
         self.branch_type = branch_type

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/dc_line.py

@@ -124,7 +124,7 @@ class DcLine(BranchParent):
         # Conductor base and operating temperatures in ºC
         self.temp_base = temp_base
         self.temp_oper = temp_oper
-        self._temp_oper_prof = Profile(default_value=temp_oper)
+        self._temp_oper_prof = Profile(default_value=temp_oper, data_type=float)
 
         # Conductor thermal constant (1/ºC)
         self.alpha = alpha

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/hvdc_line.py

@@ -228,11 +228,11 @@ class HvdcLine(BranchParent):
 
         self.control_mode = control_mode
 
-        self._Pset_prof: Vec = Profile(default_value=Pset)
-        self._active_prof: IntVec = Profile(default_value=active)
-        self._Vset_f_prof: Vec = Profile(default_value=Vset_f)
-        self._Vset_t_prof: Vec = Profile(default_value=Vset_t)
-        self._angle_droop_prof: Vec = Profile(default_value=angle_droop)
+        self._Pset_prof: Vec = Profile(default_value=Pset, data_type=float)
+        self._active_prof: IntVec = Profile(default_value=active, data_type=bool)
+        self._Vset_f_prof: Vec = Profile(default_value=Vset_f, data_type=float)
+        self._Vset_t_prof: Vec = Profile(default_value=Vset_t, data_type=float)
+        self._angle_droop_prof: Vec = Profile(default_value=angle_droop, data_type=float)
 
         self.n_lines = n_lines
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/line.py

@@ -129,7 +129,7 @@ class Line(BranchParent):
         # Conductor base and operating temperatures in ºC
         self.temp_base = temp_base
         self.temp_oper = temp_oper
-        self._temp_oper_prof = Profile(default_value=temp_oper)
+        self._temp_oper_prof = Profile(default_value=temp_oper, data_type=float)
 
         # Conductor thermal constant (1/ºC)
         self.alpha = alpha

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/series_reactance.py

@@ -114,7 +114,7 @@ class SeriesReactance(BranchParent):
         # Conductor base and operating temperatures in ºC
         self.temp_base = temp_base
         self.temp_oper = temp_oper
-        self._temp_oper_prof = Profile(default_value=temp_oper)
+        self._temp_oper_prof = Profile(default_value=temp_oper, data_type=float)
 
         # Conductor thermal constant (1/ºC)
         self.alpha = alpha

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/tap_changer.py

@@ -19,7 +19,7 @@ import numpy as np
 import pandas as pd
 from typing import Union, Dict
 from GridCalEngine.enumerations import TapChangerTypes
-from GridCalEngine.basic_structures import IntVec, Vec
+from GridCalEngine.basic_structures import Vec
 
 
 def find_closest_number(arr: Vec, target: float) -> int:

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Branches/transformer3w.py

@@ -85,7 +85,7 @@ class Transformer3W(EditableDevice):
         self._bus3 = bus3
 
         self.active = active
-        self._active_prof = Profile(default_value=active)
+        self._active_prof = Profile(default_value=active, data_type=bool)
 
         self._V1 = V1
         self._V2 = V2
@@ -171,7 +171,9 @@ class Transformer3W(EditableDevice):
     def bus1(self, obj: Bus):
         self._bus1 = obj
         self.winding1.bus_to = obj
-        self.winding1.set_hv_and_lv(self.winding1.HV, self.winding1.LV)
+
+        if obj is not None:
+            self.winding1.set_hv_and_lv(self.winding1.HV, self.winding1.LV)
 
     @property
     def bus2(self) -> Bus:
@@ -184,7 +186,9 @@ class Transformer3W(EditableDevice):
     def bus2(self, obj: Bus):
         self._bus2 = obj
         self.winding2.bus_to = obj
-        self.winding2.set_hv_and_lv(self.winding2.HV, self.winding2.LV)
+
+        if obj is not None:
+            self.winding2.set_hv_and_lv(self.winding2.HV, self.winding2.LV)
 
     @property
     def bus3(self) -> Bus:
@@ -197,7 +201,9 @@ class Transformer3W(EditableDevice):
     def bus3(self, obj: Bus):
         self._bus3 = obj
         self.winding3.bus_to = obj
-        self.winding3.set_hv_and_lv(self.winding3.HV, self.winding3.LV)
+
+        if obj is not None:
+            self.winding3.set_hv_and_lv(self.winding3.HV, self.winding3.LV)
 
     @property
     def V1(self) -> float:

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Diagrams/__init__.py

@@ -16,7 +16,6 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 from GridCalEngine.Devices.Diagrams.graphic_location import GraphicLocation
-from GridCalEngine.Devices.Diagrams.bus_branch_diagram import BusBranchDiagram
+from GridCalEngine.Devices.Diagrams.schematic_diagram import SchematicDiagram
 from GridCalEngine.Devices.Diagrams.map_location import MapLocation
 from GridCalEngine.Devices.Diagrams.map_diagram import MapDiagram
-from GridCalEngine.Devices.Diagrams.node_breaker_diagram import NodeBreakerDiagram

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Diagrams/base_diagram.py

@@ -234,7 +234,10 @@ class BaseDiagram:
 
         self.name = data['name']
 
-        self.diagram_type = DiagramType(data['type'])
+        if data['type'] == 'bus-branch':
+            self.diagram_type = DiagramType.Schematic
+        else:
+            self.diagram_type = DiagramType(data['type'])
 
         for category, loc_dict in data['data'].items():
 

GridCalEngine-5.1.1/GridCalEngine/Devices/Diagrams/bus_branch_diagram.py → GridCalEngine-5.1.3/GridCalEngine/Devices/Diagrams/schematic_diagram.py

@@ -19,7 +19,7 @@ from GridCalEngine.Devices.Diagrams.base_diagram import BaseDiagram
 from GridCalEngine.enumerations import DiagramType
 
 
-class BusBranchDiagram(BaseDiagram):
+class SchematicDiagram(BaseDiagram):
     """
     Diagram
     """
@@ -29,4 +29,4 @@ class BusBranchDiagram(BaseDiagram):
 
         :param name: Diagram name
         """
-        BaseDiagram.__init__(self, idtag=idtag, name=name, diagram_type=DiagramType.BusBranch)
+        BaseDiagram.__init__(self, idtag=idtag, name=name, diagram_type=DiagramType.Schematic)

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Fluid/fluid_node.py

@@ -32,6 +32,8 @@ class FluidNode(EditableDevice):
                  code: str = '',
                  min_level: float = 0.0,
                  max_level: float = 0.0,
+                 min_soc: float = 0.0,
+                 max_soc: float = 1.0,
                  current_level: float = 0.0,
                  spillage_cost: float = 1000.0,
                  inflow: float = 0.0,
@@ -58,14 +60,19 @@ class FluidNode(EditableDevice):
 
         self.min_level = min_level  # hm3
         self.max_level = max_level  # hm3
+        self.max_soc = max_soc  # p.u.
+        self.min_soc = min_soc  # p.u.
         self.initial_level = current_level  # hm3
         self.spillage_cost = spillage_cost  # m3/s
         self.inflow = inflow  # m3/s
         self._bus: Bus = bus
         self.build_status = build_status
 
-        self._inflow_prof = Profile(default_value=inflow)  # m3/s
-        self._spillage_cost_prof = Profile(default_value=spillage_cost)  # e/(m3/s)
+        self._inflow_prof = Profile(default_value=inflow, data_type=float)  # m3/s
+        self._spillage_cost_prof = Profile(default_value=spillage_cost, data_type=float)  # e/(m3/s)
+
+        self._max_soc_prof = Profile(default_value=max_soc, data_type=float)  # p.u.
+        self._min_soc_prof = Profile(default_value=min_soc, data_type=float)  # p.u.
 
         self.register(key='min_level', units='hm3', tpe=float,
                       definition="Minimum amount of fluid at the node/reservoir")
@@ -73,6 +80,14 @@ class FluidNode(EditableDevice):
         self.register(key='max_level', units='hm3', tpe=float,
                       definition="Maximum amount of fluid at the node/reservoir")
 
+        self.register(key='min_soc', units='p.u.', tpe=float,
+                      definition="Minimum SOC of fluid at the node/reservoir",
+                      profile_name='min_soc_prof')
+
+        self.register(key='max_soc', units='p.u.', tpe=float,
+                      definition="Maximum SOC of fluid at the node/reservoir",
+                      profile_name='max_soc_prof')
+
         self.register(key='initial_level', units='hm3', tpe=float,
                       definition="Initial level of the node/reservoir")
 
@@ -124,6 +139,40 @@ class FluidNode(EditableDevice):
         else:
             raise Exception(str(type(val)) + 'not supported to be set into a inflow_prof')
 
+    @property
+    def max_soc_prof(self) -> Profile:
+        """
+        Max soc profile
+        :return: Profile
+        """
+        return self._max_soc_prof
+
+    @max_soc_prof.setter
+    def max_soc_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._max_soc_prof = val
+        elif isinstance(val, np.ndarray):
+            self._max_soc_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a max soc prof')
+
+    @property
+    def min_soc_prof(self) -> Profile:
+        """
+        Min soc profile
+        :return: Profile
+        """
+        return self._min_soc_prof
+
+    @min_soc_prof.setter
+    def min_soc_prof(self, val: Union[Profile, np.ndarray]):
+        if isinstance(val, Profile):
+            self._min_soc_prof = val
+        elif isinstance(val, np.ndarray):
+            self._min_soc_prof.set(arr=val)
+        else:
+            raise Exception(str(type(val)) + 'not supported to be set into a min soc prof')
+
     def copy(self):
         """
         Make a deep copy of this object
@@ -135,6 +184,8 @@ class FluidNode(EditableDevice):
 
         fluid_node.min_level = self.min_level  # hm3
         fluid_node.max_level = self.max_level  # hm3
+        fluid_node.min_soc = self.min_soc  # p.u.
+        fluid_node.max_soc = self.max_soc  # p.u.
         fluid_node.initial_level = self.initial_level  # hm3
         fluid_node.spillage_cost = self.spillage_cost  # m3/s
         fluid_node.inflow = self.inflow  # m3/s
@@ -143,6 +194,8 @@ class FluidNode(EditableDevice):
 
         fluid_node.inflow_prof = self.inflow_prof  # m3/s
         fluid_node.spillage_cost_prof = self.spillage_cost_prof  # e/(m3/s)
+        fluid_node.max_soc_prof = self.max_soc_prof  # m3
+        fluid_node.min_soc_prof = self.min_soc_prof  # m3
 
         return fluid_node
 

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Injections/controllable_shunt.py

@@ -84,7 +84,7 @@ class ControllableShunt(InjectionParent):
             self._b_steps[i] = b_per_step * (i + 1)
 
         self.step = step
-        self._step_prof = Profile(default_value=step)
+        self._step_prof = Profile(default_value=step, data_type=int)
 
         self.register(key='step', units='', tpe=int, definition='Device tap step', profile_name='step_prof')
         self.register(key='is_nonlinear', units='', tpe=bool, definition='Is non-linear?')

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Injections/current_injection.py

@@ -63,8 +63,8 @@ class CurrentInjection(InjectionParent):
         self.Ir = Ir
         self.Ii = Ii
 
-        self._Ir_prof = Profile(default_value=Ir)
-        self._Ii_prof = Profile(default_value=Ii)
+        self._Ir_prof = Profile(default_value=Ir, data_type=float)
+        self._Ii_prof = Profile(default_value=Ii, data_type=float)
 
         self.register(key='Ir', units='MW', tpe=float,
                       definition='Active power of the current component at V=1.0 p.u.',

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Injections/external_grid.py

@@ -73,8 +73,8 @@ class ExternalGrid(LoadParent):
         # Impedance in equivalent MVA
         self.Vm = Vm
         self.Va = Va
-        self._Vm_prof = Profile(default_value=Vm)
-        self._Va_prof = Profile(default_value=Va)
+        self._Vm_prof = Profile(default_value=Vm, data_type=float)
+        self._Va_prof = Profile(default_value=Va, data_type=float)
 
         self.register(key='mode', units='', tpe=ExternalGridMode,
                       definition='Operation mode of the external grid (voltage or load)')

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Injections/generator.py

@@ -144,7 +144,7 @@ class Generator(GeneratorParent):
         self.Pf = power_factor
 
         # voltage set profile for this load in p.u.
-        self._Pf_prof = Profile(default_value=power_factor)
+        self._Pf_prof = Profile(default_value=power_factor, data_type=float)
 
         # If this generator is voltage controlled it produces a PV node, otherwise the node remains as PQ
         self.is_controlled = is_controlled
@@ -156,7 +156,7 @@ class Generator(GeneratorParent):
         self.Vset = vset
 
         # voltage set profile for this load in p.u.
-        self._Vset_prof = Profile(default_value=vset)
+        self._Vset_prof = Profile(default_value=vset, data_type=float)
 
         self.use_reactive_power_curve = use_reactive_power_curve
 
@@ -186,8 +186,8 @@ class Generator(GeneratorParent):
         self.RampUp = 1e20
         self.RampDown = 1e20
 
-        self._Cost2_prof = Profile(default_value=Cost2)
-        self._Cost0_prof = Profile(default_value=Cost0)
+        self._Cost2_prof = Profile(default_value=Cost2, data_type=float)
+        self._Cost0_prof = Profile(default_value=Cost0, data_type=float)
 
         # Dynamic vars
         # self.Ra = Ra

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Injections/load.py

@@ -72,10 +72,10 @@ class Load(LoadParent):
         self.Ir = Ir
         self.Ii = Ii
 
-        self._G_prof = Profile(default_value=G)
-        self._B_prof = Profile(default_value=B)
-        self._Ir_prof = Profile(default_value=Ir)
-        self._Ii_prof = Profile(default_value=Ii)
+        self._G_prof = Profile(default_value=G, data_type=float)
+        self._B_prof = Profile(default_value=B, data_type=float)
+        self._Ir_prof = Profile(default_value=Ir, data_type=float)
+        self._Ii_prof = Profile(default_value=Ii, data_type=float)
 
         self.register(key='Ir', units='MW', tpe=float,
                       definition='Active power of the current component at V=1.0 p.u.', profile_name='Ir_prof')

{GridCalEngine-5.1.1 → GridCalEngine-5.1.3}/GridCalEngine/Devices/Parents/branch_parent.py

@@ -87,16 +87,16 @@ class BranchParent(EditableDevice):
 
         # connectivity
         self.bus_from = bus_from
-        self._bus_from_prof = Profile(default_value=bus_from)
+        self._bus_from_prof = Profile(default_value=bus_from, data_type=DeviceType.BusDevice)
 
         self.bus_to = bus_to
-        self._bus_to_prof = Profile(default_value=bus_to)
+        self._bus_to_prof = Profile(default_value=bus_to, data_type=DeviceType.BusDevice)
 
         self.cn_from = cn_from
         self.cn_to = cn_to
 
         self.active = active
-        self._active_prof = Profile(default_value=active)
+        self._active_prof = Profile(default_value=active, data_type=bool)
 
         self.contingency_enabled: bool = contingency_enabled
 
@@ -108,7 +108,7 @@ class BranchParent(EditableDevice):
 
         self.Cost = Cost
 
-        self._Cost_prof = Profile(default_value=Cost)
+        self._Cost_prof = Profile(default_value=Cost, data_type=float)
 
         self.capex = capex
 
@@ -118,13 +118,13 @@ class BranchParent(EditableDevice):
 
         # line rating in MVA
         self.rate = rate
-        self._rate_prof = Profile(default_value=rate)
+        self._rate_prof = Profile(default_value=rate, data_type=float)
 
         self.contingency_factor = contingency_factor
-        self._contingency_factor_prof = Profile(default_value=contingency_factor)
+        self._contingency_factor_prof = Profile(default_value=contingency_factor, data_type=float)
 
         self.protection_rating_factor = protection_rating_factor
-        self._protection_rating_factor_prof = Profile(default_value=protection_rating_factor)
+        self._protection_rating_factor_prof = Profile(default_value=protection_rating_factor, data_type=float)
 
         # List of measurements
         self.group: Union[BranchGroup, None] = None