tracks/python/exercises/scale-generator/example.py in trackler-2.2.1.107 vs tracks/python/exercises/scale-generator/example.py in trackler-2.2.1.108
- old
+ new
@@ -6,25 +6,24 @@
FLAT_CHROMATIC_SCALE = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab',
'A', 'Bb', 'B']
FLAT_KEYS = ['F', 'Bb', 'Eb', 'Ab', 'Db', 'Gb', 'd', 'g', 'c', 'f', 'bb',
'eb']
- def __init__(self, tonic, scale_name, pattern=None):
+ def __init__(self, tonic, intervals=None):
self.tonic = tonic.capitalize()
- self.name = self.tonic + ' ' + scale_name
- self.pattern = pattern
+ self.intervals = intervals
self.chromatic_scale = (self.FLAT_CHROMATIC_SCALE
if tonic in self.FLAT_KEYS
else self.CHROMATIC_SCALE)
self.pitches = self._assign_pitches()
def _assign_pitches(self):
- if self.pattern is None:
+ if self.intervals is None:
return self._reorder_chromatic_scale()
last_index = 0
pitches = []
scale = self._reorder_chromatic_scale()
- for i, interval in enumerate(self.pattern):
+ for i, interval in enumerate(self.intervals):
pitches.append(scale[last_index])
last_index += self.ASCENDING_INTERVALS.index(interval) + 1
if pitches[0] != scale[last_index % len(scale)]:
raise ValueError("Interval is broken")
return pitches