Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions epowcore/power_factory/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@ def get_ctrl_param(ctrl_obj: Any, param: str | list[str]) -> Any:
:rtype: Any
"""
model_params = ctrl_obj.GetAttribute("parameterNames")
if not isinstance(model_params, list):
raise TypeError("Expected params to be a list: ['A,B,C']")
model_params = model_params[0].split(",")

if isinstance(model_params, str):
model_params = model_params.split(",")
elif isinstance(model_params, list):
model_params = model_params[0].split(",")
else:
raise TypeError("Expected parameterNames to be a string or list")

if isinstance(param, str):
if param not in model_params:
Expand Down
4 changes: 2 additions & 2 deletions tests/local/powerfactory_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import sys


PF_ROOT = r"C:\Program Files\DIgSILENT\PowerFactory 2023 SP2"
PF_PY = r"C:\Program Files\DIgSILENT\PowerFactory 2023 SP2\Python\3.10"
PF_ROOT = r"C:\Program Files\DIgSILENT\PowerFactory 2025 SP4"
PF_PY = r"C:\Program Files\DIgSILENT\PowerFactory 2025 SP4\Python\3.11"


sys.path.append(PF_PY)
Expand Down
4 changes: 2 additions & 2 deletions tests/power_factory/pf_converter_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def test_minimal_conversion_no_errors(self) -> None:
converter = PowerFactoryConverter()
core_model = converter.to_gdf(PFModel("Minimal", "Base", 50.0))

self.assertEqual(len(core_model.graph.nodes), 8)
self.assertEqual(len(core_model.graph.edges), 7)
self.assertEqual(len(core_model.graph.nodes), 10)
self.assertEqual(len(core_model.graph.edges), 9)

two_winding_id = core_model.type_list(TwoWindingTransformer)[0].uid

Expand Down
Loading