improve avg function

Author: arch

funscript_editor/algorithms/opticalflow.py

@@ -225,6 +225,7 @@ def tracking(self) -> str:
 
         signal = Signal(self.video_info.fps)
         points = signal.get_local_min_max_points(result)
+        # points = signal.get_direction_changes(result, filter_len=4)
         categorized_points = signal.categorize_points(result, points)
 
         for k in self.funscripts:

funscript_editor/algorithms/signal.py

@@ -9,6 +9,7 @@
 from numpy.linalg import norm
 from funscript_editor.utils.config import HYPERPARAMETER
 
+import matplotlib.pyplot as plt
 
 @dataclass
 class SignalParameter:
@@ -63,10 +64,7 @@ def moving_average(x: list, w: int) -> list:
         if w == 1:
             return x
 
-        avg = np.convolve(x, np.ones(int(w*2)), 'valid') / int(w*2)
-        return [avg[0] for _ in range(int(w))] \
-                + list(avg) \
-                + [avg[-1] for _ in range(len(avg)+w,len(x))]
+        return np.convolve(x, np.ones(int(w*2)) / (w*2), 'same')
 
 
     @staticmethod