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

Simple support for re-evaluating cycles with get_item

Browse Source
This commit is contained in:
Miika Alonen
2023-02-21 20:56:06 +02:00
parent 973d3eab2b
commit acbfacee59
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_parser.py
View File

@ -71,7 +71,7 @@ def test_pitch_octaves(pattern: str, expected: list):
[ [
("w [1 [2 3]]", [0.5, 0.25, 0.25]), ("w [1 [2 3]]", [0.5, 0.25, 0.25]),
("1.0 [1 [2 3]] 4 [3 [4 5]]", [0.5, 0.25, 0.25, 1.0, 0.5, 0.25, 0.25]), ("1.0 [1 [2 3]] 4 [3 [4 5]]", [0.5, 0.25, 0.25, 1.0, 0.5, 0.25, 0.25]),
("0.5 (0 0.25 3)+1", [0.5, 0.25]) ("0.5 (0 0.25 3)+1", [0.5, 0.5])
] ]
) )
def test_subdivisions(pattern: str, expected: list): def test_subdivisions(pattern: str, expected: list):

14
ziffers/classes.py
View File

@ -1,6 +1,7 @@
""" Ziffers classes for the parsed notation """ """ Ziffers classes for the parsed notation """
from dataclasses import dataclass, field, replace, asdict from dataclasses import dataclass, field, replace, asdict
from itertools import product, islice, cycle from itertools import product, islice, cycle
from math import floor
import operator import operator
import random import random
from .defaults import DEFAULT_OPTIONS from .defaults import DEFAULT_OPTIONS
@ -487,12 +488,20 @@ class Ziffers(Sequence):
options: dict = field(default_factory=DEFAULT_OPTIONS) options: dict = field(default_factory=DEFAULT_OPTIONS)
start_options: dict = None start_options: dict = None
loop_i: int = 0 loop_i: int = field(default=0, init=False)
cycle_i: int = field(default=0, init=False)
iterator = None iterator = None
current: Item = field(default=None) current: Item = field(default=None)
cycle_length: int = field(default=0, init=False)
def __getitem__(self, index): def __getitem__(self, index):
return self.evaluated_values[index % len(self.evaluated_values)] loop_i = index % self.cycle_length
self.loop_i = loop_i
new_cycle = floor(index / self.cycle_length)
if new_cycle > self.cycle_i or new_cycle < self.cycle_i:
self.re_eval(self.options)
self.cycle_i = new_cycle
return self.evaluated_values[loop_i]
def __iter__(self): def __iter__(self):
return self return self
@ -525,6 +534,7 @@ class Ziffers(Sequence):
self.evaluated_values = list(self.evaluate_tree(options)) self.evaluated_values = list(self.evaluate_tree(options))
self.evaluated_values = list(self.post_check()) self.evaluated_values = list(self.post_check())
self.iterator = iter(self.evaluated_values) self.iterator = iter(self.evaluated_values)
self.cycle_length = len(self.evaluated_values)
def post_check(self): def post_check(self):
for item in self.evaluated_values: for item in self.evaluated_values: