Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1653: Correct scale caching mechanism. #1692

Merged
merged 4 commits into from
Apr 25, 2024
Merged

Fix #1653: Correct scale caching mechanism. #1692

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aec115
Correct scale caching mechanism.
TimFelixBeyer Feb 29, 2024
764f509
Include scale name in hash again
TimFelixBeyer Feb 29, 2024
207d3a5
fix lint
TimFelixBeyer Feb 29, 2024
cb0223e
Merge branch 'master' into pr/1692
mscuthbert Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions music21/roman.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2488,10 +2488,10 @@ def _parseFigure(self):
if not isinstance(self._figure, str): # pragma: no cover
raise RomanNumeralException(f'got a non-string figure: {self._figure!r}')

if not self.useImpliedScale:
useScale = self._scale
else:
if self.useImpliedScale:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps a bit more elegant, but this change is not really in the scope of the PR. :-)

useScale = self.impliedScale
else:
useScale = self._scale

(workingFigure, useScale) = self._correctForSecondaryRomanNumeral(useScale)

Expand Down Expand Up @@ -3487,10 +3487,17 @@ def key(self, keyOrScale):
# store for later
_keyCache[keyOrScale.tonicPitchNameWithCase] = keyOrScale
elif 'Scale' in keyClasses:
if keyOrScale.name in _scaleCache:
keyOrScale = _scaleCache[keyOrScale.name]
# Need unique 'hash' for each scale. Names is not enough as there are
# multiple scales with the same name but different pitches.
scaleHash = keyOrScale.name
if getattr(keyOrScale, 'isConcrete', False):
scaleHash += '_'.join(
[p.nameWithOctave for p in keyOrScale.pitches]
)
if scaleHash in _scaleCache:
keyOrScale = _scaleCache[scaleHash]
else:
_scaleCache[keyOrScale.name] = keyOrScale
_scaleCache[scaleHash] = keyOrScale
else:
raise RomanNumeralException(
f'Cannot get a key from this object {keyOrScale!r}, send only '
Expand Down Expand Up @@ -4553,6 +4560,14 @@ def test_int_figure_case_matters(self):
rn = RomanNumeral(4, 'C')
self.assertEqual(rn.figure, 'IV')

def test_scale_caching(self):
mcs = scale.ConcreteScale('c', pitches=('C', 'D', 'E', 'F', 'G', 'A', 'B'))
rn = mcs.romanNumeral('IV7')
self.assertEqual([p.unicodeName for p in rn.pitches], ['F', 'A', 'C', 'E'])
mcs = scale.ConcreteScale('c', pitches=('C', 'D', 'E-', 'F', 'G', 'A', 'B'))
rn = mcs.romanNumeral('IV7')
self.assertEqual([p.unicodeName for p in rn.pitches], ['F', 'A', 'C', 'E♭'])


class TestExternal(unittest.TestCase):
show = True
Expand Down
Loading