GridCalEngine 5.1.2__tar.gz → 5.1.4__tar.gz

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/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:

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2/GridCalEngine/Devices/Diagrams/bus_branch_diagram.py → GridCalEngine-5.1.4/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.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Fluid/fluid_node.py

@@ -68,11 +68,11 @@ class FluidNode(EditableDevice):
         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)  # p.u.
-        self._min_soc_prof = Profile(default_value=min_soc)  # p.u.
+        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")

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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.2 → GridCalEngine-5.1.4}/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

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/controllable_branch_parent.py

@@ -172,7 +172,7 @@ class ControllableBranchParent(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
@@ -187,11 +187,11 @@ class ControllableBranchParent(BranchParent):
         else:
             self.tap_module = self._tap_changer.get_tap_module()
 
-        self._tap_module_prof = Profile(default_value=tap_module)
+        self._tap_module_prof = Profile(default_value=tap_module, data_type=float)
 
         # Tap angle
         self.tap_phase = tap_phase
-        self._tap_phase_prof = Profile(default_value=tap_phase)
+        self._tap_phase_prof = Profile(default_value=tap_phase, data_type=float)
 
         self.tap_module_max = tap_module_max
         self.tap_module_min = tap_module_min
@@ -201,11 +201,15 @@ class ControllableBranchParent(BranchParent):
         self.vset = vset
         self.Pset = Pset
 
-        self.control_mode: TransformerControlType = control_mode
+        self.control_mode: TransformerControlType = control_mode  # Legacy
+
         self.tap_module_control_mode: TapModuleControl = tap_module_control_mode
         self.tap_angle_control_mode: TapAngleControl = tap_angle_control_mode
+
         self.regulation_branch: BranchParent = regulation_branch
+
         self.regulation_bus: Bus = regulation_bus
+
         self.regulation_cn: ConnectivityNode = regulation_cn
 
         self.register(key='R', units='p.u.', tpe=float, definition='Total positive sequence resistance.')
@@ -254,13 +258,13 @@ class ControllableBranchParent(BranchParent):
                       definition='Objective power at the "from" side of when regulating the angle.')
 
         self.register(key='regulation_branch', units='', tpe=DeviceType.BranchDevice,
-                      definition='Branch where the controls are applied.')
+                      definition='Branch where the controls are applied.', editable=False)
 
         self.register(key='regulation_bus', units='', tpe=DeviceType.BusDevice,
-                      definition='Bus where the regulation is applied.')
+                      definition='Bus where the regulation is applied.', editable=False)
 
         self.register(key='regulation_cn', units='', tpe=DeviceType.ConnectivityNodeDevice,
-                      definition='Connectivity node where the regulation is applied.')
+                      definition='Connectivity node where the regulation is applied.', editable=False)
 
         self.register(key='temp_base', units='ºC', tpe=float, definition='Base temperature at which R was measured.')
         self.register(key='temp_oper', units='ºC', tpe=float, definition='Operation temperature to modify R.',
@@ -322,7 +326,7 @@ class ControllableBranchParent(BranchParent):
             raise Exception(str(type(val)) + 'not supported to be set into a temp_oper_prof')
 
     @property
-    def tap_changer(self) -> Profile:
+    def tap_changer(self) -> TapChanger:
         """
         Cost profile
         :return: Profile
@@ -378,14 +382,16 @@ class ControllableBranchParent(BranchParent):
         Move the tap changer one position up
         """
         self.tap_changer.tap_up()
-        self.tap_module = self.tap_changer.get_tap()
+        self.tap_module = self.tap_changer.get_tap_module()
+        self.tap_phase = self.tap_changer.get_tap_phase()
 
     def tap_down(self):
         """
         Move the tap changer one position up
         """
         self.tap_changer.tap_down()
-        self.tap_module = self.tap_changer.get_tap()
+        self.tap_module = self.tap_changer.get_tap_module()
+        self.tap_phase = self.tap_changer.get_tap_phase()
 
     def apply_tap_changer(self, tap_changer: TapChanger):
         """
@@ -399,6 +405,7 @@ class ControllableBranchParent(BranchParent):
         self.tap_changer = tap_changer
 
         if self.tap_module != 0:
-            self.tap_changer.set_tap(self.tap_module)
+            self.tap_changer.set_tap_module(tap_module=self.tap_module)
         else:
-            self.tap_module = self.tap_changer.get_tap()
+            self.tap_module = self.tap_changer.get_tap_module()
+            self.tap_phase = self.tap_changer.get_tap_phase()

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/editable_device.py

@@ -570,7 +570,10 @@ class EditableDevice:
         """
         # get the value of the magnitude
         snapshot_value = getattr(self, magnitude)
-        val = Profile(default_value=snapshot_value)
+        # val = Profile(default_value=snapshot_value)
+
+        val = self.get_profile(magnitude=magnitude)
+
         val.create_sparse(size=len(index), default_value=snapshot_value)
 
         # set the profile variable associated with the magnitude

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/generator_parent.py

@@ -87,15 +87,15 @@ class GeneratorParent(InjectionParent):
                                  device_type=device_type)
 
         self.control_bus = control_bus
-        self._control_bus_prof = Profile(default_value=control_bus)
+        self._control_bus_prof = Profile(default_value=control_bus, data_type=DeviceType.BusDevice)
 
         self.control_cn = control_cn
 
         self.P = P
-        self._P_prof = Profile(default_value=P)
+        self._P_prof = Profile(default_value=P, data_type=float)
 
         self.srap_enabled = srap_enabled
-        self._srap_enabled_prof = Profile(default_value=srap_enabled)
+        self._srap_enabled_prof = Profile(default_value=srap_enabled, data_type=bool)
 
         # Minimum dispatched power in MW
         self.Pmin = Pmin

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/injection_parent.py

@@ -68,12 +68,12 @@ class InjectionParent(EditableDevice):
                                 device_type=device_type)
 
         self._bus = bus
-        self._bus_prof = Profile(default_value=bus)
+        self._bus_prof = Profile(default_value=bus, data_type=DeviceType.BusDevice)
 
         self.cn = cn
 
         self.active = active
-        self._active_prof = Profile(default_value=active)
+        self._active_prof = Profile(default_value=active, data_type=bool)
 
         self.mttf = mttf
 
@@ -81,7 +81,7 @@ class InjectionParent(EditableDevice):
 
         self.Cost = Cost
 
-        self._Cost_prof = Profile(default_value=Cost)
+        self._Cost_prof = Profile(default_value=Cost, data_type=float)
 
         self.capex = capex
 

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/load_parent.py

@@ -83,10 +83,10 @@ class LoadParent(InjectionParent):
                                  device_type=device_type)
 
         self.P = P
-        self._P_prof = Profile(default_value=P)
+        self._P_prof = Profile(default_value=P, data_type=float)
 
         self.Q = Q
-        self._Q_prof = Profile(default_value=Q)
+        self._Q_prof = Profile(default_value=Q, data_type=float)
 
         self.register(key='P', units='MW', tpe=float, definition='Active power', profile_name='P_prof')
         self.register(key='Q', units='MVAr', tpe=float, definition='Reactive power', profile_name='Q_prof')

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Parents/shunt_parent.py

@@ -86,16 +86,16 @@ class ShuntParent(InjectionParent):
                                  device_type=device_type)
 
         self.G = G
-        self._G_prof = Profile(default_value=G)
+        self._G_prof = Profile(default_value=G, data_type=float)
 
         self.B = B
-        self._B_prof = Profile(default_value=B)
+        self._B_prof = Profile(default_value=B, data_type=float)
 
         self.G0 = G0
-        self._G0_prof = Profile(default_value=G0)
+        self._G0_prof = Profile(default_value=G0, data_type=float)
 
         self.B0 = B0
-        self._B0_prof = Profile(default_value=B0)
+        self._B0_prof = Profile(default_value=B0, data_type=float)
 
         self.register(key='G', units='MW', tpe=float, definition='Active power', profile_name='G_prof')
         self.register(key='B', units='MVAr', tpe=float, definition='Reactive power', profile_name='B_prof')

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/Substation/bus.py

@@ -95,7 +95,7 @@ class Bus(EditableDevice):
                                 device_type=DeviceType.BusDevice)
 
         self.active = active
-        self._active_prof = Profile(default_value=active)
+        self._active_prof = Profile(default_value=active, data_type=bool)
 
         # Nominal voltage (kV)
         self.Vnom = vnom

{GridCalEngine-5.1.2 → GridCalEngine-5.1.4}/GridCalEngine/Devices/multi_circuit.py

@@ -436,7 +436,7 @@ class MultiCircuit:
                     self.device_type_name_dict[key] = elm.device_type
 
         # list of declared diagrams
-        self.diagrams: List[Union[dev.MapDiagram, dev.BusBranchDiagram, dev.NodeBreakerDiagram]] = list()
+        self.diagrams: List[Union[dev.MapDiagram, dev.SchematicDiagram]] = list()
 
     def __str__(self):
         return str(self.name)
@@ -711,10 +711,10 @@ class MultiCircuit:
 
         return tp.find_different_states(states_array=self.get_branch_active_time_array())
 
-    def get_diagrams(self) -> List[Union[dev.MapDiagram, dev.BusBranchDiagram, dev.NodeBreakerDiagram]]:
+    def get_diagrams(self) -> List[Union[dev.MapDiagram, dev.SchematicDiagram]]:
         """
         Get list of diagrams
-        :return: MapDiagram, BusBranchDiagram, NodeBreakerDiagram device
+        :return: MapDiagram, SchematicDiagram device
         """
         return self.diagrams
 
@@ -725,18 +725,18 @@ class MultiCircuit:
         """
         return len(self.diagrams) > 0
 
-    def add_diagram(self, diagram: Union[dev.MapDiagram, dev.BusBranchDiagram, dev.NodeBreakerDiagram]):
+    def add_diagram(self, diagram: Union[dev.MapDiagram, dev.SchematicDiagram]):
         """
         Add diagram
-        :param diagram: MapDiagram, BusBranchDiagram, NodeBreakerDiagram device
+        :param diagram: MapDiagram, SchematicDiagram device
         :return:
         """
         self.diagrams.append(diagram)
 
-    def remove_diagram(self, diagram: Union[dev.MapDiagram, dev.BusBranchDiagram, dev.NodeBreakerDiagram]):
+    def remove_diagram(self, diagram: Union[dev.MapDiagram, dev.SchematicDiagram]):
         """
         Remove diagrams
-        :param diagram: MapDiagram, BusBranchDiagram, NodeBreakerDiagram device
+        :param diagram: MapDiagram, SchematicDiagram device
         """
         self.diagrams.remove(diagram)