biomechzoo 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

biomechzoo/biomech_ops/movement_onset.py

@@ -1,2 +1,51 @@
-def movement_onset():
-    raise NotImplementedError
+def movement_onset(yd, constant, etype=etype):
+    """
+    Extracts movement onset based on the average and standard deviation of a sliding window
+    Standard thresholds for running are mean_thresh=1.2, std_thresh=0.2. For walking mean_thresh=0.6, std_thresh=0.2.
+
+    yd: 1d array of the vector
+    constants: [sample_frequency, mean_thresh, std_thresh]
+    """
+    acc_mag = yd.copy()
+
+    # ----extract the constants----
+    fs = constant[0]
+    mean_thresh = constant[1]
+    std_thresh = constant[2]
+
+    # ----sliding window features----
+    features = []
+    timestamps = []
+    window_size = 2 * fs  # windows van 2 seconds
+    step_size = 1 * fs  # with an overlap of 1 seconds
+
+    for start in range(0, len(acc_mag) - window_size, step_size):
+        segment = acc_mag[start:start + window_size]
+        mean_val = segment.mean()
+        std_val = segment.std()
+        # entropy = -np.sum((segment / np.sum(segment)) * np.log2(segment / np.sum(segment) + 1e-12))
+        timestamps.append(start)
+        features.append((mean_val, std_val))
+
+    features = np.array(features)
+    timestamps = np.array(timestamps)
+
+    # ----Check already moving else find start----
+    initial_window = features[:5]  # First few seconds
+    if np.all(initial_window[:, 0] > mean_thresh) and np.all(initial_window[:, 1] > std_thresh):
+        print("already moving")
+        if etype == 'movement_offset':
+            index = 0
+    else:
+        # features, timestamps = self.sliding_window_features(acc_mag)
+        movement_flags = (features[:, 0] > mean_thresh) & (features[:, 1] > std_thresh)
+        index = None
+        for i in range(len(movement_flags) - int(min_duration * self.fs / 50)):
+            if np.all(movement_flags[i:i + int(min_duration * self.fs / 50)]):
+                index = i
+                break
+
+    if etype == 'movement_offset':
+        index = len(yd) - end_time
+
+    return timestamps[index] if index is not None else timestamps[0]

biomechzoo/biomechzoo.py

@@ -2,7 +2,7 @@ import os
 import inspect
 import time
 
-from biomechzoo.imu.tilt_algoirthm import tilt_algorithm_data
+from biomechzoo.imu.tilt_algorithm import tilt_algorithm_data
 from biomechzoo.utils.engine import engine  # assumes this returns .zoo files in folder
 from biomechzoo.utils.zload import zload
 from biomechzoo.utils.zsave import zsave
@@ -136,6 +136,8 @@ class BiomechZoo:
     def parquet2zoo(self, out_folder=None, inplace=None):
         raise NotImplementedError('Use table2zoo instead')
 
+    def rectify(self):
+        raise NotImplementedError
     def tilt_algorithm(self, chname_avert, chname_medlat, chname_antpost, out_folder=None, inplace=False):
         """ tilt correction for acceleration data """
         start_time = time.time()

biomechzoo/processing/addevent_data.py

@@ -1,6 +1,7 @@
 import numpy as np
 import copy
 import warnings
+from scipy.signal import find_peaks
 from biomechzoo.utils.peak_sign import peak_sign
 from biomechzoo.biomech_ops.movement_onset import movement_onset
 
@@ -42,16 +43,16 @@ def addevent_data(data, channels, ename, etype, constant=None):
         elif etype == 'rom':
             eyd = float(np.max(yd) - np.min(yd))
             exd = 0  # dummy index (like MATLAB version)
-        elif etype == 'max_stance':
+        elif etype == 'first peak':
             # special event for gait and running
-            exd = max_stance(yd)
-            eyd = float(yd[exd])
+            exd = find_first_peak(yd, constant)
             eyd = float(yd[exd])
         elif etype == 'movement_onset':
-            exd = movement_onset(yd, constant)
+            exd = movement_onset(yd, constant, etype=etype)
             eyd = yd[exd]
         elif etype == 'movement_offset':
-            exd = movement_onset(yd,constant)
+            yd2 = yd[::-1].copy() # Reverse the time series.
+            exd = movement_onset(yd2, constant, etype=etype)
             eyd = yd[exd]
         elif etype in ['fs_fp', 'fo_fp']:
             # --- Handle constant ---
@@ -99,7 +100,17 @@ def addevent_data(data, channels, ename, etype, constant=None):
 
     return data_new
 
-def max_stance(yd):
-    """ extracts max from first 40% of the gait cycle"""
-    raise NotImplementedError
+def find_first_peak(yd, constant):
+    """ extracts first peak from a series of 2 peaks """
+    # Find peaks above threshold
+    peaks, _ = find_peaks(yd, height=constant)
+
+    if len(peaks) == 0:
+        raise ValueError('No peaks found')
+    elif len(peaks) == 1:
+        raise ValueError('Only 1 peak found')
+    else:
+        # Take the first valid peak
+        exd = peaks[0]
+
     return exd

{biomechzoo-0.5.1.dist-info → biomechzoo-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: biomechzoo
-Version: 0.5.1
+Version: 0.5.2
 Summary: Python implementation of the biomechZoo toolbox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/mcgillmotionlab/biomechzoo

{biomechzoo-0.5.1.dist-info → biomechzoo-0.5.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 __init__.py,sha256=Uy3ykqw4l_lZKiUWSUFPRZpkZajYUfZLBaQLVhKzxdI,772
 biomechzoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/__main__.py,sha256=hSMHN1Rxn2367fSGTLHoOQ4_pocZw0IWI7HFxl-74oY,88
-biomechzoo/biomechzoo.py,sha256=3PviTE-zv0TVp3pYayL2ZrMopj5LJtcSLjwxEsGMtxw,22515
+biomechzoo/biomechzoo.py,sha256=Dma-eZNCud0pSD-OjNkAVlMrynOCysCQwUQXMS3GcQk,22572
 biomechzoo/biomech_ops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/biomech_ops/continuous_relative_phase_data.py,sha256=RePbt6zyOI1iv74CWhxSrunIokTFYVfFmFnoW51781E,1300
 biomechzoo/biomech_ops/continuous_relative_phase_line.py,sha256=Fa1LFRuPlmGPLQLvln6HVnJy3zMSm9z5YeooHmTu0lc,1365
 biomechzoo/biomech_ops/filter_data.py,sha256=Q9knW23Ft_WeWVCBjaIQ5GkKU0NYV4SdGiDZV8Fm-hM,1805
 biomechzoo/biomech_ops/filter_line.py,sha256=XKUdRsxU5AO1gSldnwp3qNzsUUL8qpOpAMyQbEMo5uI,2600
-biomechzoo/biomech_ops/movement_onset.py,sha256=3VAoOp01P08BKMaOZW3CwbMdoSMOufDaoMkWeYRcPmo,51
+biomechzoo/biomech_ops/movement_onset.py,sha256=qKeNiVTDra_0wjjPTLfP_Gtoyz5cbHD2F_EDxOxo1oQ,1961
 biomechzoo/biomech_ops/normalize_data.py,sha256=ESdXeUkKdd0WpjP6FW2EYrOAd7NKWkX1JWUNn1SzDB4,1335
 biomechzoo/biomech_ops/normalize_line.py,sha256=KUE8gEkIolA-VDFCdUuaskk-waO8jjJ20ZMZaS8Qha8,854
 biomechzoo/biomech_ops/phase_angle_data.py,sha256=_ekUBW2v3iC4UawcDL38ZZLYJmQsAmyqA61Q6_AMtmQ,1435
@@ -17,7 +17,7 @@ biomechzoo/conversion/c3d2zoo_data.py,sha256=28JCj1Jpn7zsv2HjQdzH2F30jnGMwzmbBwY
 biomechzoo/conversion/mvnx2zoo_data.py,sha256=uMAZ4pNSSZ7NToW1WnawrXeVP8D-xE3dNDnooPvALE4,3545
 biomechzoo/conversion/opencap2zoo_data.py,sha256=n4bLsrJI0wTSzG5bgJcmxj1dp2plnUKFNRzcTIbmV1o,608
 biomechzoo/conversion/table2zoo_data.py,sha256=rAP7OrKbVrb50NHJ6h8fgoMntV87-t9wT2xQ30AD96I,3330
-biomechzoo/imu/tilt_algoirthm.py,sha256=PYVErXHeY-Wgi0aXCQxDodohTDzirRXo8BEW3_Pskqo,4312
+biomechzoo/imu/tilt_algorithm.py,sha256=PYVErXHeY-Wgi0aXCQxDodohTDzirRXo8BEW3_Pskqo,4312
 biomechzoo/mvn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/mvn/load_mvnx.py,sha256=B4VGuidQ-5G_5E1t5vpU51Nb_Lu85_EOS_FmGZYjfX8,22499
 biomechzoo/mvn/main_mvnx.py,sha256=e1LasJQ9icyzjWnRCEcAWQq_-L13-mIzf7PzYA3QYDg,2394
@@ -26,7 +26,7 @@ biomechzoo/mvn/mvnx_file_accessor.py,sha256=Gk2vKq9v_gPbnOS_12zgeJehjFz7v3ClTnN2
 biomechzoo/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/processing/add_channel_data.py,sha256=U1xLLBSnyJeeDWzgmHSxOz1hyguzuuDXxQCQ8IFoZkw,1955
 biomechzoo/processing/addchannel_data.py,sha256=rmnnlMRVkoMlQCR-nRg1jjh-hzMDt37Sx9fAmocrpqA,1953
-biomechzoo/processing/addevent_data.py,sha256=Z7vsHqhsn8byw4d9atinjGpvglwj6tu38uqZfXVvluQ,3573
+biomechzoo/processing/addevent_data.py,sha256=GGzXSGNNpZFTEMh0l3awqeBf5jHaCdV84K2Nwjuhqkk,3955
 biomechzoo/processing/explodechannel_data.py,sha256=ceyXfcCmeNqj4p0zCksVdrnmsYR4t-JHLIyv3JlfNpU,2484
 biomechzoo/processing/partition_data.py,sha256=4wuKrnMmRMNobymYwZ0WuRvNGsvkhThZ2ZhoSkkhntg,1741
 biomechzoo/processing/removechannel_data.py,sha256=uO7jjuHapRr2CGLsrvYQ1eJLvb1y_8KR6Ct4M6TPALA,1740
@@ -47,9 +47,9 @@ biomechzoo/utils/version.py,sha256=JIXDUuOcaJiZv9ruMP6PtWvJBh4sP0D5kAvlqPiZK_I,1
 biomechzoo/utils/zload.py,sha256=_qmbQpiEwUNRcB86aS6dHiytOrz1ZXJVjYkk8h5fg8s,2039
 biomechzoo/utils/zplot.py,sha256=WVA8aCy1Pqy_bo_HXab9AmW-cBd8J8MPX2LAOd6dznU,1512
 biomechzoo/utils/zsave.py,sha256=wnRNuDxQc8bwCji4UrfoGjYrSZmka4eaDxQ5rMa78pE,1759
-biomechzoo-0.5.1.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
-biomechzoo-0.5.1.dist-info/METADATA,sha256=Jp2p2d6SsnirRpmQjUb91GyEX9sY5fRGG4jfVqRvwPA,1579
-biomechzoo-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-biomechzoo-0.5.1.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
-biomechzoo-0.5.1.dist-info/top_level.txt,sha256=nJEtuEZ9UPoN3EOR-BJ6myevEu7B5quWsWhaM_YeQpw,20
-biomechzoo-0.5.1.dist-info/RECORD,,
+biomechzoo-0.5.2.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
+biomechzoo-0.5.2.dist-info/METADATA,sha256=_2N7nddOIeDuoVCCXsD8aEggf84O21RBstPq4h3k7pM,1579
+biomechzoo-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+biomechzoo-0.5.2.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
+biomechzoo-0.5.2.dist-info/top_level.txt,sha256=nJEtuEZ9UPoN3EOR-BJ6myevEu7B5quWsWhaM_YeQpw,20
+biomechzoo-0.5.2.dist-info/RECORD,,