GridCalEngine 5.1.5__tar.gz → 5.1.6__tar.gz

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/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.6}/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.6}/GridCalEngine/Devices/Diagrams/base_diagram.py

@@ -82,7 +82,7 @@ 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:
@@ -111,6 +111,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.6}/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.6}/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.6}/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.6}/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=gcdev.ConnectivityNode.type_name)
             # 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.6}/GridCalEngine/IO/file_handler.py

@@ -125,7 +125,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,

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/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.6}/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']:
 

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/GridCalEngine/Simulations/ContingencyAnalysis/contingencies_report.py

@@ -394,7 +394,7 @@ class ContingencyResultsReport:
             default=-999999
         )
 
-        df["Overload for reporting weighted with cluster"] = df["Overload for reporting"]*df["Probability cluster"]
+        df["Overload for reporting weighted with cluster"] = df["Overload for reporting"] * df["Probability cluster"]
 
         # Count the number of Hours the monitored line appears
 
@@ -402,14 +402,16 @@ class ContingencyResultsReport:
         df_monit_time_pu = pd.pivot_table(df_, values='Probability cluster', index="Monitored", aggfunc="sum")
         df_monit_time_clust = pd.pivot_table(df_, values='Probability cluster', index="Monitored", aggfunc="count")
 
-        df['Time this line is monitored by any contingency (pu)'] = df['Monitored'].map(df_monit_time_pu['Probability cluster'])
-        df['Number of clusters this line is monitored'] = df['Monitored'].map(df_monit_time_clust['Probability cluster'])
-
+        df['Time this line is monitored by any contingency (pu)'] = df['Monitored'].map(
+            df_monit_time_pu['Probability cluster'])
+        df['Number of clusters this line is monitored'] = df['Monitored'].map(
+            df_monit_time_clust['Probability cluster'])
 
         # Group de columns by Area1, Area2, Monitored, Contingency
         df_grp = df.groupby(
             ["Area 1", "Area 2", "Monitored", "Contingency", "Base rating (MW)", "Contingency rating (MW)",
-             "SRAP rating (MW)","Time this line is monitored by any contingency (pu)","Number of clusters this line is monitored"])
+             "SRAP rating (MW)", "Time this line is monitored by any contingency (pu)",
+             "Number of clusters this line is monitored"])
 
         # Compute the columns
         ov_max = df_grp["Overload for reporting"].max()
@@ -428,10 +430,11 @@ class ContingencyResultsReport:
         else:
             ov_max_dates = ov_max_date.values
 
-        #new, work in progress
-        ov_avg_clust = df_grp["Overload for reporting weighted with cluster"].sum()/df_grp["Probability cluster"].sum() #checked
-        ov_desvest_clust = df_grp["Overload for reporting weighted with cluster"].std()/df_grp["Probability cluster"].sum()
-
+        # new, work in progress
+        ov_avg_clust = df_grp["Overload for reporting weighted with cluster"].sum() / df_grp[
+            "Probability cluster"].sum()  # checked
+        ov_desvest_clust = df_grp["Overload for reporting weighted with cluster"].std() / df_grp[
+            "Probability cluster"].sum()
 
         # Create the new dataframe with the columns we need
         df_summary = pd.DataFrame({
@@ -440,11 +443,10 @@ class ContingencyResultsReport:
             "Monitored": ov_max.index.get_level_values("Monitored"),
             "Contingency": ov_max.index.get_level_values("Contingency"),
 
-            "Area 1": ov_max.index.get_level_values("Area 1"),
-            "Area 2": ov_max.index.get_level_values("Area 2"),
-
-            "Monitored": ov_max.index.get_level_values("Monitored"),
-            "Contingency": ov_max.index.get_level_values("Contingency"),
+            # "Area 1": ov_max.index.get_level_values("Area 1"),
+            # "Area 2": ov_max.index.get_level_values("Area 2"),
+            # "Monitored": ov_max.index.get_level_values("Monitored"),
+            # "Contingency": ov_max.index.get_level_values("Contingency"),
 
             "Base rating (MW)": ov_max.index.get_level_values("Base rating (MW)"),
             "Contingency rating (MW)": ov_max.index.get_level_values("Contingency rating (MW)"),
@@ -469,11 +471,14 @@ class ContingencyResultsReport:
 
         df_summary = df_summary.sort_values(by="Contingency", ascending=False)
 
-        cols_1dec = ["Number of clusters this line is monitored","Number of clusters with this overload (h)"]
-        cols_2dec = ["Base rating (MW)","Contingency rating (MW)","SRAP rating (MW)"]
-        cols_4dec = ["Overload max (pu)","Overload average weighting time (pu)","Annual time the Monitored line is overloaded by this contingency (pu)","Time this line is monitored by any contingency (pu)","Overload average for clusters(pu)","Standard deviation for clusters(pu)"]
+        cols_1dec = ["Number of clusters this line is monitored", "Number of clusters with this overload (h)"]
+        cols_2dec = ["Base rating (MW)", "Contingency rating (MW)", "SRAP rating (MW)"]
+        cols_4dec = ["Overload max (pu)", "Overload average weighting time (pu)",
+                     "Annual time the Monitored line is overloaded by this contingency (pu)",
+                     "Time this line is monitored by any contingency (pu)", "Overload average for clusters(pu)",
+                     "Standard deviation for clusters(pu)"]
 
-        df_summary[cols_1dec]=df_summary[cols_1dec].map(lambda x:f'{x:.1f}')
+        df_summary[cols_1dec] = df_summary[cols_1dec].map(lambda x: f'{x:.1f}')
         df_summary[cols_2dec] = df_summary[cols_2dec].map(lambda x: f'{x:.2f}')
         df_summary[cols_4dec] = df_summary[cols_4dec].map(lambda x: f'{x:.4f}')
 
@@ -550,13 +555,19 @@ class ContingencyResultsReport:
         if contingency_idx == 0:  # only doing it once per hour
 
             for m in mon_idx:
+                if len(area_names):
+                    area_from = area_names[bus_area_indices[F[m]]]
+                    area_to = area_names[bus_area_indices[T[m]]]
+                else:
+                    area_from = ""
+                    area_to = ""
 
                 if abs(base_flow[m]) > numerical_circuit.rates[m]:  # only add if overloaded
 
                     self.add(time_index=t if t is not None else 0,
-                             t_prob = t_prob,
-                             area_from=area_names[bus_area_indices[F[m]]],
-                             area_to=area_names[bus_area_indices[T[m]]],
+                             t_prob=t_prob,
+                             area_from=area_from,
+                             area_to=area_to,
                              base_name=numerical_circuit.branch_data.names[m],
                              contingency_name='Base',
                              base_rating=numerical_circuit.branch_data.rates[m],
@@ -576,6 +587,13 @@ class ContingencyResultsReport:
         # Now evalueting the effect of contingencies
         for m in mon_idx:  # for each monitored branch ...
 
+            if len(area_names):
+                area_from = area_names[bus_area_indices[F[m]]]
+                area_to = area_names[bus_area_indices[T[m]]]
+            else:
+                area_from = ""
+                area_to = ""
+
             c_flow = abs(contingency_flows[m])
             b_flow = abs(base_flow[m])
 
@@ -681,8 +699,8 @@ class ContingencyResultsReport:
                 if detailed_massive_report:
                     self.add(time_index=t if t is not None else 0,
                              t_prob=t_prob,
-                             area_from=area_names[bus_area_indices[F[m]]],
-                             area_to=area_names[bus_area_indices[T[m]]],
+                             area_from=area_from,
+                             area_to=area_to,
                              base_name=numerical_circuit.branch_data.names[m],
                              contingency_name=contingency_group.name,
                              base_rating=numerical_circuit.branch_data.rates[m],

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/GridCalEngine/Simulations/OPF/opf_ts_driver.py

@@ -271,7 +271,13 @@ class OptimalPowerFlowTimeSeriesDriver(TimeSeriesDriverTemplate):
         while i < n and not self.__cancel__:
             start_ = groups[i - 1]
             end_ = groups[i]
-            time_indices = np.arange(start_, end_)
+
+            # Grab the last time index in the last group
+            if i == n - 1:
+                time_indices = np.arange(start_, end_ + 1)
+            else:
+                time_indices = np.arange(start_, end_)
+
             # show progress message
             print(start_, ':', end_, ' [', end_ - start_, ']')
             self.report_text('Running OPF for the time group {0} '

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/GridCalEngine/__version__.py

@@ -16,7 +16,7 @@ import datetime
 _current_year_ = datetime.datetime.now().year
 
 # do not forget to keep a three-number version!!!
-__GridCalEngine_VERSION__ = "5.1.5"
+__GridCalEngine_VERSION__ = "5.1.6"
 
 url = 'https://github.com/SanPen/GridCal'
 

{GridCalEngine-5.1.5 → GridCalEngine-5.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GridCalEngine
-Version: 5.1.5
+Version: 5.1.6
 Summary: GridCal is a Power Systems simulation program intended for professional use and research
 Home-page: https://github.com/SanPen/GridCal
 Author: Santiago Peñate Vera et. Al.