Merge pull request #184 from pfizer-opensource/development

Version 0.17.2

Author: yiorg

meson.build

@@ -1,7 +1,7 @@
 project(
     'scikit-digital-health',
     'c',
-    version: '0.17.1',
+    version: '0.17.2',
     license: 'MIT',
     meson_version: '>=1.1',
 )

src/skdh/io/base.py

@@ -163,18 +163,18 @@ def trim_data(self, start_key, end_key, tz_name, predict_kw, *, time, **data):
             )
 
         ts_trim_start = (
-            time[0] - 1
+            time[0] + 0.001
             if trim_start is None
             else self._to_timestamp(trim_start, tz_name)
         )
         ts_trim_end = (
-            time[-1] + 1 if trim_end is None else self._to_timestamp(trim_end, tz_name)
+            time[-1] - 0.001 if trim_end is None else self._to_timestamp(trim_end, tz_name)
         )
 
-        idx = nonzero((time >= ts_trim_start) & (time <= ts_trim_end))[0]
-
-        i1 = idx[0]
-        i2 = idx[-1]
+        # write it so that if there is any time weirdness, get the data from the "middle",
+        # ie the last index before the start time, and the first index after the end time.
+        i1 = nonzero(time <= ts_trim_start)[0][-1]
+        i2 = nonzero(time >= ts_trim_end)[0][0]
 
         res = {self._time: time[i1:i2]}
         res.update({k: v[i1:i2] for k, v in data.items()})