link first tendency to last tendency in repeated waveform

Author: SBlokhuizen

tests/tendencies/test_repeat.py

@@ -26,6 +26,25 @@ def repeat_waveform():
     }
 
 
+def test_repeat_loop():
+    """Test if repeat tendency correctly links first and last tendencies."""
+    looped_waveform = {
+        "user_duration": 8,
+        "user_waveform": [
+            {"type": "linear", "from": 1, "to": 2, "duration": 2},
+            {"type": "linear", "from": 2, "to": -1, "duration": 1},
+            {"type": "linear", "duration": 1},
+        ],
+    }
+    repeat_tendency = RepeatTendency(**looped_waveform)
+    times = np.linspace(0, 8, 17)
+    _, values = repeat_tendency.get_value(times)
+    check_values_at_times([0, 4, 8], times, values, 1)
+    check_values_at_times([2, 6], times, values, 2)
+    check_values_at_times([3, 7], times, values, -1)
+    check_values_at_times([3.5, 7.5], times, values, 0)
+
+
 def test_zero_start(repeat_waveform):
     """Test if zero start does not raise an error."""
     repeat_waveform["user_waveform"][0]["start"] = 0

waveform_editor/tendencies/repeat.py

@@ -32,17 +32,12 @@ def __init__(self, **kwargs):
                 "The starting point of the first repeated tendency is not set to 0."
             )
 
-        # TODO: The start of the first tendency does not link to the end of the last
-        # tendency. This might be nice to implement so you could do for example:
-        # waveform:
-        # - type: repeat
-        #   duration: 10
-        #   waveform:
-        #   - {type: linear, from: 1, to: 2, duration: 1}
-        #   - {type: linear, from: 2, to: 0, duration: 1}
-        #   - {type: smooth, duration: 3}
-        #
-        # where, the smooth tendency would smoothly interpolate from 0 to 2
+        # Link the last tendency to the first tendency in the repeated waveform
+        # We must lock the start to 0, otherwise it will take the start value of the
+        # previous tendency.
+        self.waveform.tendencies[0].user_start = 0
+        self.waveform.tendencies[0].set_previous_tendency(self.waveform.tendencies[-1])
+        self.waveform.tendencies[-1].set_next_tendency(self.waveform.tendencies[0])
 
     def get_value(
         self, time: Optional[np.ndarray] = None