Skip to content

Commit

Permalink
(#830) Deprecated pitchtools.tranpose_pitch_carrier_by_interval().
Browse files Browse the repository at this point in the history
Use Interval.transpose() instead.
  • Loading branch information
trevorbaca committed Jul 31, 2017
1 parent e411e19 commit 7fa652f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
8 changes: 8 additions & 0 deletions abjad/tools/pitchtools/Interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,3 +178,11 @@ def is_named_interval_quality_abbreviation(argument):
return False
return bool(Interval._named_interval_quality_abbreviation_regex.match(
argument))

@abc.abstractmethod
def transpose(self, pitch_carrier):
r'''Transposes `pitch_carrier` by interval.
Returns new pitch carrier.
'''
raise NotImplementedError
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,44 @@
def test_pitchtools_transpose_pitch_carrier_by_interval_01():

pitch = NamedPitch(12)

named_interval = pitchtools.NamedInterval('minor', 2)
transposed = pitchtools.transpose_pitch_carrier_by_interval(pitch, named_interval)
transposed = named_interval.transpose(pitch)

assert transposed == NamedPitch('df', 5)


def test_pitchtools_transpose_pitch_carrier_by_interval_02():

pitch = NamedPitch(12)

numbered_interval = pitchtools.NumberedInterval(1)
transposed = pitchtools.transpose_pitch_carrier_by_interval(pitch, numbered_interval)
transposed = numbered_interval.transpose(pitch)

assert transposed == NamedPitch('cs', 5)


def test_pitchtools_transpose_pitch_carrier_by_interval_03():
r'''Transpose pitch.
'''

pitch = NamedPitch(12)
interval = pitchtools.NumberedInterval(-3)
new = pitchtools.transpose_pitch_carrier_by_interval(pitch, interval)
new = interval.transpose(pitch)
assert new == NamedPitch(9)
assert new is not pitch


def test_pitchtools_transpose_pitch_carrier_by_interval_04():
r'''Transpose note.
'''

note = Note(12, (1, 4))
interval = pitchtools.NumberedInterval(-3)
new = pitchtools.transpose_pitch_carrier_by_interval(note, interval)
new = interval.transpose(note)
assert new.written_pitch == NamedPitch(9)
assert new is not note


def test_pitchtools_transpose_pitch_carrier_by_interval_05():
r'''Transpose chord.
'''

chord = Chord([12, 13, 14], (1, 4))
interval = pitchtools.NumberedInterval(-3)
new = pitchtools.transpose_pitch_carrier_by_interval(chord, interval)
new = interval.transpose(chord)
assert new.written_pitches == tuple([NamedPitch(x) for x in [9, 10, 11]])
assert new is not chord

Expand All @@ -59,15 +51,12 @@ def test_pitchtools_transpose_pitch_carrier_by_interval_06():

pitch = NamedPitch(12)
mdi = pitchtools.NamedInterval('minor', -3)

transposed_pitch = pitchtools.transpose_pitch_carrier_by_interval(pitch, mdi)
transposed_pitch = mdi.transpose(pitch)
assert transposed_pitch == NamedPitch('a', 4)


def test_pitchtools_transpose_pitch_carrier_by_interval_07():
r'''Retun non-pitch-carrying input changed.
'''

mdi = pitchtools.NamedInterval('minor', -3)
rest = Rest('r4')

assert pitchtools.transpose_pitch_carrier_by_interval(rest, '+m2') is rest
assert mdi.transpose(rest) is rest

0 comments on commit 7fa652f

Please sign in to comment.