Fixing composition bug with ultri, ulsaw and ulrect

sardine_core/sequences/sardine_parser/funclib.py

@@ -934,57 +934,57 @@ def inner_func():
                 return -4 * t / period + 2
         return [inner_func()]
 
-    def alsin(self, period: int|float, **kwargs) -> list:
-        """Basic unipolar sinusoïdal low frequency oscillator
+    def lsaw(self, period: int|float, **kwargs) -> list:
+        """Basic sawtooth low frequency oscillator
         Args:
             period (int|float): LFO period (duration in beats)  
         Returns:
-            list: lfo value (0 -> 1)
+            list: lfo value (-1 -> 1)
         """
-        # period = float(period[0])
-        return self.absolute(*[self.lsin(period)])
+        period = float(period[0])
+        t = self.clock.time % period
+        return [((2 * t if t < period / 2 else (2 * t)) / 2) - 1]
 
-    def altri(self, period: int|float, **kwargs) -> list:
-        """Basic unipolar triangular low frequency oscillator
+    def lrect(self, period: int|float, pwm: int|float=0.5, **kwargs) -> list:
+        """Basic square low frequency oscillator
         Args:
             period (int|float): LFO period (duration in beats)  
         Returns:
-            list: lfo value (0 -> 1)
+            list: lfo value (-1 -> 1)
         """
-        return [self.absolute(*[self.ltri(period=period)])]
+        period, pwm = float(period[0]), float(pwm[0]) * 100
+        t = self.clock.time % period
+        return [1 if t < (period * (pwm / 100)) else -1]
 
-    def alsaw(self, period: int|float, **kwargs) -> list:
-        """Basic unipolar sawtooth low frequency oscillator
+    def ulsin(self, period: int|float, **kwargs) -> list:
+        """Basic unipolar sinusoïdal low frequency oscillator
         Args:
             period (int|float): LFO period (duration in beats)  
         Returns:
             list: lfo value (0 -> 1)
         """
-        return [self.absolute(*[self.lsaw(period=period)])]
-
+        # period = float(period[0])
+        return self.absolute(*[self.lsin(period)])
 
-    def lsaw(self, period: int|float, **kwargs) -> list:
-        """Basic sawtooth low frequency oscillator
+    def ultri(self, period: int|float, **kwargs) -> list:
+        """Basic unipolar triangular low frequency oscillator
         Args:
             period (int|float): LFO period (duration in beats)  
         Returns:
-            list: lfo value (-1 -> 1)
+            list: lfo value (0 -> 1)
         """
-        period = float(period[0])
-        t = self.clock.time % period
-        return [((2 * t if t < period / 2 else (2 * t)) / 2) - 1]
-
+        return self.absolute(*[self.ltri(period=period)])
 
-    def lrect(self, period: int|float, pwm: int|float=0.5, **kwargs) -> list:
-        """Basic square low frequency oscillator
+    def ulsaw(self, period: int|float, **kwargs) -> list:
+        """Basic unipolar sawtooth low frequency oscillator
         Args:
             period (int|float): LFO period (duration in beats)  
         Returns:
-            list: lfo value (-1 -> 1)
+            list: lfo value (0 -> 1)
         """
-        period, pwm = float(period[0]), float(pwm[0]) * 100
-        t = self.clock.time % period
-        return [1 if t < (period * (pwm / 100)) else -1]
+        return self.absolute(*[self.lsaw(period=period)])
+
+
 
 
     def get_time(self, *args, **kwargs):

sardine_core/sequences/sardine_parser/tree_calc.py

@@ -506,17 +506,17 @@ def function_call(self, func_name, *args):
             "ltri": self.library.ltri,
             "lsaw": self.library.lsaw,
             "lrect": self.library.lrect,
-            "ulsin": self.library.alsin,
-            "ultri": self.library.altri,
-            "ulsaw": self.library.alsaw,
+            "ulsin": self.library.ulsin,
+            "ultri": self.library.ultri,
+            "ulsaw": self.library.ulsaw,
             # Time information
             "time": self.library.get_time,
-            "t": self.library.get_time,
             "bar": self.library.get_bar,
-            "b": self.library.get_bar,
             "phase": self.library.get_phase,
-            "p": self.library.get_phase,
             "unix": self.library.get_unix_time,
+            "t": self.library.get_time,
+            "b": self.library.get_bar,
+            "p": self.library.get_phase,
             "u": self.library.get_unix_time,
             # global scale support
             "scl": self.library.get_scale_note,