Simplification
This commit is contained in:
@@ -5,8 +5,6 @@ import pathlib
|
||||
import types
|
||||
import functools
|
||||
|
||||
import generator.solo.policy
|
||||
|
||||
import generator.model
|
||||
import generator.musicxml
|
||||
|
||||
@@ -24,30 +22,6 @@ class Sequence:
|
||||
offsets = self.offsets()
|
||||
return max(map(abs, self.steps)), max(offsets) - min(offsets), sum(a * b < 0 for a, b in zip(self.steps, self.steps[1:])), self.id
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Path:
|
||||
steps: tuple[int, ...]
|
||||
sources: tuple[str, ...]
|
||||
@functools.lru_cache(maxsize=32768)
|
||||
def offsets(self):
|
||||
result = [0]
|
||||
for step in self.steps:
|
||||
result.append(result[-1] + step)
|
||||
return tuple(result)
|
||||
|
||||
@functools.lru_cache(maxsize=32768)
|
||||
def family(steps):
|
||||
if not steps or all(s == 0 for s in steps):
|
||||
return 'repeated'
|
||||
turns = sum(a * b < 0 for a, b in zip(steps, steps[1:]))
|
||||
if not turns:
|
||||
return 'rising' if sum(steps) > 0 else 'falling'
|
||||
if max(map(abs, steps)) >= 4:
|
||||
return 'leap_return'
|
||||
if sum(steps) == 0 and max(map(abs, steps)) == 1:
|
||||
return 'neighbor'
|
||||
return ('arch' if steps[0] > 0 else 'valley') if turns == 1 else 'wave'
|
||||
|
||||
def diverse(items, rank, category, limit):
|
||||
"""Round-robin eligible musical families before a destructive cutoff."""
|
||||
groups = {}
|
||||
@@ -70,7 +44,6 @@ def diverse(items, rank, category, limit):
|
||||
@dataclasses.dataclass(frozen=True, init=False)
|
||||
class Library:
|
||||
paths: types.MappingProxyType
|
||||
chains: dict
|
||||
def __init__(self, sequences: tuple[Sequence, ...]):
|
||||
paths, identities = {}, set()
|
||||
for sequence in sequences:
|
||||
@@ -79,7 +52,6 @@ class Library:
|
||||
identities.add(sequence.id)
|
||||
paths.setdefault(len(sequence.steps) + 1, []).append(sequence)
|
||||
object.__setattr__(self, 'paths', types.MappingProxyType({count: tuple(sorted(items, key=lambda s: s.rank())) for count, items in paths.items()}))
|
||||
object.__setattr__(self, 'chains', {})
|
||||
def connecting(self, count: int, displacement: int | None = None) -> tuple[Sequence, ...]:
|
||||
return tuple(s for s in self.paths.get(count, ()) if displacement is None or s.offsets()[-1] == displacement)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user