py2ls 0.1.7.7__py3-none-any.whl → 0.1.7.9__py3-none-any.whl

py2ls/sleep_events_detectors.py

@@ -139,7 +139,7 @@ def filter_bandpass(data=None, ord=4, freq_range=[11, 16], fs=1000):
 def moving_average(data, window_size):
     return convolve1d(data, np.ones(window_size) / window_size)
 
-def detect_cross(data, thr=0):
+def detect_cross(data, thr=0, match=True,full_cycle=False):
     if isinstance(data, list):
         data = np.array(data)
     if data.ndim == 1:
@@ -148,25 +148,31 @@ def detect_cross(data, thr=0):
         data = data.T
     else:
         raise ValueError("Input data must have two dimensions.")
-
-    thr_cross = np.sign(data[:, np.newaxis] - thr)
-    falling_before = np.where((thr_cross[:-1] == 1) & (thr_cross[1:] == -1))[0] #+ 1
-    rising_before = np.where((thr_cross[:-1] == -1) & (thr_cross[1:] == 1))[0]
-    falling_before = falling_before.tolist()
-    rising_before = rising_before.tolist()
-    if rising_before and falling_before:
-        if rising_before[0] < falling_before[0]:
-            if len(rising_before) > len(falling_before):
-                rising_before.pop(0)
-        else:
-            falling_before.pop(0)
-            if len(rising_before) > len(falling_before):
-                rising_before.pop(0)
-    if rising_before and falling_before:
+    if full_cycle:
+        thr_cross = np.sign(data[:, np.newaxis] - thr)
+        falling_before = np.where((thr_cross[:-1] == 1) & (thr_cross[1:] == -1))[0] #+ 1
+        rising_before = np.where((thr_cross[:-1] == -1) & (thr_cross[1:] == 1))[0]
+        falling_before = falling_before.tolist()
+        rising_before = rising_before.tolist()
+        if rising_before and falling_before:
+            if rising_before[0] < falling_before[0]:
+                if len(rising_before) > len(falling_before):
+                    rising_before.pop(0)
+            else:
+                falling_before.pop(0)
+                if len(rising_before) > len(falling_before):
+                    rising_before.pop(0)
         return rising_before, falling_before
     else:
         signal_shifted = data - thr
-        return np.where(np.diff(np.sign(signal_shifted)))[0]
+        signal_sign = np.sign(signal_shifted)
+        sign_diff = np.diff(signal_sign)
+        rising_before, falling_before=np.where(sign_diff > 0)[0],np.where(sign_diff < 0)[0]
+        if match:
+            # make sure they are matched
+            min_length = min(len(rising_before), len(falling_before))
+            rising_before, falling_before=rising_before[:min_length], falling_before[:min_length]
+        return rising_before, falling_before
     ## debug
     # a = np.sin(np.arange(0, 10 * np.pi, np.pi / 100))
 

{py2ls-0.1.7.7.dist-info → py2ls-0.1.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.7.7
+Version: 0.1.7.9
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.7.7.dist-info → py2ls-0.1.7.9.dist-info}/RECORD

@@ -138,10 +138,10 @@ py2ls/ips.py,sha256=KkrkGAF0VQ-N0rH4FQFLyP-C-skY6EPpeO8t_5RngWw,88519
 py2ls/netfinder.py,sha256=MY_0TQY_zaRBZ6wfR4RxNCGrU93HFmDVDRRy1EXl75o,47566
 py2ls/plot.py,sha256=8_33-1wpkGZrDUuvRBfTPUi_BRKdf1njoR725OLSLSY,48579
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
-py2ls/sleep_events_detectors.py,sha256=Y0cbM1yHbIxIYEnFICZSHmQWO31nZGZUMcH07kTbiQ4,51697
+py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso68,52145
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.7.7.dist-info/METADATA,sha256=x7zPhd_n4VHVZQmjLcZaa6525qNXyWoM6YTDOUDeqmw,20017
-py2ls-0.1.7.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.7.7.dist-info/RECORD,,
+py2ls-0.1.7.9.dist-info/METADATA,sha256=aeI1PAS5UHFiY3iBnfrw7VS7_y5Q8AS7chRBQgMMmxE,20017
+py2ls-0.1.7.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.7.9.dist-info/RECORD,,