Merge pull request #186 from pfizer-opensource/development

Version 0.17.4

Author: LukasAdamowicz

meson.build

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

src/skdh/preprocessing/window_days.py

@@ -42,7 +42,11 @@ def finalize_guess(time, fs, guess, target):
     if i2 <= 0:
         return 0
     if i2 >= (time.size - 1):
-        return time.size - 1
+        if time[-1] > ts_target:
+            i2 = i3 - 1
+            i1 = i3 - 2
+        else:
+            return time.size - 1
 
     check1 = abs(time[i2] - ts_target) <= abs(time[i1] - ts_target)
     check3 = abs(time[i2] - ts_target) <= abs(time[i3] - ts_target)

src/skdh/utility/internal.py

@@ -235,7 +235,8 @@ def resample(x, factor, t, t_rs):
         if int(fs / goal_fs) == fs / goal_fs and goal_fs < fs:
             time_rs = time[:: int(fs / goal_fs)]
         else:
-            time_rs = arange(time[0], time[-1], 1 / goal_fs)
+            # round-about way, but need to prevent start>>>>>>>>>step
+            time_rs = arange(0, (time[-1] - time[0]) + 0.5 / goal_fs, 1 / goal_fs) + time[0]
     else:
         goal_fs = 1 / mean(diff(time_rs[:5000]))
         # prevent t_rs from extrapolating