Skip to content

Merge changes from main into RC_v1.6.x #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 17, 2025
Merged

Merge changes from main into RC_v1.6.x #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fbe576
Add failing test for datetime like coords
w-k-jones Jul 9, 2025
6747520
Fix coordinate interpolation for non-numeric coordinates
w-k-jones Jul 11, 2025
efad7a5
Change logic for search for non-numeric dtypes in case xarray error c…
w-k-jones Jul 11, 2025
38b2ca0
Merge pull request #509 from w-k-jones/fix_coord_interpolation_bug
w-k-jones Jul 17, 2025
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
26 changes: 26 additions & 0 deletions tobac/tests/test_xarray_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from typing import Union

import pandas as pd
import pytest
import numpy as np
import xarray as xr
Expand Down Expand Up @@ -156,6 +157,31 @@ def test_find_axis_from_dim_coord(
(1, 1),
{"test_coord1": (1, 1, 1), "test_coord_time": (5, 6, 7)},
),
(
["time", "x", "y"],
{
"test_coord_datetime": (
"time",
pd.date_range(
datetime.datetime(2000, 1, 1),
datetime.datetime(2000, 1, 1, 6),
freq="1h",
inclusive="left",
),
),
"test_coord_time": ("time", [5, 6, 7, 8, 9, 10]),
},
(1, 1),
{
"test_coord_datetime": pd.date_range(
datetime.datetime(2000, 1, 1),
datetime.datetime(2000, 1, 1, 3),
freq="1h",
inclusive="left",
),
"test_coord_time": (5, 6, 7),
},
),
],
)
def test_add_coordinates_to_features_interpolate_along_other_dims(
Expand Down
21 changes: 16 additions & 5 deletions tobac/utils/internal/xarray_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,20 @@ def add_coordinates_to_features(
except KeyError:
pass

return_feat_df[interp_coord_name] = renamed_dim_da[interp_coord].interp(
coords={
dim: dim_interp_coords[dim] for dim in renamed_dim_da[interp_coord].dims
}
)
if renamed_dim_da[interp_coord].dtype.kind in "uifc":
# Interpolate over the coordinate
return_feat_df[interp_coord_name] = renamed_dim_da[interp_coord].interp(
coords={
dim: dim_interp_coords[dim]
for dim in renamed_dim_da[interp_coord].dims
}
)
else:
# If non-numeric, we should instead just index the nearest values:
return_feat_df[interp_coord_name] = renamed_dim_da[interp_coord].isel(
**{
dim: np.round(dim_interp_coords[dim]).astype(int)
for dim in renamed_dim_da[interp_coord].dims
}
)
return return_feat_df
Loading