Avoid creating duplicative ChordStepModifications #1509
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prevents comparing two CSM's as unequal if one has interval P1 and the other None.
jacobtylerwalls
changed the title
jacobtylerwalls
force-pushed
the
figure-idempotent
branch
from
476c0bd to
dbd943e
Compare
mscuthbert
reviewed
Jan 11, 2023
music21/harmony.py
Outdated
| self._interval = None # alteration of degree, alter ints in mxl | ||
| self._degree = None # the degree number, where 3 is the third | ||
| # use properties if defined | ||
| def __init__(self, modType=None, degree=None, intervalObj=interval.Interval('P1')): |
There was a problem hiding this comment.
Not so sure about this change because Interval is mutable. We definitely need an immutable flag on Interval so that this default value isn't ever transposed inPlace.
There was a problem hiding this comment.
Great catch! 34aa5da
music21/harmony.py
Outdated
| # use properties if defined | ||
| def __init__(self, modType=None, degree=None, intervalObj=interval.Interval('P1')): | ||
| self._modType: str | None = None # add, alter, subtract | ||
| self._interval: interval.Interval | None = None # alteration of degree, alter ints in mxl |
There was a problem hiding this comment.
is it possible to make it so _interval is always an Interval and never None? Helps with the typing.
| self._degree = None # the degree number, where 3 is the third | ||
| # use properties if defined | ||
| def __init__(self, modType=None, degree=None, intervalObj=interval.Interval('P1')): | ||
| self._modType: str | None = None # add, alter, subtract |
There was a problem hiding this comment.
I wonder if we can use '' for None going forward. There were a lot of str | None in the code before typing became a thing but now it's biting us.
| def _adjustPitchesForChordStepModifications(self, pitches): | ||
| def _adjustPitchesForChordStepModifications( | ||
| self, pitches: t.Iterable[pitch.Pitch] | ||
| ) -> list[pitch.Pitch]: |
There was a problem hiding this comment.
internal method. change of type is fine.
jacobtylerwalls
requested review from
mscuthbert
and removed request for
mscuthbert
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1500 by not creating duplicative ChordStepModifications.
Also:
_adjustPitchesForChordStepModifications()