@@ -9,8 +9,8 @@ import generator.pitch
|
||||
|
||||
NAMES = {
|
||||
'major': ('Ionian', 'Dorian', 'Phrygian', 'Lydian', 'Mixolydian', 'Aeolian', 'Locrian'),
|
||||
'melodic-minor': ('Melodic Minor', 'Dorian b2', 'Lydian Augmented', 'Lydian Dominant', 'Mixolydian b6', 'Locrian natural 2', 'Altered'),
|
||||
'harmonic-minor': ('Harmonic Minor', 'Locrian natural 6', 'Ionian #5', 'Dorian #4', 'Phrygian Dominant', 'Lydian #2', 'Ultra Locrian'),
|
||||
'melodic_minor': ('Melodic Minor', 'Dorian b2', 'Lydian Augmented', 'Lydian Dominant', 'Mixolydian b6', 'Locrian natural 2', 'Altered'),
|
||||
'harmonic_minor': ('Harmonic Minor', 'Locrian natural 6', 'Ionian #5', 'Dorian #4', 'Phrygian Dominant', 'Lydian #2', 'Ultra Locrian'),
|
||||
}
|
||||
ROOTS = ('C', 'Db', 'D', 'Eb', 'E', 'F', 'F#', 'G', 'Ab', 'A', 'Bb', 'B')
|
||||
|
||||
@@ -76,17 +76,17 @@ def read_pattern(path: pathlib.Path, family: str, mode: int) -> Pattern:
|
||||
return Pattern(family, mode, tuple(int(n) for n in intervals[:-1]))
|
||||
|
||||
def load_library(root: pathlib.Path) -> Library:
|
||||
expected = {root / f'{family}-scale-modes' / f'{mode:04}.xml' for family in NAMES for mode in range(1, 8)}
|
||||
expected = {root / f'{family}_scale_modes' / f'{mode:04}.xml' for family in NAMES for mode in range(1, 8)}
|
||||
actual = set(root.rglob('*.xml'))
|
||||
if actual != expected:
|
||||
missing, unexpected = sorted(expected - actual), sorted(actual - expected)
|
||||
raise ValueError(f'{root}: expected all 21 scale patterns; missing: {missing}; unexpected: {unexpected}')
|
||||
patterns = tuple(read_pattern(root / f'{family}-scale-modes' / f'{mode:04}.xml', family, mode) for family in NAMES for mode in range(1, 8))
|
||||
patterns = tuple(read_pattern(root / f'{family}_scale_modes' / f'{mode:04}.xml', family, mode) for family in NAMES for mode in range(1, 8))
|
||||
for family in NAMES:
|
||||
modes = [pattern for pattern in patterns if pattern.family == family]
|
||||
parent = modes[0].intervals
|
||||
for index, pattern in enumerate(modes):
|
||||
rotation = tuple((parent[(index + n) % 7] - parent[index]) % 12 for n in range(7))
|
||||
if pattern.intervals != rotation:
|
||||
raise ValueError(f'{root / (family + "-scale-modes") / f"{pattern.mode:04}.xml"}: pattern is not mode {pattern.mode} of its family parent')
|
||||
raise ValueError(f'{root / (family + "_scale_modes") / f"{pattern.mode:04}.xml"}: pattern is not mode {pattern.mode} of its family parent')
|
||||
return Library(patterns)
|
||||
|
||||
Reference in New Issue
Block a user