BuboBubo/ziffers-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with subdivisions and added tests

Browse Source
This commit is contained in:
Miika Alonen
2023-02-23 18:22:43 +02:00
parent 63dab6fbdf
commit 6dd8333007
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/test_parser.py
View File

@ -87,3 +87,20 @@ def test_subdivisions(pattern: str, expected: list):
def test_repeats(pattern: str, expected: list): def test_repeats(pattern: str, expected: list):
assert zparse(pattern).notes() == expected assert zparse(pattern).notes() == expected
@pytest.mark.parametrize(
"pattern,expected",
[
("0 [0 2] 0", [0.25, 0.125, 0.125, 0.25, 0.25, 0.125, 0.125, 0.25, 0.25, 0.125, 0.125, 0.25]),
("w 0 [0 [1 [2 3]] 0] 9", [1.0, 0.3333333333333333, 0.16666666666666666, 0.08333333333333333, 0.08333333333333333, 0.3333333333333333, 1.0, 1.0, 0.3333333333333333, 0.16666666666666666, 0.08333333333333333, 0.08333333333333333]),
("1.0 0 [[2 3] [3 5]] 4", [1.0, 0.25, 0.25, 0.25, 0.25, 1.0, 1.0, 0.25, 0.25, 0.25, 0.25, 1.0]),
("2.0 0 [1[2[3[4 5]6]7]8] 9", [2.0, 0.6666666666666666, 0.2222222222222222, 0.07407407407407407, 0.037037037037037035, 0.037037037037037035, 0.07407407407407407, 0.2222222222222222, 0.6666666666666666, 2.0, 2.0, 0.6666666666666666])
]
)
def test_looping_durations(pattern: str, expected: list):
parsed = zparse(pattern)
durations = []
for i in range(12):
durations.append(parsed[i].duration)
assert durations == expected

5
ziffers/classes.py
View File

@ -658,14 +658,17 @@ class RepeatedListSequence(Sequence):
class Subdivision(Sequence): class Subdivision(Sequence):
"""Class for subdivisions""" """Class for subdivisions"""
full_duration: float = field(default=None, init=False)
def evaluate_values(self, options): def evaluate_values(self, options):
"""Evaluate values and store to evaluated_values""" """Evaluate values and store to evaluated_values"""
self.full_duration = options["duration"]
self.evaluated_values = list(self.evaluate_tree(options)) self.evaluated_values = list(self.evaluate_tree(options))
def evaluate_durations(self, duration=None): def evaluate_durations(self, duration=None):
"""Calculate new durations by dividing with the number of items in the sequence""" """Calculate new durations by dividing with the number of items in the sequence"""
if duration is None: if duration is None:
duration = self.evaluated_values[0].duration duration = self.full_duration
new_d = duration / len(self.evaluated_values) new_d = duration / len(self.evaluated_values)
for item in self.evaluated_values: for item in self.evaluated_values:
if isinstance(item, Subdivision): if isinstance(item, Subdivision):