IntervalSet can take IntervalSet

Author: gviejo

pynapple/core/_jitted_functions.py

@@ -886,9 +886,9 @@ def jitcontinuous_perievent(
                     left = np.minimum(windowsize[0], t_pos - start_t[k, 0])
                     right = np.minimum(windowsize[1], maxt - t_pos - 1)
                     center = windowsize[0] + 1
-                    new_data_array[center - left - 1 : center + right, cnt_i] = (
-                        data_array[t_pos - left : t_pos + right + 1]
-                    )
+                    new_data_array[
+                        center - left - 1 : center + right, cnt_i
+                    ] = data_array[t_pos - left : t_pos + right + 1]
 
                     t -= 1
                     i += 1

pynapple/core/interval_set.py

@@ -96,7 +96,11 @@ def __init__(self, start, end=None, time_units="s", **kwargs):
             If `start` and `end` arguments are of unknown type
 
         """
-        if isinstance(start, pd.DataFrame):
+        if isinstance(start, IntervalSet):
+            end = start.values[:, 1].astype(np.float64)
+            start = start.values[:, 0].astype(np.float64)
+
+        elif isinstance(start, pd.DataFrame):
             assert (
                 "start" in start.columns
                 and "end" in start.columns

pynapple/core/ts_group.py

@@ -88,8 +88,8 @@ def __init__(
             To avoid checking that each element is within time_support.
             Useful to speed up initialization of TsGroup when Ts/Tsd objects have already been restricted beforehand
         **kwargs
-            Meta-info about the Ts/Tsd objects. Can be either pandas.Series or numpy.ndarray.
-            Note that the index should match the index of the input dictionnary.
+            Meta-info about the Ts/Tsd objects. Can be either pandas.Series, numpy.ndarray, list or tuple
+            Note that the index should match the index of the input dictionnary if pandas Series
 
         Raises
         ------
@@ -264,7 +264,7 @@ def set_info(self, *args, **kwargs):
         RuntimeError
             Raise an error if
                 no column labels are found when passing simple arguments,
-                indexes are not equals for a pandas series,
+                indexes are not equals for a pandas series,+
                 not the same length when passing numpy array.
 
         Examples
@@ -308,15 +308,17 @@ def set_info(self, *args, **kwargs):
                         self._metadata = self._metadata.join(arg)
                     else:
                         raise RuntimeError("Index are not equals")
-                elif isinstance(arg, (pd.Series, np.ndarray)):
-                    raise RuntimeError("Columns needs to be labelled for metadata")
+                elif isinstance(arg, (pd.Series, np.ndarray, list)):
+                    raise RuntimeError("Argument should be passed as keyword argument.")
         if len(kwargs):
             for k, v in kwargs.items():
                 if isinstance(v, pd.Series):
                     if pd.Index.equals(self._metadata.index, v.index):
                         self._metadata[k] = v
                     else:
-                        raise RuntimeError("Index are not equals")
+                        raise RuntimeError(
+                            "Index are not equals for argument {}".format(k)
+                        )
                 elif isinstance(v, (np.ndarray, list, tuple)):
                     if len(self._metadata) == len(v):
                         self._metadata[k] = np.asarray(v)

tests/test_interval_set.py

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 # @Author: gviejo
 # @Date:   2022-03-30 11:15:02
-# @Last Modified by:   gviejo
-# @Last Modified time: 2024-02-21 21:39:07
+# @Last Modified by:   Guillaume Viejo
+# @Last Modified time: 2024-03-29 11:04:32
 
 """Tests for IntervalSet of `pynapple` package."""
 
@@ -58,6 +58,13 @@ def test_create_iset_from_scalars():
     np.testing.assert_approx_equal(ep.start[0], 0)
     np.testing.assert_approx_equal(ep.end[0], 10)
 
+def test_create_iset_from_iset():
+    start = np.array([0, 10, 16, 25])
+    end = np.array([5, 15, 20, 40])
+    ep = nap.IntervalSet(start=start, end=end)
+    ep2 = nap.IntervalSet(ep)
+    np.testing.assert_array_almost_equal(ep.start, ep2.start)
+    np.testing.assert_array_almost_equal(ep.end, ep2.end)
 
 def test_create_iset_from_df():
     df = pd.DataFrame(data=[[16, 100]], columns=["start", "end"])

tests/test_ts_group.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # @Author: gviejo
 # @Date:   2022-03-30 11:14:41
-# @Last Modified by:   gviejo
-# @Last Modified time: 2024-02-19 15:11:43
+# @Last Modified by:   Guillaume Viejo
+# @Last Modified time: 2024-03-29 12:08:48
 
 """Tests of ts group for `pynapple` package."""
 
@@ -112,30 +112,32 @@ def test_add_metainfo_raise_error(self, group):
 
         with pytest.raises(RuntimeError) as e_info:
             tsgroup.set_info(sr_info)
-        assert str(e_info.value) == "Columns needs to be labelled for metadata"
+        assert str(e_info.value) == "Argument should be passed as keyword argument."
 
         tsgroup = nap.TsGroup(group)
         ar_info = np.ones(3) * 3
 
         with pytest.raises(RuntimeError) as e_info:
             tsgroup.set_info(ar_info)
-        assert str(e_info.value) == "Columns needs to be labelled for metadata"
+        assert str(e_info.value) == "Argument should be passed as keyword argument."
 
 
     def test_add_metainfo_test_runtime_errors(self, group):
         tsgroup = nap.TsGroup(group)
         sr_info = pd.Series(index=[1, 2, 3], data=[1, 1, 1], name="sr")
         with pytest.raises(Exception) as e_info:
             tsgroup.set_info(sr=sr_info)
-        assert str(e_info.value) == "Index are not equals"
+        assert str(e_info.value) == "Index are not equals for argument sr"
         df_info = pd.DataFrame(index=[1, 2, 3], data=[1, 1, 1], columns=["df"])
         with pytest.raises(Exception) as e_info:
             tsgroup.set_info(df_info)
         assert str(e_info.value) == "Index are not equals"
+
         sr_info = pd.Series(index=[1, 2, 3], data=[1, 1, 1], name="sr")
         with pytest.raises(Exception) as e_info:
             tsgroup.set_info(sr_info)
-        assert str(e_info.value) == "Columns needs to be labelled for metadata"
+        assert str(e_info.value) == "Argument should be passed as keyword argument."
+
         ar_info = np.ones(4)
         with pytest.raises(Exception) as e_info:
             tsgroup.set_info(ar=ar_info)