From 50252dce00a2d55f6ab29c817f178942bb0d5ae3 Mon Sep 17 00:00:00 2001 From: gviejo Date: Thu, 13 Dec 2018 11:28:34 -0500 Subject: [PATCH] Fixed bugs in restrict and in_interval --- neuroseries/interval_set.py | 2 +- neuroseries/time_series.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neuroseries/interval_set.py b/neuroseries/interval_set.py index c998775..07aa85e 100644 --- a/neuroseries/interval_set.py +++ b/neuroseries/interval_set.py @@ -200,7 +200,7 @@ def in_interval(self, tsd): IntervalSet. """ bins = self.values.ravel() - ix = np.array(pd.cut(tsd.index, bins, labels=np.arange(len(bins) - 1, dtype=np.int64))) + ix = np.array(pd.cut(tsd.index, bins, labels=np.arange(len(bins) - 1, dtype=np.float64))) ix[np.floor(ix / 2) * 2 != ix] = np.NaN ix = np.floor(ix/2) return ix diff --git a/neuroseries/time_series.py b/neuroseries/time_series.py index c1a962e..28d613c 100644 --- a/neuroseries/time_series.py +++ b/neuroseries/time_series.py @@ -282,7 +282,7 @@ def restrict(self, iset, keep_labels=False): ix = ~np.isnan(ix) tsd_r = tsd_r[ix] if not keep_labels: - s = tsd_r.iloc[:, col] + s = tsd_r.iloc[:,0] return Tsd(s) return Tsd(tsd_r, copy=True)