facat/windfarm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix substation coordinate handling for cable crossing detection

Browse Source
This commit is contained in:
dmy
2026-01-08 16:05:06 +08:00
parent 68df76702e
commit 2b3ab83d91
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mip.py
View File

@@ -404,11 +404,43 @@ def check_cable_crossings(connections, turbines, substation):
def get_turbine_coord(connection_part): def get_turbine_coord(connection_part):
"""Get coordinates from connection part (turbine_# or substation).""" """Get coordinates from connection part (turbine_# or substation)."""
if connection_part == "substation": if connection_part == "substation":
# Ensure substation is returned as a proper tuple for unpacking # Handle different substation formats robustly
if isinstance(substation, (list, np.ndarray)): if isinstance(substation, np.ndarray):
return (substation[0], substation[1]) if substation.ndim == 1:
# 1D array [x, y]
return (substation[0], substation[1])
elif substation.ndim == 2:
# 2D array [[x, y]] or shape (n, 2)
if substation.shape[0] == 1:
return (substation[0, 0], substation[0, 1])
else:
# Multiple points, use first one
return (substation[0, 0], substation[0, 1])
else:
# Unexpected dimension, try fallback
return (substation.flat[0], substation.flat[1])
elif isinstance(substation, (list, tuple)):
# List or tuple format
# Handle nested lists like [[x, y]]
if (
isinstance(substation[0], (list, tuple, np.ndarray))
and len(substation[0]) >= 2
):
return (substation[0][0], substation[0][1])
elif len(substation) >= 2:
return (substation[0], substation[1])
else:
return (float("inf"), float("inf"))
else: else:
return (substation[0], substation[1]) # Unexpected format, try to convert
try:
sub_array = np.array(substation)
if sub_array.ndim == 1:
return (sub_array[0], sub_array[1])
else:
return (sub_array.flat[0], sub_array.flat[1])
except:
return (float("inf"), float("inf"))
else: else:
turbine_idx = int(connection_part.split("_")[1]) turbine_idx = int(connection_part.split("_")[1])
return ( return (