Skip to content
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

IntervalSet creation from (start, end) pairs #304

Merged
merged 2 commits into from
Aug 13, 2024
Merged

IntervalSet creation from (start, end) pairs #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0896026
allow IntervalSet creation with iterable of tuples
eschombu Jun 24, 2024
fc6f731
make IntervalSet(start_end_pairs) initialization clearer and more robust
eschombu Aug 9, 2024
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
23 changes: 18 additions & 5 deletions pynapple/core/interval_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,13 @@ def __init__(self, start, end=None, time_units="s"):
Parameters
----------
start : numpy.ndarray or number or pandas.DataFrame or pandas.Series
Beginning of intervals
start : numpy.ndarray or number or pandas.DataFrame or pandas.Series or iterable of (start, end) pairs
Beginning of intervals. Alternatively, the `end` argument can be left out and `start` can be one of the
following:
- IntervalSet
- pandas.DataFrame with columns ["start", "end"]
- iterable of (start, end) pairs
- a single (start, end) pair
end : numpy.ndarray or number or pandas.Series, optional
Ends of intervals
time_units : str, optional
Expand All @@ -108,8 +113,8 @@ def __init__(self, start, end=None, time_units="s"):
"""
if isinstance(start, IntervalSet):
end = start.values[:, 1].astype(np.float64)
start = start.values[:, 0].astype(np.float64)
end = start.end.astype(np.float64)
start = start.start.astype(np.float64)

elif isinstance(start, pd.DataFrame):
assert (
Expand All @@ -125,7 +130,15 @@ def __init__(self, start, end=None, time_units="s"):
start = start["start"].values.astype(np.float64)

else:
assert end is not None, "Missing end argument when initializing IntervalSet"
if end is None:
# Require iterable of (start, end) tuples
try:
start_end_array = np.array(list(start)).reshape(-1, 2)
start, end = zip(*start_end_array)
except (TypeError, ValueError):
raise ValueError(
"Unable to Interpret the input. Please provide a list of start-end pairs."
)

args = {"start": start, "end": end}

Expand Down
17 changes: 17 additions & 0 deletions tests/test_interval_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ def test_create_iset_from_mock_array():
np.testing.assert_array_almost_equal(ep.start, start)
np.testing.assert_array_almost_equal(ep.end, end)

def test_create_iset_from_tuple():
start = 0
end = 5
ep = nap.IntervalSet((start, end))
assert isinstance(ep, nap.core.interval_set.IntervalSet)
np.testing.assert_array_almost_equal(start, ep.start[0])
np.testing.assert_array_almost_equal(end, ep.end[0])

def test_create_iset_from_tuple_iter():
start = [0, 10, 16, 25]
end = [5, 15, 20, 40]
pairs = zip(start, end)
ep = nap.IntervalSet(pairs)
assert isinstance(ep, nap.core.interval_set.IntervalSet)
np.testing.assert_array_almost_equal(start, ep.start)
np.testing.assert_array_almost_equal(end, ep.end)

def test_create_iset_from_unknown_format():
with pytest.raises(RuntimeError) as e:
nap.IntervalSet(start="abc", end=[1, 2])
Expand Down
Loading