add additional points repetitions

Author: arch

funscript_editor/algorithms/signal.py

@@ -20,6 +20,7 @@ class SignalParameter:
     distance_minimization_threshold: float = float(HYPERPARAMETER['signal']['distance_minimization_threshold'])
     high_second_derivative_points_threshold: float = float(HYPERPARAMETER['signal']['high_second_derivative_points_threshold'])
     direction_change_filter_len: int = int(HYPERPARAMETER['signal']['direction_change_filter_len'])
+    additional_points_repetitions: int = int(HYPERPARAMETER['signal']['additional_points_repetitions'])
 
 
 class Signal:
@@ -570,16 +571,23 @@ def decimate(self,
         else:
             raise NotImplementedError("Selected Base Point Algorithm is not implemented")
 
-        for algo in additional_points_algorithms:
-            if algo == self.AdditionalPointAlgorithm.high_second_derivative:
-                additional_indexes = self.get_high_second_derivative_points(signal, alpha = self.params.high_second_derivative_points_threshold)
-            elif algo == self.AdditionalPointAlgorithm.distance_minimization:
-                additional_indexes = self.get_edge_points(signal, decimated_indexes, threshold = self.params.distance_minimization_threshold)
-            else:
-                raise NotImplementedError("Selected Additional Points Algorithm is not implemented")
+        for run_idx in range(self.params.additional_points_repetitions):
+            self.logger.info("Run Additional Points Algorithms #%d", run_idx+1)
+            len_before_merge = len(decimated_indexes)
+            for algo in additional_points_algorithms:
+                if algo == self.AdditionalPointAlgorithm.high_second_derivative:
+                    additional_indexes = self.get_high_second_derivative_points(signal, alpha = self.params.high_second_derivative_points_threshold)
+                elif algo == self.AdditionalPointAlgorithm.distance_minimization:
+                    additional_indexes = self.get_edge_points(signal, decimated_indexes, threshold = self.params.distance_minimization_threshold)
+                else:
+                    raise NotImplementedError("Selected Additional Points Algorithm is not implemented")
+
+                if len(additional_indexes) > 0:
+                    decimated_indexes = self.merge_points(signal, decimated_indexes, additional_indexes)
 
-            if len(additional_indexes) > 0:
-                decimated_indexes = self.merge_points(signal, decimated_indexes, additional_indexes)
+            if len_before_merge >= len(decimated_indexes):
+                self.logger.info("Additional Points Early Stop")
+                break
 
         if len(decimated_indexes) == 0 and len(signal) > 100:
             self.logger.info("Insert start and end point")

funscript_editor/config/hyperparameter.yaml

@@ -23,7 +23,7 @@ signal:
   avg_sec_for_local_min_max_extraction: 2.0
 
   # threshold value to predict an distance minimization point candidate
-  distance_minimization_threshold: 20.0
+  distance_minimization_threshold: 16.0
 
   # threshold value tor get additional points by comparing second derivative with the rolling standard deviation and given threshold
   high_second_derivative_points_threshold: 1.2
@@ -32,10 +32,13 @@ signal:
   direction_change_filter_len: 3
 
   # threshold value in milliseconds to merge additional points
-  additional_points_merge_time_threshold_in_ms: 70
+  additional_points_merge_time_threshold_in_ms: 60
 
   # threshold value to merge additional points
-  additional_points_merge_distance_threshold: 10.0
+  additional_points_merge_distance_threshold: 8.0
+
+  # number of runs for the additional points algorithm (max number of points that will be insert between 2 base points)
+  additional_points_repetitions: 2
 
 
 # Scene Detector Hyperparameter