diff --git a/src/grid_reducer/network.py b/src/grid_reducer/network.py index 6de0d89..639399f 100644 --- a/src/grid_reducer/network.py +++ b/src/grid_reducer/network.py @@ -162,6 +162,8 @@ def add_transformer_components( if circuit_obj.Transformer is None: return for transformer in circuit_obj.Transformer.root.root: + if transformer.root.Enabled is False: + continue buses = set([el.root.split(".")[0] for el in transformer.root.Bus]) if len(buses) == 2: add_transformer_edge(graph, buses, transformer, bus_voltage_mapper) diff --git a/src/grid_reducer/rename_components.py b/src/grid_reducer/rename_components.py index 1ccd48d..45b45d8 100644 --- a/src/grid_reducer/rename_components.py +++ b/src/grid_reducer/rename_components.py @@ -40,6 +40,9 @@ def rename_and_track(item, attr, prefix=None, mapping=None): if prefix and mapping: if prefix.lower() not in value.lower(): raise NotImplementedError(f"{attr} {value} not supported yet for renaming.") + if value.split(".")[1] not in mapping: + print(f"Warning: {attr} {value} not found in mapping for renaming.") + return mapped = prefix + mapping[value.split(".")[1]] elif mapping: mapped = mapping[value] @@ -149,6 +152,7 @@ def _rename_lines(new_circuit, bus_mapping, ic_mappings): root.Geometry = ic_mappings["LineGeometry"][root.Geometry] elif isinstance(root, Line_SpacingWires): root.Spacing = ic_mappings["LineSpacing"][root.Spacing] + root.Conductors = [c.split('.')[0] + "." + ic_mappings["WireData"][c.split('.')[1]] for c in root.Conductors] renamed.append(line) diff --git a/src/grid_reducer/version.py b/src/grid_reducer/version.py index a80e2b1..fc9eb7f 100644 --- a/src/grid_reducer/version.py +++ b/src/grid_reducer/version.py @@ -3,7 +3,7 @@ import platform import sys -VERSION = "1.1.0" +VERSION = "1.1.1" SUPPORTED_VERSIONS = [VERSION]