From 46abbde2012984d6059f2a8988656359445cc8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trevor=20Ba=C4=8Da?= Date: Sun, 16 Feb 2025 17:18:33 -0500 Subject: [PATCH] Clean up tests (#89) Clean up imports Clean up line overruns --- abjadext/nauert/gracehandlers.py | 4 +- abjadext/nauert/qeventproxy.py | 2 +- abjadext/nauert/qevents.py | 2 +- abjadext/nauert/qeventsequence.py | 144 +++++------ abjadext/nauert/qgrid.py | 34 ++- abjadext/nauert/qschemaitems.py | 35 +-- abjadext/nauert/qschemas.py | 46 ++-- abjadext/nauert/qtargetitems.py | 84 +++---- abjadext/nauert/qtargets.py | 110 ++++---- abjadext/nauert/quantizationjob.py | 38 +-- abjadext/nauert/quantizer.py | 32 +-- abjadext/nauert/searchtrees.py | 24 +- tests/test_BeatwiseQSchemaItem___new__.py | 12 +- tests/test_BeatwiseQSchema___call__.py | 4 +- tests/test_BeatwiseQSchema___getitem__.py | 34 ++- tests/test_BeatwiseQSchema___init__.py | 20 +- tests/test_MeasurewiseQSchemaItem___new__.py | 12 +- tests/test_MeasurewiseQSchema___call__.py | 4 +- tests/test_MeasurewiseQSchema___getitem__.py | 38 ++- tests/test_MeasurewiseQSchema___init__.py | 23 +- tests/test_ParallelJobHandler___call__.py | 65 ++--- tests/test_QEvent.py | 64 +++-- tests/test_QEventProxy___init__.py | 10 +- ...ventSequence_from_millisecond_durations.py | 237 ++++++------------ ...ntSequence_from_millisecond_pitch_pairs.py | 24 +- ...entSequence_from_tempo_scaled_durations.py | 58 ++--- ...QEventSequence_from_tempo_scaled_leaves.py | 74 ++---- tests/test_QGridContainer___copy__.py | 21 +- tests/test_QGridContainer___eq__.py | 33 ++- tests/test_QGridLeaf___copy__.py | 10 +- tests/test_QGridLeaf___eq__.py | 20 +- tests/test_QGrid___call__.py | 92 +++---- tests/test_QGrid___copy__.py | 4 +- tests/test_QGrid___eq__.py | 74 +++--- tests/test_QGrid_distance.py | 32 ++- tests/test_QGrid_fit_q_events.py | 32 ++- tests/test_QGrid_pickle.py | 18 +- tests/test_QGrid_subdivide_leaf.py | 30 +-- tests/test_QGrid_subdivide_leaves.py | 62 ++--- tests/test_QuantizationJob___call__.py | 50 ++-- tests/test_QuantizationJob___init__.py | 50 ++-- tests/test_QuantizationJob_pickle.py | 50 ++-- tests/test_Quantizer___call__.py | 7 +- tests/test_SerialJobHandler___call__.py | 3 - tests/test_UnweightedSearchTree___call__.py | 50 ++-- tests/test_UnweightedSearchTree___init__.py | 6 +- ...divisible_leaf_indices_and_subdivisions.py | 50 ++-- ...ghtedSearchTree__find_leaf_subdivisions.py | 5 +- ...Tree__generate_all_subdivision_commands.py | 50 ++-- tests/test_WeightedSearchTree___call__.py | 50 ++-- tests/test_WeightedSearchTree___init__.py | 4 +- 51 files changed, 917 insertions(+), 1120 deletions(-) diff --git a/abjadext/nauert/gracehandlers.py b/abjadext/nauert/gracehandlers.py index 6145164..5b6d213 100644 --- a/abjadext/nauert/gracehandlers.py +++ b/abjadext/nauert/gracehandlers.py @@ -491,8 +491,8 @@ class DiscardingGraceHandler(GraceHandler): >>> for pqe in grace_handler.discarded_q_events[0]: ... pqe - PitchedQEvent(offset=Offset((1000, 1)), pitches=(NamedPitch("cs'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((1001, 1)), pitches=(NamedPitch("d'"),), index=None, attachments=()) + PitchedQEvent(offset=Offset((1000, 1)), pitches=(NamedPitch("cs'"),), ...) + PitchedQEvent(offset=Offset((1001, 1)), pitches=(NamedPitch("d'"),), ...) """ diff --git a/abjadext/nauert/qeventproxy.py b/abjadext/nauert/qeventproxy.py index baabe20..135be8e 100644 --- a/abjadext/nauert/qeventproxy.py +++ b/abjadext/nauert/qeventproxy.py @@ -15,7 +15,7 @@ class QEventProxy: >>> q_event = nauert.PitchedQEvent(abjad.Offset(130), [0, 1, 4]) >>> nauert.QEventProxy(q_event, abjad.Offset(0.5)) - QEventProxy(q_event=PitchedQEvent(offset=Offset((130, 1)), pitches=(NamedPitch("c'"), NamedPitch("cs'"), NamedPitch("e'")), index=None, attachments=()), offset=Offset((1, 2))) + QEventProxy(q_event=PitchedQEvent(offset=Offset((130, 1)), pitches=...) Not composer-safe. diff --git a/abjadext/nauert/qevents.py b/abjadext/nauert/qevents.py index f9591e4..67a6a53 100644 --- a/abjadext/nauert/qevents.py +++ b/abjadext/nauert/qevents.py @@ -107,7 +107,7 @@ class PitchedQEvent(QEvent): >>> pitches = [0, 1, 4] >>> nauert.PitchedQEvent(abjad.Offset(1000), pitches) - PitchedQEvent(offset=Offset((1000, 1)), pitches=(NamedPitch("c'"), NamedPitch("cs'"), NamedPitch("e'")), index=None, attachments=()) + PitchedQEvent(offset=Offset((1000, 1)), pitches=...) """ diff --git a/abjadext/nauert/qeventsequence.py b/abjadext/nauert/qeventsequence.py index b38d519..c2383cb 100644 --- a/abjadext/nauert/qeventsequence.py +++ b/abjadext/nauert/qeventsequence.py @@ -6,7 +6,7 @@ import abjad -from .qevents import PitchedQEvent, QEvent, SilentQEvent, TerminalQEvent +from . import qevents as _qevents class QEventSequence: @@ -28,12 +28,12 @@ class QEventSequence: >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((1000, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((1500, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((2750, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((3250, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) """ @@ -44,7 +44,7 @@ class QEventSequence: ### INITIALIZER ### def __init__(self, sequence): - q_event_classes = (PitchedQEvent, SilentQEvent) + q_event_classes = (_qevents.PitchedQEvent, _qevents.SilentQEvent) if sequence is None: self._sequence = () return @@ -53,7 +53,7 @@ def __init__(self, sequence): assert all( isinstance(q_event, q_event_classes) for q_event in sequence[:-1] ) - assert isinstance(sequence[-1], TerminalQEvent) + assert isinstance(sequence[-1], _qevents.TerminalQEvent) offsets = [x.offset for x in sequence] offset_sequence = list(offsets) assert abjad.sequence.is_increasing(offset_sequence, strict=False) @@ -78,14 +78,16 @@ def __eq__(self, argument) -> bool: return False @typing.overload - def __getitem__(self, argument: int) -> QEvent: + def __getitem__(self, argument: int) -> _qevents.QEvent: pass @typing.overload - def __getitem__(self, argument: slice) -> tuple[QEvent, ...]: + def __getitem__(self, argument: slice) -> tuple[_qevents.QEvent, ...]: pass - def __getitem__(self, argument: int | slice) -> QEvent | tuple[QEvent, ...]: + def __getitem__( + self, argument: int | slice + ) -> _qevents.QEvent | tuple[_qevents.QEvent, ...]: """ Gets item or slice identified by `argument`. @@ -101,7 +103,7 @@ def __hash__(self) -> int: """ return super(QEventSequence, self).__hash__() - def __iter__(self) -> typing.Iterator[QEvent]: + def __iter__(self) -> typing.Iterator[_qevents.QEvent]: """ Iterates q-event sequence. """ @@ -135,18 +137,16 @@ def sequence(self) -> tuple: Gets sequence of q-events. >>> durations = (1000, -500, 1250, -500, 750) - >>> sequence = nauert.QEventSequence.from_millisecond_durations( - ... durations) - + >>> sequence = nauert.QEventSequence.from_millisecond_durations(durations) >>> for q_event in sequence.sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((1000, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((1500, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((2750, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((3250, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) """ return self._sequence @@ -167,12 +167,12 @@ def from_millisecond_durations( >>> for q_event in sequence: ... q_event ... - SilentQEvent(offset=Offset((0, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((250, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((750, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((1750, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((3000, 1)), index=None, attachments=()) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + TerminalQEvent(...) """ durations: typing.Sequence[int | float] @@ -184,15 +184,15 @@ def from_millisecond_durations( durations = milliseconds sums = abjad.math.cumulative_sums([abs(_) for _ in durations]) offsets = [abjad.Offset(_) for _ in sums] - q_events: list[QEvent] = [] + q_events: list[_qevents.QEvent] = [] for offset, duration in zip(offsets, durations): - q_event: QEvent + q_event: _qevents.QEvent if duration < 0: - q_event = SilentQEvent(offset) + q_event = _qevents.SilentQEvent(offset) else: - q_event = PitchedQEvent(offset, [0]) + q_event = _qevents.PitchedQEvent(offset, [0]) q_events.append(q_event) - q_event = TerminalQEvent(offsets[-1]) + q_event = _qevents.TerminalQEvent(offsets[-1]) q_events.append(q_event) return class_(q_events) @@ -209,18 +209,18 @@ def from_millisecond_offsets( >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((250, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((750, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((1750, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((3000, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + PitchedQEvent(...) + PitchedQEvent(...) + PitchedQEvent(...) + PitchedQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) """ assert all(isinstance(_, abjad.Offset) for _ in offsets), repr(offsets) - q_events: list[QEvent] = [] - q_events.extend([PitchedQEvent(_, [0]) for _ in offsets[:-1]]) - q_events.append(TerminalQEvent(offsets[-1])) + q_events: list[_qevents.QEvent] = [] + q_events.extend([_qevents.PitchedQEvent(_, [0]) for _ in offsets[:-1]]) + q_events.append(_qevents.TerminalQEvent(offsets[-1])) return class_(q_events) @classmethod @@ -240,12 +240,12 @@ def from_millisecond_pitch_attachment_tuples( >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=('foo',)) - SilentQEvent(offset=Offset((250, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((750, 1)), pitches=(NamedPitch("d'"), NamedPitch("ef'")), index=None, attachments=()) - SilentQEvent(offset=Offset((1750, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((3000, 1)), pitches=(NamedPitch("cs'"),), index=None, attachments=('foobar', 'foo')) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) """ assert isinstance(tuples, collections.abc.Iterable) @@ -276,10 +276,12 @@ def from_millisecond_pitch_attachment_tuples( offsets = [abjad.Offset(_) for _ in offsets] # build QEvents q_events = [ - QEvent.from_offset_pitches_attachments(offset, pitches, attachments) + _qevents.QEvent.from_offset_pitches_attachments( + offset, pitches, attachments + ) for offset, (_, pitches, attachments) in zip(offsets, groups) ] - q_events.append(TerminalQEvent(offsets[-1])) + q_events.append(_qevents.TerminalQEvent(offsets[-1])) return class_(q_events) @classmethod @@ -296,12 +298,12 @@ def from_millisecond_pitch_pairs( >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((250, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((750, 1)), pitches=(NamedPitch("d'"), NamedPitch("ef'")), index=None, attachments=()) - SilentQEvent(offset=Offset((1750, 1)), index=None, attachments=()) - PitchedQEvent(offset=Offset((3000, 1)), pitches=(NamedPitch("cs'"),), index=None, attachments=()) - TerminalQEvent(offset=Offset((4000, 1)), index=None, attachments=()) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) """ assert isinstance(pairs, collections.abc.Iterable) @@ -337,11 +339,11 @@ def from_tempo_scaled_durations( >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((10000, 29)), index=None, attachments=()) - PitchedQEvent(offset=Offset((17500, 29)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - SilentQEvent(offset=Offset((20000, 29)), index=None, attachments=()) - TerminalQEvent(offset=Offset((40000, 29)), index=None, attachments=()) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + TerminalQEvent(...) """ assert all(isinstance(_, abjad.Duration) for _ in durations), repr(durations) @@ -354,16 +356,16 @@ def from_tempo_scaled_durations( for offset, duration in zip(offsets, durations): offset = abjad.Offset(offset) assert isinstance(duration, abjad.Duration) - q_event: QEvent + q_event: _qevents.QEvent # negative duration indicates silence if duration < 0: - q_event = SilentQEvent(offset) + q_event = _qevents.SilentQEvent(offset) # otherwise use middle C else: - q_event = PitchedQEvent(offset, [0]) + q_event = _qevents.PitchedQEvent(offset, [0]) q_events.append(q_event) - # insert terminating silence QEvent - q_events.append(TerminalQEvent(offsets[-1])) + # insert terminating silence _qevents.QEvent + q_events.append(_qevents.TerminalQEvent(offsets[-1])) return class_(q_events) @classmethod @@ -377,11 +379,11 @@ def from_tempo_scaled_leaves(class_, leaves, tempo=None) -> "QEventSequence": >>> for q_event in sequence: ... q_event ... - PitchedQEvent(offset=Offset((0, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()) - PitchedQEvent(offset=Offset((2500, 3)), pitches=(NamedPitch("d'"), NamedPitch("fs'")), index=None, attachments=()) - SilentQEvent(offset=Offset((4375, 3)), index=None, attachments=()) - PitchedQEvent(offset=Offset((5000, 3)), pitches=(NamedPitch("gqs'"),), index=None, attachments=()) - TerminalQEvent(offset=Offset((10000, 3)), index=None, attachments=()) + PitchedQEvent(...) + PitchedQEvent(...) + SilentQEvent(...) + PitchedQEvent(...) + TerminalQEvent(...) If ``tempo`` is ``None``, all leaves in ``leaves`` must have an effective, non-imprecise tempo. The millisecond-duration of each leaf diff --git a/abjadext/nauert/qgrid.py b/abjadext/nauert/qgrid.py index f504cbb..7dce566 100644 --- a/abjadext/nauert/qgrid.py +++ b/abjadext/nauert/qgrid.py @@ -6,7 +6,7 @@ import uqbar.containers import uqbar.graphs -from .qeventproxy import QEventProxy +from . import qeventproxy as _qeventproxy class QGridLeaf(abjad.rhythmtrees.RhythmTreeNode, uqbar.containers.UniqueTreeNode): @@ -26,14 +26,14 @@ class QGridLeaf(abjad.rhythmtrees.RhythmTreeNode, uqbar.containers.UniqueTreeNod def __init__( self, preprolated_duration: abjad.typings.Duration = abjad.Duration(1), - q_event_proxies: typing.Sequence[QEventProxy] = (), + q_event_proxies: typing.Sequence[_qeventproxy.QEventProxy] = (), is_divisible: bool = True, ) -> None: assert isinstance(preprolated_duration, abjad.Duration), repr( preprolated_duration ) assert q_event_proxies is not None, repr(q_event_proxies) - assert all(isinstance(x, QEventProxy) for x in q_event_proxies) + assert all(isinstance(x, _qeventproxy.QEventProxy) for x in q_event_proxies) assert isinstance(is_divisible, bool), repr(is_divisible) uqbar.containers.UniqueTreeNode.__init__(self) abjad.rhythmtrees.RhythmTreeNode.__init__(self, preprolated_duration.pair) @@ -94,14 +94,14 @@ def is_divisible(self, argument): self._is_divisible = bool(argument) @property - def preceding_q_event_proxies(self) -> list[QEventProxy]: + def preceding_q_event_proxies(self) -> list[_qeventproxy.QEventProxy]: """ Gets preceding q-event proxies of q-grid leaf. """ return [x for x in self._q_event_proxies if x.offset < self.start_offset] @property - def q_event_proxies(self) -> list[QEventProxy]: + def q_event_proxies(self) -> list[_qeventproxy.QEventProxy]: """ Gets q-event proxies of q-grid leaf. """ @@ -117,7 +117,7 @@ def rtm_format(self) -> str: return str(numerator) @property - def succeeding_q_event_proxies(self) -> list[QEventProxy]: + def succeeding_q_event_proxies(self) -> list[_qeventproxy.QEventProxy]: """ Gets succeeding q-event proxies of q-grid leaf. """ @@ -163,13 +163,6 @@ class QGrid: Rhythm-tree-based model for how millisecond attack points collapse onto the offsets generated by a nested rhythmic structure. - >>> q_grid = nauert.QGrid() - - .. container:: example - - >>> q_grid - QGrid(root_node=QGridLeaf((1, 1), q_event_proxies=[], is_divisible=True), next_downbeat=QGridLeaf((1, 1), q_event_proxies=[], is_divisible=True)) - .. container:: example ``QGrids`` model not only the internal nodes of the nesting structure, @@ -180,6 +173,7 @@ class QGrid: ``QEventProxies`` can be "loaded in" to the node contained by the ``QGrid`` closest to their virtual offset: + >>> q_grid = nauert.QGrid() >>> q_event_a = nauert.PitchedQEvent(abjad.Offset(250), [0]) >>> q_event_b = nauert.PitchedQEvent(abjad.Offset(750), [1]) >>> proxy_a = nauert.QEventProxy(q_event_a, abjad.Offset(0.25)) @@ -189,12 +183,12 @@ class QGrid: >>> for q_event_proxy in q_grid.root_node.q_event_proxies: ... q_event_proxy ... - QEventProxy(q_event=PitchedQEvent(offset=Offset((250, 1)), pitches=(NamedPitch("c'"),), index=None, attachments=()), offset=Offset((1, 4))) + QEventProxy(...) >>> for q_event_proxy in q_grid.next_downbeat.q_event_proxies: ... q_event_proxy ... - QEventProxy(q_event=PitchedQEvent(offset=Offset((750, 1)), pitches=(NamedPitch("cs'"),), index=None, attachments=()), offset=Offset((3, 4))) + QEventProxy(...) Used internally by the ``quantize`` function. """ @@ -410,12 +404,14 @@ def rtm_format(self) -> str: ### PUBLIC METHODS ### - def fit_q_events(self, q_event_proxies: typing.Sequence[QEventProxy]) -> None: + def fit_q_events( + self, q_event_proxies: typing.Sequence[_qeventproxy.QEventProxy] + ) -> None: """ Fits each ``QEventProxy`` in ``q_event_proxies`` onto the contained ``QGridLeaf`` whose offset is nearest. """ - assert all(isinstance(x, QEventProxy) for x in q_event_proxies) + assert all(isinstance(x, _qeventproxy.QEventProxy) for x in q_event_proxies) leaves, offsets = self.leaves, self.offsets for q_event_proxy in q_event_proxies: idx = bisect.bisect_left(offsets, q_event_proxy.offset) @@ -466,7 +462,7 @@ def subdivide_leaf( self, leaf: QGridLeaf, subdivisions: typing.Sequence[abjad.typings.Duration | int], - ) -> list[QEventProxy]: + ) -> list[_qeventproxy.QEventProxy]: """ Replaces the ``QGridLeaf`` ``leaf`` contained in a ``QGrid`` by a ``QGridContainer`` containing ``QGridLeaves`` with durations equal to @@ -497,7 +493,7 @@ def subdivide_leaf( def subdivide_leaves( self, pairs: typing.Sequence[tuple[int, tuple[int, int]]] - ) -> list[QEventProxy]: + ) -> list[_qeventproxy.QEventProxy]: r""" Given a sequence of leaf-index:subdivision-ratio pairs ``pairs``, subdivide the ``QGridLeaves`` described by the indices into diff --git a/abjadext/nauert/qschemaitems.py b/abjadext/nauert/qschemaitems.py index e218a39..30c967c 100644 --- a/abjadext/nauert/qschemaitems.py +++ b/abjadext/nauert/qschemaitems.py @@ -3,7 +3,7 @@ import abjad -from .searchtrees import SearchTree +from . import searchtrees as _searchtrees class QSchemaItem(abc.ABC): @@ -22,11 +22,11 @@ class QSchemaItem(abc.ABC): @abc.abstractmethod def __init__( self, - search_tree: SearchTree | None = None, + search_tree: _searchtrees.SearchTree | None = None, tempo: abjad.MetronomeMark | None = None, ) -> None: if search_tree is not None: - assert isinstance(search_tree, SearchTree) + assert isinstance(search_tree, _searchtrees.SearchTree) self._search_tree = search_tree if tempo is not None: assert isinstance(tempo, abjad.MetronomeMark), repr(tempo) @@ -36,7 +36,7 @@ def __init__( ### PUBLIC PROPERTIES ### @property - def search_tree(self) -> typing.Optional[SearchTree]: + def search_tree(self) -> typing.Optional[_searchtrees.SearchTree]: """ The optionally defined search tree. """ @@ -54,11 +54,13 @@ class BeatwiseQSchemaItem(QSchemaItem): """ Beatwise q-schema item. - Represents a change of state in the timeline of an unmetered quantization - process. + .. container:: example + + Represents a change of state in the timeline of an unmetered + quantization process: - >>> nauert.BeatwiseQSchemaItem() - BeatwiseQSchemaItem(beatspan=None, search_tree=None, tempo=None) + >>> nauert.BeatwiseQSchemaItem() + BeatwiseQSchemaItem(beatspan=None, search_tree=None, tempo=None) .. container:: example @@ -66,7 +68,7 @@ class BeatwiseQSchemaItem(QSchemaItem): >>> metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 60) >>> nauert.BeatwiseQSchemaItem(tempo=metronome_mark) - BeatwiseQSchemaItem(beatspan=None, search_tree=None, tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) + BeatwiseQSchemaItem(...) .. container:: example @@ -86,7 +88,7 @@ class BeatwiseQSchemaItem(QSchemaItem): def __init__( self, beatspan: abjad.Duration | None = None, - search_tree: SearchTree | None = None, + search_tree: _searchtrees.SearchTree | None = None, tempo: abjad.MetronomeMark | None = None, ) -> None: if beatspan is not None: @@ -116,7 +118,7 @@ def beatspan(self) -> typing.Optional[abjad.Duration]: class MeasurewiseQSchemaItem(QSchemaItem): - """ + r""" Measurewise q-schema item. Represents a change of state in the timeline of a metered quantization process. @@ -128,16 +130,17 @@ class MeasurewiseQSchemaItem(QSchemaItem): Defines a change in tempo: >>> metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 60) - >>> nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) - MeasurewiseQSchemaItem(search_tree=None, tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False), time_signature=None, use_full_measure=None) + >>> mark = nauert.MeasurewiseQSchemaItem(tempo=metronome_mark).tempo + >>> abjad.lilypond(mark) + '\\tempo 4=60' .. container:: example Defines a change in time signature: >>> time_signature = abjad.TimeSignature((6, 8)) - >>> nauert.MeasurewiseQSchemaItem(time_signature=time_signature) - MeasurewiseQSchemaItem(search_tree=None, tempo=None, time_signature=TimeSignature(pair=(6, 8), hide=False, partial=None), use_full_measure=None) + >>> nauert.MeasurewiseQSchemaItem(time_signature=time_signature).time_signature + TimeSignature(pair=(6, 8), hide=False, partial=None) .. container:: example @@ -157,7 +160,7 @@ class MeasurewiseQSchemaItem(QSchemaItem): def __init__( self, - search_tree: SearchTree | None = None, + search_tree: _searchtrees.SearchTree | None = None, tempo: abjad.MetronomeMark | None = None, time_signature: abjad.TimeSignature | None = None, use_full_measure: bool | None = None, diff --git a/abjadext/nauert/qschemas.py b/abjadext/nauert/qschemas.py index cfbcf0d..8b71f3b 100644 --- a/abjadext/nauert/qschemas.py +++ b/abjadext/nauert/qschemas.py @@ -174,13 +174,8 @@ class BeatwiseQSchema(QSchema): >>> q_schema = nauert.BeatwiseQSchema() - .. container:: example - Without arguments, it uses smart defaults: - >>> q_schema - BeatwiseQSchema(beatspan=Duration(1, 4), search_tree=UnweightedSearchTree(definition={2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, 3: {2: {2: None}, 3: None, 5: None}, 5: {2: None, 3: None}, 7: {2: None}, 11: None, 13: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) - .. container:: example Each time-step in a ``BeatwiseQSchema`` is composed of three settings: @@ -212,7 +207,7 @@ class BeatwiseQSchema(QSchema): ... beatspan: 5/16 search_tree: UnweightedSearchTree(definition={7: None}) - tempo: MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=54, textual_indication=None, custom_markup=None, decimal=False, hide=False) + tempo: MetronomeMark(...) >>> index = 1000 >>> for key, value in sorted(q_schema[index].items()): @@ -220,7 +215,7 @@ class BeatwiseQSchema(QSchema): ... beatspan: 5/16 search_tree: UnweightedSearchTree(definition={7: None}) - tempo: MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=54, textual_indication=None, custom_markup=None, decimal=False, hide=False) + tempo: MetronomeMark(...) .. container:: example @@ -266,11 +261,24 @@ class BeatwiseQSchema(QSchema): >>> q_schema = nauert.BeatwiseQSchema(settings) - >>> q_schema[0]["search_tree"] - UnweightedSearchTree(definition={2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, 3: {2: {2: None}, 3: None, 5: None}, 5: {2: None, 3: None}, 7: {2: None}, 11: None, 13: None}) - - >>> q_schema[1]["search_tree"] - UnweightedSearchTree(definition={2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, 3: {2: {2: None}, 3: None, 5: None}, 5: {2: None, 3: None}, 7: {2: None}, 11: None, 13: None}) + >>> import pprint + >>> ust = q_schema[0]["search_tree"] + >>> pprint.pprint(ust.definition) + {2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, + 3: {2: {2: None}, 3: None, 5: None}, + 5: {2: None, 3: None}, + 7: {2: None}, + 11: None, + 13: None} + + >>> ust = q_schema[1]["search_tree"] + >>> pprint.pprint(ust.definition) + {2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, + 3: {2: {2: None}, 3: None, 5: None}, + 5: {2: None, 3: None}, + 7: {2: None}, + 11: None, + 13: None} >>> q_schema[2]["search_tree"] UnweightedSearchTree(definition={2: None}) @@ -365,8 +373,14 @@ class MeasurewiseQSchema(QSchema): Without arguments, it uses smart defaults: - >>> q_schema - MeasurewiseQSchema(search_tree=UnweightedSearchTree(definition={2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, 3: {2: {2: None}, 3: None, 5: None}, 5: {2: None, 3: None}, 7: {2: None}, 11: None, 13: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False), time_signature=TimeSignature(pair=(4, 4), hide=False, partial=None), use_full_measure=False) + >>> import pprint + >>> pprint.pprint(q_schema.search_tree.definition) + {2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, + 3: {2: {2: None}, 3: None, 5: None}, + 5: {2: None, 3: None}, + 7: {2: None}, + 11: None, + 13: None} .. container:: example @@ -414,7 +428,7 @@ class MeasurewiseQSchema(QSchema): ... print("{}:".format(key), value) ... search_tree: UnweightedSearchTree(definition={7: None}) - tempo: MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=54, textual_indication=None, custom_markup=None, decimal=False, hide=False) + tempo: MetronomeMark(...) time_signature: TimeSignature(pair=(3, 4), hide=False, partial=None) use_full_measure: True @@ -423,7 +437,7 @@ class MeasurewiseQSchema(QSchema): ... print("{}:".format(key), value) ... search_tree: UnweightedSearchTree(definition={7: None}) - tempo: MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=54, textual_indication=None, custom_markup=None, decimal=False, hide=False) + tempo: MetronomeMark(...) time_signature: TimeSignature(pair=(3, 4), hide=False, partial=None) use_full_measure: True diff --git a/abjadext/nauert/qtargetitems.py b/abjadext/nauert/qtargetitems.py index cf36b9d..c75a420 100644 --- a/abjadext/nauert/qtargetitems.py +++ b/abjadext/nauert/qtargetitems.py @@ -3,11 +3,11 @@ import abjad -from .qeventproxy import QEventProxy -from .qevents import QEvent -from .qgrid import QGrid -from .quantizationjob import QuantizationJob -from .searchtrees import SearchTree, UnweightedSearchTree +from . import qeventproxy as _qeventproxy +from . import qevents as _qevents +from . import qgrid as _qgrid +from . import quantizationjob as _quantizationjob +from . import searchtrees as _searchtrees class QTargetItem(abc.ABC): @@ -36,7 +36,6 @@ class QTargetBeat(QTargetItem): >>> offset_in_ms = abjad.Offset(1500) >>> search_tree = nauert.UnweightedSearchTree({3: None}) >>> tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 56) - >>> q_target_beat = nauert.QTargetBeat( ... beatspan=beatspan, ... offset_in_ms=offset_in_ms, @@ -44,9 +43,6 @@ class QTargetBeat(QTargetItem): ... tempo=tempo, ... ) - >>> q_target_beat - QTargetBeat(beatspan=Duration(1, 8), offset_in_ms=Offset((1500, 1)), search_tree=UnweightedSearchTree(definition={3: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=56, textual_indication=None, custom_markup=None, decimal=False, hide=False)) - Not composer-safe. Used internally by the ``quantize`` function. @@ -71,44 +67,48 @@ def __init__( self, beatspan: abjad.Duration = abjad.Duration(0), offset_in_ms: abjad.Offset = abjad.Offset(0), - search_tree: SearchTree | None = None, + search_tree: _searchtrees.SearchTree | None = None, tempo: abjad.MetronomeMark = abjad.MetronomeMark(abjad.Duration(1, 4), 60), ): assert isinstance(beatspan, abjad.Duration), repr(beatspan) assert isinstance(offset_in_ms, abjad.Offset), repr(offset_in_ms) if search_tree is None: - search_tree = UnweightedSearchTree() - assert isinstance(search_tree, SearchTree) + search_tree = _searchtrees.UnweightedSearchTree() + assert isinstance(search_tree, _searchtrees.SearchTree) assert isinstance(tempo, abjad.MetronomeMark), repr(tempo) assert not tempo.is_imprecise - q_events: list[QEvent] = [] - q_grids: tuple[QGrid, ...] = () + q_events: list[_qevents.QEvent] = [] + q_grids: tuple[_qgrid.QGrid, ...] = () self._beatspan = beatspan self._offset_in_ms = offset_in_ms self._q_events = q_events - self._q_grid: QGrid | None = None + self._q_grid: _qgrid.QGrid | None = None self._q_grids = q_grids self._search_tree = search_tree self._tempo = tempo ### SPECIAL METHODS ### - def __call__(self, job_id: int) -> typing.Optional[QuantizationJob]: + def __call__( + self, job_id: int + ) -> typing.Optional[_quantizationjob.QuantizationJob]: """ Calls q-target beat. """ if not self.q_events: return None - assert all(isinstance(x, QEvent) for x in self.q_events) + assert all(isinstance(x, _qevents.QEvent) for x in self.q_events) q_event_proxies = [] for q_event in self.q_events: - q_event_proxy = QEventProxy( + q_event_proxy = _qeventproxy.QEventProxy( q_event, self.offset_in_ms, self.offset_in_ms + self.duration_in_ms, ) q_event_proxies.append(q_event_proxy) - return QuantizationJob(job_id, self.search_tree, q_event_proxies) + return _quantizationjob.QuantizationJob( + job_id, self.search_tree, q_event_proxies + ) def __repr__(self) -> str: """ @@ -191,7 +191,7 @@ def offset_in_ms(self) -> abjad.Offset: return self._offset_in_ms @property - def q_events(self) -> list[QEvent]: + def q_events(self) -> list[_qevents.QEvent]: """ A list for storing ``QEventProxy`` instances. @@ -200,7 +200,7 @@ def q_events(self) -> list[QEvent]: return self._q_events @property - def q_grid(self) -> typing.Optional[QGrid]: + def q_grid(self) -> typing.Optional[_qgrid.QGrid]: """ The ``QGrid`` instance selected by a ``Heuristic``. @@ -209,7 +209,7 @@ def q_grid(self) -> typing.Optional[QGrid]: return self._q_grid @property - def q_grids(self) -> tuple[QGrid, ...]: + def q_grids(self) -> tuple[_qgrid.QGrid, ...]: """ A tuple of ``QGrids`` generated by a ``QuantizationJob``. @@ -218,7 +218,9 @@ def q_grids(self) -> tuple[QGrid, ...]: return self._q_grids @property - def search_tree(self) -> SearchTree | UnweightedSearchTree: + def search_tree( + self, + ) -> _searchtrees.SearchTree | _searchtrees.UnweightedSearchTree: """ Search tree of q-target beat. @@ -242,23 +244,21 @@ def search_tree(self) -> SearchTree | UnweightedSearchTree: @property def tempo(self) -> abjad.MetronomeMark: - """ + r""" Gets tempo of q-target beat. >>> beatspan = abjad.Duration(1, 8) >>> offset_in_ms = abjad.Offset(1500) >>> search_tree = nauert.UnweightedSearchTree({3: None}) >>> tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 56) - >>> q_target_beat = nauert.QTargetBeat( ... beatspan=beatspan, ... offset_in_ms=offset_in_ms, ... search_tree=search_tree, ... tempo=tempo, ... ) - - >>> q_target_beat.tempo - MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=56, textual_indication=None, custom_markup=None, decimal=False, hide=False) + >>> abjad.lilypond(q_target_beat.tempo) + '\\tempo 4=56' """ return self._tempo @@ -275,7 +275,6 @@ class QTargetMeasure(QTargetItem): >>> search_tree = nauert.UnweightedSearchTree({2: None}) >>> tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 60) >>> time_signature = abjad.TimeSignature((4, 4)) - >>> q_target_measure = nauert.QTargetMeasure( ... offset_in_ms=abjad.Offset(1000), ... search_tree=search_tree, @@ -283,9 +282,6 @@ class QTargetMeasure(QTargetItem): ... time_signature=time_signature, ... ) - >>> q_target_measure - QTargetMeasure(offset_in_ms=Offset((1000, 1)), search_tree=UnweightedSearchTree(definition={2: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False), use_full_measure=False) - .. container:: example ``QTargetMeasures`` group ``QTargetBeats``: @@ -335,15 +331,15 @@ class QTargetMeasure(QTargetItem): def __init__( self, offset_in_ms: abjad.Offset = abjad.Offset(0), - search_tree: SearchTree | None = None, + search_tree: _searchtrees.SearchTree | None = None, time_signature: abjad.TimeSignature = abjad.TimeSignature((4, 4)), tempo: abjad.MetronomeMark = abjad.MetronomeMark(abjad.Duration(4, 4)), use_full_measure: bool = False, ): assert isinstance(offset_in_ms, abjad.Offset), repr(offset_in_ms) if search_tree is None: - search_tree = UnweightedSearchTree() - assert isinstance(search_tree, SearchTree) + search_tree = _searchtrees.UnweightedSearchTree() + assert isinstance(search_tree, _searchtrees.SearchTree) assert isinstance(time_signature, abjad.TimeSignature), repr(time_signature) assert isinstance(tempo, abjad.MetronomeMark), repr(tempo) assert not tempo.is_imprecise @@ -411,12 +407,12 @@ def beats(self) -> tuple: ... ) >>> for q_target_beat in q_target_measure.beats: - ... q_target_beat + ... q_target_beat.offset_in_ms ... - QTargetBeat(beatspan=Duration(1, 4), offset_in_ms=Offset((1000, 1)), search_tree=UnweightedSearchTree(definition={2: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) - QTargetBeat(beatspan=Duration(1, 4), offset_in_ms=Offset((2000, 1)), search_tree=UnweightedSearchTree(definition={2: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) - QTargetBeat(beatspan=Duration(1, 4), offset_in_ms=Offset((3000, 1)), search_tree=UnweightedSearchTree(definition={2: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) - QTargetBeat(beatspan=Duration(1, 4), offset_in_ms=Offset((4000, 1)), search_tree=UnweightedSearchTree(definition={2: None}), tempo=MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False)) + Offset((1000, 1)) + Offset((2000, 1)) + Offset((3000, 1)) + Offset((4000, 1)) """ return self._beats @@ -470,7 +466,7 @@ def offset_in_ms(self) -> abjad.Offset: return self._offset_in_ms @property - def search_tree(self) -> SearchTree: + def search_tree(self) -> _searchtrees.SearchTree: """ Gets the search tree of ``QTargetMeasure``: @@ -495,7 +491,7 @@ def search_tree(self) -> SearchTree: @property def tempo(self) -> abjad.MetronomeMark: - """ + r""" Gets the tempo of ``QTargetMeasure``: .. container:: example @@ -511,8 +507,8 @@ def tempo(self) -> abjad.MetronomeMark: ... time_signature=time_signature, ... ) - >>> q_target_measure.tempo - MetronomeMark(reference_duration=Duration(1, 4), units_per_minute=60, textual_indication=None, custom_markup=None, decimal=False, hide=False) + >>> abjad.lilypond(q_target_measure.tempo) + '\\tempo 4=60' """ return self._tempo diff --git a/abjadext/nauert/qtargets.py b/abjadext/nauert/qtargets.py index 3c402f5..25a2aa0 100644 --- a/abjadext/nauert/qtargets.py +++ b/abjadext/nauert/qtargets.py @@ -5,18 +5,14 @@ import abjad -from .attackpointoptimizers import ( - AttackPointOptimizer, - MeasurewiseAttackPointOptimizer, - NaiveAttackPointOptimizer, -) -from .gracehandlers import ConcatenatingGraceHandler, GraceHandler -from .heuristics import DistanceHeuristic, Heuristic -from .jobhandlers import JobHandler, SerialJobHandler -from .qeventproxy import QEventProxy -from .qevents import TerminalQEvent -from .qeventsequence import QEventSequence -from .qtargetitems import QTargetBeat, QTargetItem, QTargetMeasure +from . import attackpointoptimizers as _attackpointoptimizers +from . import gracehandlers as _gracehandlers +from . import heuristics as _heuristics +from . import jobhandlers as _jobhandlers +from . import qeventproxy as _qeventproxy +from . import qevents as _qevents +from . import qeventsequence as _qeventsequence +from . import qtargetitems as _qtargetitems class QTarget(abc.ABC): @@ -40,10 +36,10 @@ class QTarget(abc.ABC): ### INITIALIZATION ### - def __init__(self, items: typing.Sequence[QTargetItem] | None = None): + def __init__(self, items: typing.Sequence[_qtargetitems.QTargetItem] | None = None): items = [] if items is None else items assert all(isinstance(x, self.item_class) for x in items) - self._items: typing.Sequence[QTargetItem] = () + self._items: typing.Sequence[_qtargetitems.QTargetItem] = () if len(items) > 0: self._items = tuple(sorted(items, key=lambda x: x.offset_in_ms)) @@ -52,31 +48,36 @@ def __init__(self, items: typing.Sequence[QTargetItem] | None = None): # TODO: typehint def __call__( self, - q_event_sequence: QEventSequence, - grace_handler: GraceHandler | None = None, - heuristic: Heuristic | None = None, - job_handler: JobHandler | None = None, - attack_point_optimizer: AttackPointOptimizer | None = None, + q_event_sequence: _qeventsequence.QEventSequence, + grace_handler: _gracehandlers.GraceHandler | None = None, + heuristic: _heuristics.Heuristic | None = None, + job_handler: _jobhandlers.JobHandler | None = None, + attack_point_optimizer: ( + _attackpointoptimizers.AttackPointOptimizer | None + ) = None, attach_tempos: bool = True, ): """ Calls q-target. """ - assert isinstance(q_event_sequence, QEventSequence) + assert isinstance(q_event_sequence, _qeventsequence.QEventSequence) if grace_handler is None: - grace_handler = ConcatenatingGraceHandler() - assert isinstance(grace_handler, GraceHandler) + grace_handler = _gracehandlers.ConcatenatingGraceHandler() + assert isinstance(grace_handler, _gracehandlers.GraceHandler) if heuristic is None: - heuristic = DistanceHeuristic() - assert isinstance(heuristic, Heuristic) + heuristic = _heuristics.DistanceHeuristic() + assert isinstance(heuristic, _heuristics.Heuristic) if job_handler is None: - job_handler = SerialJobHandler() - assert isinstance(job_handler, JobHandler) + job_handler = _jobhandlers.SerialJobHandler() + assert isinstance(job_handler, _jobhandlers.JobHandler) if attack_point_optimizer is None: - attack_point_optimizer = NaiveAttackPointOptimizer() - assert isinstance(attack_point_optimizer, AttackPointOptimizer) + attack_point_optimizer = _attackpointoptimizers.NaiveAttackPointOptimizer() + assert isinstance( + attack_point_optimizer, _attackpointoptimizers.AttackPointOptimizer + ) if isinstance(self, BeatwiseQTarget) and isinstance( - attack_point_optimizer, MeasurewiseAttackPointOptimizer + attack_point_optimizer, + _attackpointoptimizers.MeasurewiseAttackPointOptimizer, ): message = "{} is not supposed to be used together with {}.".format( self.__class__.__name__, attack_point_optimizer.__class__.__name__ @@ -124,14 +125,16 @@ def __call__( @abc.abstractmethod def _notate( self, - grace_handler: GraceHandler, - attack_point_optimizer: AttackPointOptimizer, + grace_handler: _gracehandlers.GraceHandler, + attack_point_optimizer: _attackpointoptimizers.AttackPointOptimizer, attach_tempos: bool = True, ) -> abjad.Voice: raise NotImplementedError def _notate_leaves( - self, grace_handler: GraceHandler, voice: abjad.Voice | None = None + self, + grace_handler: _gracehandlers.GraceHandler, + voice: abjad.Voice | None = None, ): for leaf in abjad.iterate.leaves(voice): if leaf._has_indicator(dict): @@ -188,7 +191,7 @@ def _regroup_q_grid_with_unnecessary_divisions(self): for beat in self.beats: beat.q_grid.regroup_leaves_with_unencessary_divisions() - def _shift_downbeat_q_events_to_next_q_grid(self) -> list[QEventProxy]: + def _shift_downbeat_q_events_to_next_q_grid(self) -> list[_qeventproxy.QEventProxy]: beats = self.beats assert beats[-1].q_grid is not None for one, two in abjad.sequence.nwise(beats): @@ -199,13 +202,13 @@ def _shift_downbeat_q_events_to_next_q_grid(self) -> list[QEventProxy]: return [ proxy for proxy in beats[-1].q_grid.next_downbeat.q_event_proxies - if not isinstance(proxy.q_event, TerminalQEvent) + if not isinstance(proxy.q_event, _qevents.TerminalQEvent) ] ### PUBLIC PROPERTIES ### @abc.abstractproperty - def beats(self) -> tuple[QTargetBeat, ...]: + def beats(self) -> tuple[_qtargetitems.QTargetBeat, ...]: """ Gets beats of q-target. """ @@ -249,23 +252,23 @@ class BeatwiseQTarget(QTarget): ### INITIALIZATION ### - def __init__(self, items: typing.Sequence[QTargetBeat] | None = None): + def __init__(self, items: typing.Sequence[_qtargetitems.QTargetBeat] | None = None): items = [] if items is None else items - self._items: typing.Sequence[QTargetBeat] + self._items: typing.Sequence[_qtargetitems.QTargetBeat] super().__init__(items) ### PRIVATE METHODS ### def _notate( self, - grace_handler: GraceHandler, - attack_point_optimizer: AttackPointOptimizer, + grace_handler: _gracehandlers.GraceHandler, + attack_point_optimizer: _attackpointoptimizers.AttackPointOptimizer, attach_tempos: bool = True, ) -> abjad.Voice: voice = abjad.Voice() # generate the first beat = self._items[0] - assert isinstance(beat, QTargetBeat) and beat.q_grid is not None + assert isinstance(beat, _qtargetitems.QTargetBeat) and beat.q_grid is not None components = beat.q_grid(beat.beatspan) voice.extend(components) if attach_tempos: @@ -295,18 +298,18 @@ def _notate( ### PUBLIC PROPERTIES ### @property - def beats(self) -> tuple[QTargetBeat, ...]: + def beats(self) -> tuple[_qtargetitems.QTargetBeat, ...]: """ Gets beats of beatwise q-target. """ return tuple(self._items) @property - def item_class(self) -> type[QTargetBeat]: + def item_class(self) -> type[_qtargetitems.QTargetBeat]: """ Gets item class of beatwise q-target. """ - return QTargetBeat + return _qtargetitems.QTargetBeat class MeasurewiseQTarget(QTarget): @@ -324,21 +327,23 @@ class MeasurewiseQTarget(QTarget): ### INITIALIZATION ### - def __init__(self, items: typing.Sequence[QTargetMeasure] | None = None): + def __init__( + self, items: typing.Sequence[_qtargetitems.QTargetMeasure] | None = None + ): super().__init__(items) ### PRIVATE METHODS ### def _notate( self, - grace_handler: GraceHandler, - attack_point_optimizer: AttackPointOptimizer, + grace_handler: _gracehandlers.GraceHandler, + attack_point_optimizer: _attackpointoptimizers.AttackPointOptimizer, attach_tempos: bool = True, ) -> abjad.Voice: voice = abjad.Voice() # generate the first q_target_measure = self._items[0] - assert isinstance(q_target_measure, QTargetMeasure) + assert isinstance(q_target_measure, _qtargetitems.QTargetMeasure) time_signature = q_target_measure.time_signature measure = abjad.Container() for beat in q_target_measure.beats: @@ -375,7 +380,10 @@ def _notate( self._notate_leaves(grace_handler=grace_handler, voice=voice) # partition logical ties in each measure for index, measure in enumerate(voice): - if isinstance(attack_point_optimizer, MeasurewiseAttackPointOptimizer): + if isinstance( + attack_point_optimizer, + _attackpointoptimizers.MeasurewiseAttackPointOptimizer, + ): # then we need to pass the time signature of each measure attack_point_optimizer(measure, self.items[index].time_signature) else: @@ -385,15 +393,15 @@ def _notate( ### PUBLIC PROPERTIES ### @property - def beats(self) -> tuple[QTargetBeat, ...]: + def beats(self) -> tuple[_qtargetitems.QTargetBeat, ...]: """ Gets beats of measurewise q-target. """ return tuple([beat for item in self.items for beat in item.beats]) @property - def item_class(self) -> type[QTargetMeasure]: + def item_class(self) -> type[_qtargetitems.QTargetMeasure]: """ Gets item class of measurewise q-target. """ - return QTargetMeasure + return _qtargetitems.QTargetMeasure diff --git a/abjadext/nauert/quantizationjob.py b/abjadext/nauert/quantizationjob.py index c01bc3e..be7c800 100644 --- a/abjadext/nauert/quantizationjob.py +++ b/abjadext/nauert/quantizationjob.py @@ -1,8 +1,8 @@ import typing -from .qeventproxy import QEventProxy -from .qgrid import QGrid -from .searchtrees import SearchTree, UnweightedSearchTree +from . import qeventproxy as _qeventproxy +from . import qgrid as _qgrid +from . import searchtrees as _searchtrees class QuantizationJob: @@ -55,22 +55,22 @@ class QuantizationJob: def __init__( self, job_id: int = 1, - search_tree: SearchTree | None = None, - q_event_proxies: typing.Sequence[QEventProxy] | None = None, - q_grids: typing.Sequence[QGrid] | None = None, + search_tree: _searchtrees.SearchTree | None = None, + q_event_proxies: typing.Sequence[_qeventproxy.QEventProxy] | None = None, + q_grids: typing.Sequence[_qgrid.QGrid] | None = None, ): - search_tree = search_tree or UnweightedSearchTree() + search_tree = search_tree or _searchtrees.UnweightedSearchTree() q_event_proxies = q_event_proxies or [] - assert isinstance(search_tree, SearchTree) - assert all(isinstance(x, QEventProxy) for x in q_event_proxies) + assert isinstance(search_tree, _searchtrees.SearchTree) + assert all(isinstance(x, _qeventproxy.QEventProxy) for x in q_event_proxies) self._job_id = job_id self._search_tree = search_tree self._q_event_proxies = tuple(q_event_proxies) - self._q_grids: tuple[QGrid, ...] + self._q_grids: tuple[_qgrid.QGrid, ...] if q_grids is None: self._q_grids = () else: - assert all(isinstance(x, QGrid) for x in q_grids) + assert all(isinstance(x, _qgrid.QGrid) for x in q_grids) self._q_grids = tuple(q_grids) ### SPECIAL METHODS ### @@ -81,7 +81,7 @@ def __call__(self) -> None: """ # print('XXX') # print(format(self.q_event_proxies[0])) - q_grid = QGrid() + q_grid = _qgrid.QGrid() q_grid.fit_q_events(self.q_event_proxies) # print(format(q_grid)) old_q_grids = [] @@ -144,7 +144,7 @@ def job_id(self) -> int: return self._job_id @property - def q_event_proxies(self) -> tuple[QEventProxy, ...]: + def q_event_proxies(self) -> tuple[_qeventproxy.QEventProxy, ...]: r""" Gets the ``QEventProxies`` the ``QuantizationJob`` was instantiated with. @@ -163,17 +163,17 @@ def q_event_proxies(self) -> tuple[QEventProxy, ...]: >>> job() >>> for q_event_proxy in job.q_event_proxies: - ... q_event_proxy + ... print(type(q_event_proxy.q_event).__name__) ... - QEventProxy(q_event=PitchedQEvent(offset=Offset((250, 1)), pitches=(NamedPitch("c'"), NamedPitch("cs'")), index=None, attachments=()), offset=Offset((1, 4))) - QEventProxy(q_event=SilentQEvent(offset=Offset((500, 1)), index=None, attachments=()), offset=Offset((1, 2))) - QEventProxy(q_event=PitchedQEvent(offset=Offset((750, 1)), pitches=(NamedPitch("ef'"), NamedPitch("g'")), index=None, attachments=()), offset=Offset((3, 4))) + PitchedQEvent + SilentQEvent + PitchedQEvent """ return self._q_event_proxies @property - def q_grids(self) -> tuple[QGrid, ...]: + def q_grids(self) -> tuple[_qgrid.QGrid, ...]: r""" Gets generated ``QGrids``. @@ -200,7 +200,7 @@ def q_grids(self) -> tuple[QGrid, ...]: return self._q_grids @property - def search_tree(self) -> SearchTree: + def search_tree(self) -> _searchtrees.SearchTree: """ Gets search tree ``QuantizationJob`` was instantiated with. """ diff --git a/abjadext/nauert/quantizer.py b/abjadext/nauert/quantizer.py index 8df7ce2..e910707 100644 --- a/abjadext/nauert/quantizer.py +++ b/abjadext/nauert/quantizer.py @@ -1,20 +1,20 @@ import abjad -from .attackpointoptimizers import AttackPointOptimizer -from .gracehandlers import GraceHandler -from .heuristics import Heuristic -from .jobhandlers import JobHandler -from .qeventsequence import QEventSequence -from .qschemas import MeasurewiseQSchema, QSchema +from . import attackpointoptimizers as _attackpointoptimizers +from . import gracehandlers as _gracehandlers +from . import heuristics as _heuristics +from . import jobhandlers as _jobhandlers +from . import qeventsequence as _qeventsequence +from . import qschemas as _qschemas def quantize( - q_event_sequence: QEventSequence, - q_schema: QSchema | None = None, - grace_handler: GraceHandler | None = None, - heuristic: Heuristic | None = None, - job_handler: JobHandler | None = None, - attack_point_optimizer: AttackPointOptimizer | None = None, + q_event_sequence: _qeventsequence.QEventSequence, + q_schema: _qschemas.QSchema | None = None, + grace_handler: _gracehandlers.GraceHandler | None = None, + heuristic: _heuristics.Heuristic | None = None, + job_handler: _jobhandlers.JobHandler | None = None, + attack_point_optimizer: _attackpointoptimizers.AttackPointOptimizer | None = None, attach_tempos: bool = True, ) -> abjad.Voice: r""" @@ -248,7 +248,7 @@ def quantize( ... ) Traceback (most recent call last): ... - TypeError: BeatwiseQTarget is not supposed to be used together with MeasurewiseAttackPointOptimizer. + TypeError: BeatwiseQTarget is not ... with MeasurewiseAttackPointOptimizer. Other keyword arguments are: @@ -277,10 +277,10 @@ def quantize( on controlling the rhythmic complexity of that same output. """ # TODO: assert isinstance(q_event_sequence, QEventSequence) - q_event_sequence = QEventSequence(q_event_sequence) + q_event_sequence = _qeventsequence.QEventSequence(q_event_sequence) if q_schema is None: - q_schema = MeasurewiseQSchema() - assert isinstance(q_schema, QSchema) + q_schema = _qschemas.MeasurewiseQSchema() + assert isinstance(q_schema, _qschemas.QSchema) q_target = q_schema(q_event_sequence.duration_in_ms) notation = q_target( q_event_sequence, diff --git a/abjadext/nauert/searchtrees.py b/abjadext/nauert/searchtrees.py index 75d56e7..48c03ce 100644 --- a/abjadext/nauert/searchtrees.py +++ b/abjadext/nauert/searchtrees.py @@ -3,7 +3,7 @@ import abjad -from .qgrid import QGrid +from . import qgrid as _qgrid class SearchTree(abc.ABC): @@ -34,11 +34,11 @@ def __init__(self, definition: dict | None = None): ### SPECIAL METHODS ### - def __call__(self, q_grid: QGrid) -> list[QGrid]: + def __call__(self, q_grid: _qgrid.QGrid) -> list[_qgrid.QGrid]: """ Calls search tree. """ - assert isinstance(q_grid, QGrid) + assert isinstance(q_grid, _qgrid.QGrid) new_q_grids = [] commands = self._generate_all_subdivision_commands(q_grid) for command in commands: @@ -75,7 +75,7 @@ def __repr__(self) -> str: ### PRIVATE METHODS ### def _find_divisible_leaf_indices_and_subdivisions( - self, q_grid: QGrid + self, q_grid: _qgrid.QGrid ) -> tuple[list[int], list[tuple[tuple[int, ...], ...]]]: # TODO: This should actually check for all QEvents which fall # within the leaf's duration, @@ -111,7 +111,7 @@ def _find_leaf_subdivisions( raise NotImplementedError def _generate_all_subdivision_commands( - self, q_grid: QGrid + self, q_grid: _qgrid.QGrid ) -> tuple[tuple[tuple[int, tuple[int, int]], ...], ...]: indices, subdivisions = self._find_divisible_leaf_indices_and_subdivisions( q_grid @@ -149,9 +149,15 @@ class UnweightedSearchTree(SearchTree): .. container:: example + >>> import pprint >>> search_tree = nauert.UnweightedSearchTree() - >>> search_tree - UnweightedSearchTree(definition={2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, 3: {2: {2: None}, 3: None, 5: None}, 5: {2: None, 3: None}, 7: {2: None}, 11: None, 13: None}) + >>> pprint.pprint(search_tree.definition) + {2: {2: {2: {2: None}, 3: None}, 3: None, 5: None, 7: None}, + 3: {2: {2: None}, 3: None, 5: None}, + 5: {2: None, 3: None}, + 7: {2: None}, + 11: None, + 13: None} .. container:: example @@ -295,8 +301,8 @@ class WeightedSearchTree(SearchTree): Allows for dividing nodes in a q-grid into parts with unequal weights. >>> search_tree = nauert.WeightedSearchTree() - >>> search_tree - WeightedSearchTree(definition={'divisors': (2, 3, 5, 7), 'max_depth': 3, 'max_divisions': 2}) + >>> search_tree.definition + {'divisors': (2, 3, 5, 7), 'max_depth': 3, 'max_divisions': 2} .. container:: example diff --git a/tests/test_BeatwiseQSchemaItem___new__.py b/tests/test_BeatwiseQSchemaItem___new__.py index 64195b6..c250b8e 100644 --- a/tests/test_BeatwiseQSchemaItem___new__.py +++ b/tests/test_BeatwiseQSchemaItem___new__.py @@ -1,10 +1,10 @@ import abjad -import abjadext.nauert import pytest +from abjadext import nauert def test_BeatwiseQSchemaItem___new___01(): - item = abjadext.nauert.BeatwiseQSchemaItem() + item = nauert.BeatwiseQSchemaItem() assert item.beatspan is None assert item.search_tree is None assert item.tempo is None @@ -12,14 +12,14 @@ def test_BeatwiseQSchemaItem___new___01(): def test_BeatwiseQSchemaItem___new___02(): metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 60) - item = abjadext.nauert.BeatwiseQSchemaItem(tempo=metronome_mark) + item = nauert.BeatwiseQSchemaItem(tempo=metronome_mark) assert item.beatspan is None assert item.search_tree is None assert item.tempo == metronome_mark def test_BeatwiseQSchemaItem___new___03(): - item = abjadext.nauert.BeatwiseQSchemaItem(beatspan=abjad.Duration(1, 8)) + item = nauert.BeatwiseQSchemaItem(beatspan=abjad.Duration(1, 8)) assert item.beatspan == abjad.Duration(1, 8) assert item.search_tree is None assert item.tempo is None @@ -27,7 +27,7 @@ def test_BeatwiseQSchemaItem___new___03(): def test_BeatwiseQSchemaItem___new___04(): metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 57) - item = abjadext.nauert.BeatwiseQSchemaItem( + item = nauert.BeatwiseQSchemaItem( beatspan=abjad.Duration(1, 8), tempo=metronome_mark ) assert item.beatspan == abjad.Duration(1, 8) @@ -38,4 +38,4 @@ def test_BeatwiseQSchemaItem___new___04(): def test_BeatwiseQSchemaItem___new___05(): tempo = abjad.MetronomeMark(textual_indication="lento") with pytest.raises(AssertionError): - abjadext.nauert.BeatwiseQSchemaItem(tempo=tempo) + nauert.BeatwiseQSchemaItem(tempo=tempo) diff --git a/tests/test_BeatwiseQSchema___call__.py b/tests/test_BeatwiseQSchema___call__.py index 16d245e..64cbd31 100644 --- a/tests/test_BeatwiseQSchema___call__.py +++ b/tests/test_BeatwiseQSchema___call__.py @@ -1,7 +1,7 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_BeatwiseQSchema___call___01(): - schema = abjadext.nauert.BeatwiseQSchema() + schema = nauert.BeatwiseQSchema() schema(abjad.Duration(5000)) diff --git a/tests/test_BeatwiseQSchema___getitem__.py b/tests/test_BeatwiseQSchema___getitem__.py index 2e70bff..5ab376e 100644 --- a/tests/test_BeatwiseQSchema___getitem__.py +++ b/tests/test_BeatwiseQSchema___getitem__.py @@ -1,78 +1,72 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_BeatwiseQSchema___getitem___01(): - schema = abjadext.nauert.BeatwiseQSchema() - + schema = nauert.BeatwiseQSchema() assert ( schema[0] == schema[1] == schema[2] == { "beatspan": abjad.Duration(1, 4), - "search_tree": abjadext.nauert.UnweightedSearchTree(), + "search_tree": nauert.UnweightedSearchTree(), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 60), } ) def test_BeatwiseQSchema___getitem___02(): - item_a = abjadext.nauert.BeatwiseQSchemaItem( - search_tree=abjadext.nauert.UnweightedSearchTree({2: None}) + item_a = nauert.BeatwiseQSchemaItem( + search_tree=nauert.UnweightedSearchTree({2: None}) ) metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 76) - item_b = abjadext.nauert.BeatwiseQSchemaItem(tempo=metronome_mark) - item_c = abjadext.nauert.BeatwiseQSchemaItem( + item_b = nauert.BeatwiseQSchemaItem(tempo=metronome_mark) + item_c = nauert.BeatwiseQSchemaItem( beatspan=abjad.Duration(1, 8), - search_tree=abjadext.nauert.UnweightedSearchTree({5: None}), + search_tree=nauert.UnweightedSearchTree({5: None}), ) - - schema = abjadext.nauert.BeatwiseQSchema( + schema = nauert.BeatwiseQSchema( {2: item_a, 4: item_b, 7: item_c}, beatspan=abjad.Duration(1, 32), - search_tree=abjadext.nauert.UnweightedSearchTree({3: None}), + search_tree=nauert.UnweightedSearchTree({3: None}), tempo=abjad.MetronomeMark(abjad.Duration(1, 16), 36), ) - assert ( schema[0] == schema[1] == { "beatspan": abjad.Duration(1, 32), - "search_tree": abjadext.nauert.UnweightedSearchTree({3: None}), + "search_tree": nauert.UnweightedSearchTree({3: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 16), 36), } ) - assert ( schema[2] == schema[3] == { "beatspan": abjad.Duration(1, 32), - "search_tree": abjadext.nauert.UnweightedSearchTree({2: None}), + "search_tree": nauert.UnweightedSearchTree({2: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 16), 36), } ) - assert ( schema[4] == schema[5] == schema[6] == { "beatspan": abjad.Duration(1, 32), - "search_tree": abjadext.nauert.UnweightedSearchTree({2: None}), + "search_tree": nauert.UnweightedSearchTree({2: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 76), } ) - assert ( schema[7] == schema[8] == schema[1000] == { "beatspan": abjad.Duration(1, 8), - "search_tree": abjadext.nauert.UnweightedSearchTree({5: None}), + "search_tree": nauert.UnweightedSearchTree({5: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 76), } ) diff --git a/tests/test_BeatwiseQSchema___init__.py b/tests/test_BeatwiseQSchema___init__.py index 262e7f0..c7ee858 100644 --- a/tests/test_BeatwiseQSchema___init__.py +++ b/tests/test_BeatwiseQSchema___init__.py @@ -1,30 +1,30 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_BeatwiseQSchema___init___01(): - item_a = abjadext.nauert.BeatwiseQSchemaItem( - search_tree=abjadext.nauert.UnweightedSearchTree({2: None}) + item_a = nauert.BeatwiseQSchemaItem( + search_tree=nauert.UnweightedSearchTree({2: None}) ) metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 76) - item_b = abjadext.nauert.BeatwiseQSchemaItem(tempo=metronome_mark) - item_c = abjadext.nauert.BeatwiseQSchemaItem(beatspan=abjad.Duration(1, 8)) + item_b = nauert.BeatwiseQSchemaItem(tempo=metronome_mark) + item_c = nauert.BeatwiseQSchemaItem(beatspan=abjad.Duration(1, 8)) - schema = abjadext.nauert.BeatwiseQSchema( + schema = nauert.BeatwiseQSchema( {2: item_a, 4: item_b, 7: item_c}, beatspan=abjad.Duration(1, 32), - search_tree=abjadext.nauert.UnweightedSearchTree({3: None}), + search_tree=nauert.UnweightedSearchTree({3: None}), tempo=abjad.MetronomeMark(abjad.Duration(1, 16), 32), ) assert len(schema.items) == 3 assert schema.beatspan == abjad.Duration(1, 32) - assert schema.search_tree == abjadext.nauert.UnweightedSearchTree({3: None}) + assert schema.search_tree == nauert.UnweightedSearchTree({3: None}) assert schema.tempo == abjad.MetronomeMark(abjad.Duration(1, 16), 32) def test_BeatwiseQSchema___init___02(): - schema = abjadext.nauert.BeatwiseQSchema() + schema = nauert.BeatwiseQSchema() assert len(schema.items) == 0 assert schema.beatspan == abjad.Duration(1, 4) - assert schema.search_tree == abjadext.nauert.UnweightedSearchTree() + assert schema.search_tree == nauert.UnweightedSearchTree() assert schema.tempo == abjad.MetronomeMark(abjad.Duration(1, 4), 60) diff --git a/tests/test_MeasurewiseQSchemaItem___new__.py b/tests/test_MeasurewiseQSchemaItem___new__.py index cee75a5..84feb2a 100644 --- a/tests/test_MeasurewiseQSchemaItem___new__.py +++ b/tests/test_MeasurewiseQSchemaItem___new__.py @@ -1,10 +1,10 @@ import abjad -import abjadext.nauert import pytest +from abjadext import nauert def test_MeasurewiseQSchemaItem___new___01(): - item = abjadext.nauert.MeasurewiseQSchemaItem() + item = nauert.MeasurewiseQSchemaItem() assert item.beatspan is None assert item.search_tree is None assert item.tempo is None @@ -13,7 +13,7 @@ def test_MeasurewiseQSchemaItem___new___01(): def test_MeasurewiseQSchemaItem___new___02(): metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 60) - item = abjadext.nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) + item = nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) assert item.beatspan is None assert item.search_tree is None assert item.tempo == metronome_mark @@ -22,7 +22,7 @@ def test_MeasurewiseQSchemaItem___new___02(): def test_MeasurewiseQSchemaItem___new___03(): time_signature = abjad.TimeSignature((6, 8)) - item = abjadext.nauert.MeasurewiseQSchemaItem(time_signature=time_signature) + item = nauert.MeasurewiseQSchemaItem(time_signature=time_signature) assert item.beatspan == abjad.Duration(1, 8) assert item.search_tree is None assert item.tempo is None @@ -32,7 +32,7 @@ def test_MeasurewiseQSchemaItem___new___03(): def test_MeasurewiseQSchemaItem___new___04(): metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 57) time_signature = abjad.TimeSignature((6, 8)) - item = abjadext.nauert.MeasurewiseQSchemaItem( + item = nauert.MeasurewiseQSchemaItem( tempo=metronome_mark, time_signature=time_signature ) assert item.beatspan == abjad.Duration(1, 8) @@ -44,4 +44,4 @@ def test_MeasurewiseQSchemaItem___new___04(): def test_MeasurewiseQSchemaItem___new___05(): tempo = abjad.MetronomeMark(textual_indication="lento") with pytest.raises(AssertionError): - abjadext.nauert.MeasurewiseQSchemaItem(tempo=tempo) + nauert.MeasurewiseQSchemaItem(tempo=tempo) diff --git a/tests/test_MeasurewiseQSchema___call__.py b/tests/test_MeasurewiseQSchema___call__.py index 8562bd1..9f00487 100644 --- a/tests/test_MeasurewiseQSchema___call__.py +++ b/tests/test_MeasurewiseQSchema___call__.py @@ -1,7 +1,7 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_MeasurewiseQSchema___call___01(): - schema = abjadext.nauert.MeasurewiseQSchema() + schema = nauert.MeasurewiseQSchema() schema(abjad.Duration(5000)) diff --git a/tests/test_MeasurewiseQSchema___getitem__.py b/tests/test_MeasurewiseQSchema___getitem__.py index d1c1bc4..e36603d 100644 --- a/tests/test_MeasurewiseQSchema___getitem__.py +++ b/tests/test_MeasurewiseQSchema___getitem__.py @@ -1,16 +1,15 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_MeasurewiseQSchema___getitem___01(): - schema = abjadext.nauert.MeasurewiseQSchema() - + schema = nauert.MeasurewiseQSchema() assert ( schema[0] == schema[1] == schema[2] == { - "search_tree": abjadext.nauert.UnweightedSearchTree(), + "search_tree": nauert.UnweightedSearchTree(), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 60), "time_signature": abjad.TimeSignature((4, 4)), "use_full_measure": False, @@ -19,72 +18,67 @@ def test_MeasurewiseQSchema___getitem___01(): def test_MeasurewiseQSchema___getitem___02(): - item_a = abjadext.nauert.MeasurewiseQSchemaItem( - search_tree=abjadext.nauert.UnweightedSearchTree({2: None}) + item_a = nauert.MeasurewiseQSchemaItem( + search_tree=nauert.UnweightedSearchTree({2: None}) ) metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 76) - item_b = abjadext.nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) + item_b = nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) time_signature = abjad.TimeSignature((3, 4)) - item_c = abjadext.nauert.MeasurewiseQSchemaItem(time_signature=time_signature) - item_d = abjadext.nauert.MeasurewiseQSchemaItem( - search_tree=abjadext.nauert.UnweightedSearchTree({5: None}), + item_c = nauert.MeasurewiseQSchemaItem(time_signature=time_signature) + item_d = nauert.MeasurewiseQSchemaItem( + search_tree=nauert.UnweightedSearchTree({5: None}), use_full_measure=True, ) - schema = abjadext.nauert.MeasurewiseQSchema( + schema = nauert.MeasurewiseQSchema( {2: item_a, 4: item_b, 7: item_c, 8: item_d}, - search_tree=abjadext.nauert.UnweightedSearchTree({3: None}), + search_tree=nauert.UnweightedSearchTree({3: None}), tempo=abjad.MetronomeMark(abjad.Duration(1, 8), 58), time_signature=(5, 8), use_full_measure=False, ) - assert ( schema[0] == schema[1] == { - "search_tree": abjadext.nauert.UnweightedSearchTree({3: None}), + "search_tree": nauert.UnweightedSearchTree({3: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 8), 58), "time_signature": abjad.TimeSignature((5, 8)), "use_full_measure": False, } ) - assert ( schema[2] == schema[3] == { - "search_tree": abjadext.nauert.UnweightedSearchTree({2: None}), + "search_tree": nauert.UnweightedSearchTree({2: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 8), 58), "time_signature": abjad.TimeSignature((5, 8)), "use_full_measure": False, } ) - assert ( schema[4] == schema[5] == schema[6] == { - "search_tree": abjadext.nauert.UnweightedSearchTree({2: None}), + "search_tree": nauert.UnweightedSearchTree({2: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 76), "time_signature": abjad.TimeSignature((5, 8)), "use_full_measure": False, } ) - assert schema[7] == { - "search_tree": abjadext.nauert.UnweightedSearchTree({2: None}), + "search_tree": nauert.UnweightedSearchTree({2: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 76), "time_signature": abjad.TimeSignature((3, 4)), "use_full_measure": False, } - assert ( schema[8] == schema[9] == schema[1000] == { - "search_tree": abjadext.nauert.UnweightedSearchTree({5: None}), + "search_tree": nauert.UnweightedSearchTree({5: None}), "tempo": abjad.MetronomeMark(abjad.Duration(1, 4), 76), "time_signature": abjad.TimeSignature((3, 4)), "use_full_measure": True, diff --git a/tests/test_MeasurewiseQSchema___init__.py b/tests/test_MeasurewiseQSchema___init__.py index 287c23a..9b26ef2 100644 --- a/tests/test_MeasurewiseQSchema___init__.py +++ b/tests/test_MeasurewiseQSchema___init__.py @@ -1,36 +1,35 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_MeasurewiseQSchema___init___01(): - item_a = abjadext.nauert.MeasurewiseQSchemaItem( - search_tree=abjadext.nauert.UnweightedSearchTree({2: None}) + item_a = nauert.MeasurewiseQSchemaItem( + search_tree=nauert.UnweightedSearchTree({2: None}) ) metronome_mark = abjad.MetronomeMark(abjad.Duration(1, 4), 76) - item_b = abjadext.nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) + item_b = nauert.MeasurewiseQSchemaItem(tempo=metronome_mark) time_signature = abjad.TimeSignature((3, 4)) - item_c = abjadext.nauert.MeasurewiseQSchemaItem(time_signature=time_signature) - item_d = abjadext.nauert.MeasurewiseQSchemaItem(use_full_measure=True) + item_c = nauert.MeasurewiseQSchemaItem(time_signature=time_signature) + item_d = nauert.MeasurewiseQSchemaItem(use_full_measure=True) time_signature = abjad.TimeSignature((5, 8)) - schema = abjadext.nauert.MeasurewiseQSchema( + schema = nauert.MeasurewiseQSchema( {2: item_a, 4: item_b, 7: item_c, 8: item_d}, - search_tree=abjadext.nauert.UnweightedSearchTree({3: None}), + search_tree=nauert.UnweightedSearchTree({3: None}), tempo=(abjad.Duration(1, 8), 58), time_signature=time_signature, use_full_measure=False, ) assert len(schema.items) == 4 - assert schema.search_tree == abjadext.nauert.UnweightedSearchTree({3: None}) + assert schema.search_tree == nauert.UnweightedSearchTree({3: None}) assert schema.tempo == abjad.MetronomeMark(abjad.Duration(1, 8), 58) assert schema.time_signature == abjad.TimeSignature((5, 8)) assert schema.use_full_measure is False def test_MeasurewiseQSchema___init___02(): - schema = abjadext.nauert.MeasurewiseQSchema() - + schema = nauert.MeasurewiseQSchema() assert len(schema.items) == 0 - assert schema.search_tree == abjadext.nauert.UnweightedSearchTree() + assert schema.search_tree == nauert.UnweightedSearchTree() assert schema.tempo == abjad.MetronomeMark(abjad.Duration(1, 4), 60) assert schema.time_signature == abjad.TimeSignature((4, 4)) assert schema.use_full_measure is False diff --git a/tests/test_ParallelJobHandler___call__.py b/tests/test_ParallelJobHandler___call__.py index 4bfe2c0..1595095 100644 --- a/tests/test_ParallelJobHandler___call__.py +++ b/tests/test_ParallelJobHandler___call__.py @@ -1,16 +1,13 @@ import abjad -import abjadext.nauert import pytest +from abjadext import nauert class Job: - ### INITIALIZER ### def __init__(self, number): self.number = number - ### SPECIAL METHODS ### - def __call__(self): self.result = [ x for x in abjad.math.yield_all_compositions_of_integer(self.number) @@ -20,7 +17,7 @@ def __call__(self): @pytest.mark.skip() def test_ParallelJobHandler___call___01(): jobs = [Job(x) for x in range(1, 11)] - job_handler = abjadext.nauert.ParallelJobHandler() + job_handler = nauert.ParallelJobHandler() job_handler(jobs) @@ -28,57 +25,31 @@ def test_ParallelJobHandler___call___01(): def test_ParallelJobHandler___call___02(): job_id = 1 definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) + search_tree = nauert.UnweightedSearchTree(definition) q_event_proxies = [ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(0, ["A"], index=1), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((1, 5), ["B"], index=2), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((1, 4), ["C"], index=3), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((1, 3), ["D"], index=4), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((2, 5), ["E"], index=5), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((1, 2), ["F"], index=6), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((3, 5), ["G"], index=7), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((2, 3), ["H"], index=8), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((3, 4), ["I"], index=9), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent((4, 5), ["J"], index=10), 0, 1 - ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(1, ["K"], index=11), 0, 1 - ), + nauert.QEventProxy(nauert.SilentQEvent(0, ["A"], index=1), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((1, 5), ["B"], index=2), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((1, 4), ["C"], index=3), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((1, 3), ["D"], index=4), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((2, 5), ["E"], index=5), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((1, 2), ["F"], index=6), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((3, 5), ["G"], index=7), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((2, 3), ["H"], index=8), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((3, 4), ["I"], index=9), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent((4, 5), ["J"], index=10), 0, 1), + nauert.QEventProxy(nauert.SilentQEvent(1, ["K"], index=11), 0, 1), ] - job_a = abjadext.nauert.QuantizationJob(job_id, search_tree, q_event_proxies) - job_b = abjadext.nauert.QuantizationJob(job_id, search_tree, q_event_proxies) - + job_a = nauert.QuantizationJob(job_id, search_tree, q_event_proxies) + job_b = nauert.QuantizationJob(job_id, search_tree, q_event_proxies) assert job_a == job_b - a_jobs = abjadext.nauert.SerialJobHandler()([job_a]) - b_jobs = abjadext.nauert.ParallelJobHandler()([job_b]) - + a_jobs = nauert.SerialJobHandler()([job_a]) + b_jobs = nauert.ParallelJobHandler()([job_b]) assert len(a_jobs) == len(b_jobs) a_rtms = sorted([q_grid.root_node.rtm_format for q_grid in a_jobs[0].q_grids]) b_rtms = sorted([q_grid.root_node.rtm_format for q_grid in b_jobs[0].q_grids]) - assert a_rtms == b_rtms - assert sorted(a_jobs[0].q_grids, key=lambda x: x.root_node.rtm_format) == sorted( b_jobs[0].q_grids, key=lambda x: x.root_node.rtm_format ) diff --git a/tests/test_QEvent.py b/tests/test_QEvent.py index 9c7a3e0..5cad00d 100644 --- a/tests/test_QEvent.py +++ b/tests/test_QEvent.py @@ -1,12 +1,12 @@ import decimal import abjad -import abjadext.nauert import pytest +from abjadext import nauert def test_PitchedQEvent___init___01(): - q_event = abjadext.nauert.PitchedQEvent(abjad.Offset(130), [0, 1, 4]) + q_event = nauert.PitchedQEvent(abjad.Offset(130), [0, 1, 4]) assert q_event.offset == abjad.Offset(130) assert q_event.pitches == ( abjad.NamedPitch(0), @@ -17,7 +17,7 @@ def test_PitchedQEvent___init___01(): def test_PitchedQEvent___init___02(): - q_event = abjadext.nauert.PitchedQEvent( + q_event = nauert.PitchedQEvent( abjad.Offset(133, 5), [abjad.NamedPitch("fss")], attachments=["foo", "bar", "baz"], @@ -28,88 +28,86 @@ def test_PitchedQEvent___init___02(): def test_PitchedQEvent___eq___01(): - a = abjadext.nauert.PitchedQEvent(abjad.Offset(1000), [0]) - b = abjadext.nauert.PitchedQEvent(abjad.Offset(1000), [0]) + a = nauert.PitchedQEvent(abjad.Offset(1000), [0]) + b = nauert.PitchedQEvent(abjad.Offset(1000), [0]) assert a == b def test_PitchedQEvent___eq___02(): - a = abjadext.nauert.PitchedQEvent(abjad.Offset(1000), [0]) - b = abjadext.nauert.PitchedQEvent(abjad.Offset(1000), [0], ["foo", "bar", "baz"]) - c = abjadext.nauert.PitchedQEvent(abjad.Offset(9999), [0]) - d = abjadext.nauert.PitchedQEvent(abjad.Offset(1000), [0, 1, 4]) + a = nauert.PitchedQEvent(abjad.Offset(1000), [0]) + b = nauert.PitchedQEvent(abjad.Offset(1000), [0], ["foo", "bar", "baz"]) + c = nauert.PitchedQEvent(abjad.Offset(9999), [0]) + d = nauert.PitchedQEvent(abjad.Offset(1000), [0, 1, 4]) assert a != b assert a != c assert a != d def test_PitchedQEvent___eq___03(): - a = abjadext.nauert.TerminalQEvent(abjad.Offset(100)) - b = abjadext.nauert.PitchedQEvent(abjad.Offset(100), [0]) - c = abjadext.nauert.SilentQEvent(abjad.Offset(100)) + a = nauert.TerminalQEvent(abjad.Offset(100)) + b = nauert.PitchedQEvent(abjad.Offset(100), [0]) + c = nauert.SilentQEvent(abjad.Offset(100)) assert a != b assert a != c def test_SilentQEvent___init___01(): - q_event = abjadext.nauert.SilentQEvent(abjad.Offset(130)) + q_event = nauert.SilentQEvent(abjad.Offset(130)) assert q_event.offset == abjad.Offset(130) assert q_event.attachments == () def test_SilentQEvent___init___02(): attachments = ["foo", "bar", "baz"] - q_event = abjadext.nauert.SilentQEvent( - abjad.Offset(155, 7), attachments=attachments - ) + q_event = nauert.SilentQEvent(abjad.Offset(155, 7), attachments=attachments) assert q_event.offset == abjad.Offset(155, 7) assert q_event.attachments == ("foo", "bar", "baz") def test_SilentQEvent___eq___01(): - a = abjadext.nauert.SilentQEvent(abjad.Offset(1000)) - b = abjadext.nauert.SilentQEvent(abjad.Offset(1000)) + a = nauert.SilentQEvent(abjad.Offset(1000)) + b = nauert.SilentQEvent(abjad.Offset(1000)) assert a == b def test_SilentQEvent___eq___02(): - a = abjadext.nauert.SilentQEvent(abjad.Offset(1000)) - b = abjadext.nauert.SilentQEvent(abjad.Offset(1000), ["foo", "bar", "baz"]) - c = abjadext.nauert.SilentQEvent(abjad.Offset(9999)) + a = nauert.SilentQEvent(abjad.Offset(1000)) + b = nauert.SilentQEvent(abjad.Offset(1000), ["foo", "bar", "baz"]) + c = nauert.SilentQEvent(abjad.Offset(9999)) assert a != b assert a != c def test_TerminalQEvent___init___01(): - q_event = abjadext.nauert.TerminalQEvent(abjad.Offset(154)) + q_event = nauert.TerminalQEvent(abjad.Offset(154)) assert q_event.offset == abjad.Offset(154) def test_TerminalQEvent___eq___01(): - a = abjadext.nauert.TerminalQEvent(abjad.Offset(1000)) - b = abjadext.nauert.TerminalQEvent(abjad.Offset(1000)) + a = nauert.TerminalQEvent(abjad.Offset(1000)) + b = nauert.TerminalQEvent(abjad.Offset(1000)) assert a == b def test_TerminalQEvent___eq___02(): - a = abjadext.nauert.TerminalQEvent(abjad.Offset(1000)) - b = abjadext.nauert.TerminalQEvent(abjad.Offset(9000)) + a = nauert.TerminalQEvent(abjad.Offset(1000)) + b = nauert.TerminalQEvent(abjad.Offset(9000)) assert a != b def test_TerminalQEvent___eq___03(): - a = abjadext.nauert.TerminalQEvent(abjad.Offset(100)) - b = abjadext.nauert.PitchedQEvent(abjad.Offset(100), [0]) - c = abjadext.nauert.SilentQEvent(abjad.Offset(100)) + a = nauert.TerminalQEvent(abjad.Offset(100)) + b = nauert.PitchedQEvent(abjad.Offset(100), [0]) + c = nauert.SilentQEvent(abjad.Offset(100)) assert a != b assert a != c def test_QEvent_from_offset_pitches_attachments(): - q_event = abjadext.nauert.QEvent.from_offset_pitches_attachments( + q_event = nauert.QEvent.from_offset_pitches_attachments( abjad.Offset(100), 1, ("foo",) ) - assert isinstance(q_event, abjadext.nauert.PitchedQEvent) + assert isinstance(q_event, nauert.PitchedQEvent) assert q_event.offset == 100 assert q_event.pitches == (abjad.NamedPitch(1),) assert q_event.attachments == ("foo",) @@ -117,6 +115,4 @@ def test_QEvent_from_offset_pitches_attachments(): def test_QEvent_from_offset_pitches_attachments_with_incorrectly_typed_pitches(): with pytest.raises(TypeError): - abjadext.nauert.QEvent.from_offset_pitches_attachments( - 100, decimal.Decimal(0), ("foo",) - ) + nauert.QEvent.from_offset_pitches_attachments(100, decimal.Decimal(0), ("foo",)) diff --git a/tests/test_QEventProxy___init__.py b/tests/test_QEventProxy___init__.py index ed83a62..02c67e6 100644 --- a/tests/test_QEventProxy___init__.py +++ b/tests/test_QEventProxy___init__.py @@ -1,16 +1,16 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QEventProxy___init___01(): - q_event = abjadext.nauert.PitchedQEvent(abjad.Offset(130), [0]) - proxy = abjadext.nauert.QEventProxy(q_event, abjad.Offset(0.5)) + q_event = nauert.PitchedQEvent(abjad.Offset(130), [0]) + proxy = nauert.QEventProxy(q_event, abjad.Offset(0.5)) assert proxy.q_event == q_event assert proxy.offset == abjad.Offset(1, 2) def test_QEventProxy___init___02(): - q_event = abjadext.nauert.PitchedQEvent(abjad.Offset(130), [0, 1, 4]) - proxy = abjadext.nauert.QEventProxy(q_event, abjad.Offset(100), abjad.Offset(1000)) + q_event = nauert.PitchedQEvent(abjad.Offset(130), [0, 1, 4]) + proxy = nauert.QEventProxy(q_event, abjad.Offset(100), abjad.Offset(1000)) assert proxy.q_event == q_event assert proxy.offset == abjad.Offset(1, 30) diff --git a/tests/test_QEventSequence_from_millisecond_durations.py b/tests/test_QEventSequence_from_millisecond_durations.py index 966e59ff..fb5de2b 100644 --- a/tests/test_QEventSequence_from_millisecond_durations.py +++ b/tests/test_QEventSequence_from_millisecond_durations.py @@ -1,5 +1,5 @@ import abjad -import abjadext.nauert +from abjadext import nauert test_time_segments = [ (116, 255), @@ -52,189 +52,102 @@ def test_QEventSequence_from_millisecond_durations_01(): - r"""Test basic functionality.""" + """ + Test basic functionality. + """ durations = abjad.math.difference_series([x[0] for x in test_time_segments]) - q_events = abjadext.nauert.QEventSequence.from_millisecond_durations(durations) - - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_millisecond_durations(durations) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent( - abjad.Offset(0, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(163, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(511, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(627, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(1208, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(1417, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(1997, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(3204, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(3297, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(4087, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(4296, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(4830, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(6362, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(6595, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(6687, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(7013, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(7245, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(7872, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(8197, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(8359, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(8638, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(8731, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(8917, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(9288, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(9404, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(10240, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(10356, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(10496, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(10890, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(11169, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(11285, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(11424, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(12307, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(12957, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(13073, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(13653, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(13979, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(14234, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(15256, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(15883, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(16022, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(16649, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(16927, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(17044, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(17276, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.TerminalQEvent(abjad.Offset(18483, 1)), + nauert.PitchedQEvent(abjad.Offset(0, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(163, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(511, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(627, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(1208, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(1417, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(1997, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(3204, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(3297, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(4087, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(4296, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(4830, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(6362, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(6595, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(6687, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(7013, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(7245, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(7872, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(8197, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(8359, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(8638, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(8731, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(8917, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(9288, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(9404, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(10240, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(10356, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(10496, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(10890, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(11169, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(11285, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(11424, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(12307, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(12957, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(13073, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(13653, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(13979, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(14234, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(15256, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(15883, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(16022, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(16649, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(16927, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(17044, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(17276, 1), (abjad.NamedPitch("c'"),)), + nauert.TerminalQEvent(abjad.Offset(18483, 1)), ) ) def test_QEventSequence_from_millisecond_durations_02(): - r"""Silences are not fused.""" + """ + Silences are not fused. + """ durations = [100, -100, 100, -100, -100, 100] - q_events = abjadext.nauert.QEventSequence.from_millisecond_durations( + q_events = nauert.QEventSequence.from_millisecond_durations( durations, fuse_silences=False ) - - assert q_events == abjadext.nauert.QEventSequence( + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), - abjadext.nauert.SilentQEvent(abjad.Offset(100)), - abjadext.nauert.PitchedQEvent(abjad.Offset(200), (abjad.NamedPitch("c'"),)), - abjadext.nauert.SilentQEvent(abjad.Offset(300)), - abjadext.nauert.SilentQEvent(abjad.Offset(400)), - abjadext.nauert.PitchedQEvent(abjad.Offset(500), (abjad.NamedPitch("c'"),)), - abjadext.nauert.TerminalQEvent(abjad.Offset(600)), + nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(100)), + nauert.PitchedQEvent(abjad.Offset(200), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(300)), + nauert.SilentQEvent(abjad.Offset(400)), + nauert.PitchedQEvent(abjad.Offset(500), (abjad.NamedPitch("c'"),)), + nauert.TerminalQEvent(abjad.Offset(600)), ) ) def test_QEventSequence_from_millisecond_durations_03(): - r"""Silences are fused.""" + """ + Silences are fused. + """ durations = [100, -100, 100, -100, -100, 100] - q_events = abjadext.nauert.QEventSequence.from_millisecond_durations( + q_events = nauert.QEventSequence.from_millisecond_durations( durations, fuse_silences=True ) - - assert q_events == abjadext.nauert.QEventSequence( + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), - abjadext.nauert.SilentQEvent(abjad.Offset(100)), - abjadext.nauert.PitchedQEvent(abjad.Offset(200), (abjad.NamedPitch("c'"),)), - abjadext.nauert.SilentQEvent(abjad.Offset(300)), - abjadext.nauert.PitchedQEvent(abjad.Offset(500), (abjad.NamedPitch("c'"),)), - abjadext.nauert.TerminalQEvent(abjad.Offset(600)), + nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(100)), + nauert.PitchedQEvent(abjad.Offset(200), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(300)), + nauert.PitchedQEvent(abjad.Offset(500), (abjad.NamedPitch("c'"),)), + nauert.TerminalQEvent(abjad.Offset(600)), ) ) diff --git a/tests/test_QEventSequence_from_millisecond_pitch_pairs.py b/tests/test_QEventSequence_from_millisecond_pitch_pairs.py index c1ca306..aa8012c 100644 --- a/tests/test_QEventSequence_from_millisecond_pitch_pairs.py +++ b/tests/test_QEventSequence_from_millisecond_pitch_pairs.py @@ -1,27 +1,23 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QEventSequence_from_millisecond_pitch_pairs_01(): durations = [100, 200, 100, 300, 350, 400, 600] pitches = [0, None, None, [1, 4], None, 5, 7] pairs = tuple(zip(durations, pitches)) - q_events = abjadext.nauert.QEventSequence.from_millisecond_pitch_pairs(pairs) - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_millisecond_pitch_pairs(pairs) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), - abjadext.nauert.SilentQEvent(abjad.Offset(100, 1)), - abjadext.nauert.PitchedQEvent( + nauert.PitchedQEvent(abjad.Offset(0), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(100, 1)), + nauert.PitchedQEvent( abjad.Offset(400, 1), (abjad.NamedPitch("cs'"), abjad.NamedPitch("e'")), ), - abjadext.nauert.SilentQEvent(abjad.Offset(700, 1)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(1050, 1), (abjad.NamedPitch("f'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(1450, 1), (abjad.NamedPitch("g'"),) - ), - abjadext.nauert.TerminalQEvent(abjad.Offset(2050, 1)), + nauert.SilentQEvent(abjad.Offset(700, 1)), + nauert.PitchedQEvent(abjad.Offset(1050, 1), (abjad.NamedPitch("f'"),)), + nauert.PitchedQEvent(abjad.Offset(1450, 1), (abjad.NamedPitch("g'"),)), + nauert.TerminalQEvent(abjad.Offset(2050, 1)), ) ) diff --git a/tests/test_QEventSequence_from_tempo_scaled_durations.py b/tests/test_QEventSequence_from_tempo_scaled_durations.py index b110ee0..b49c295 100644 --- a/tests/test_QEventSequence_from_tempo_scaled_durations.py +++ b/tests/test_QEventSequence_from_tempo_scaled_durations.py @@ -1,5 +1,5 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QEventSequence_from_tempo_scaled_durations_01(): @@ -8,27 +8,15 @@ def test_QEventSequence_from_tempo_scaled_durations_01(): """ durations = [abjad.Duration(x) for x in [(1, 4), (1, 3), (1, 7), (2, 5), (3, 4)]] tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 55) - q_events = abjadext.nauert.QEventSequence.from_tempo_scaled_durations( - durations, tempo - ) - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_tempo_scaled_durations(durations, tempo) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent( - abjad.Offset(0, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(12000, 11), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(28000, 11), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(244000, 77), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(34400, 7), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.TerminalQEvent(abjad.Offset(630400, 77)), + nauert.PitchedQEvent(abjad.Offset(0, 1), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(12000, 11), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(28000, 11), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(244000, 77), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(34400, 7), (abjad.NamedPitch("c'"),)), + nauert.TerminalQEvent(abjad.Offset(630400, 77)), ) ) @@ -42,25 +30,15 @@ def test_QEventSequence_from_tempo_scaled_durations_02(): for x in [(1, 4), (-1, 4), (1, 4), (1, 4), (-1, 4), (-1, 4), (1, 4)] ] tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 77) - q_events = abjadext.nauert.QEventSequence.from_tempo_scaled_durations( - durations, tempo - ) - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_tempo_scaled_durations(durations, tempo) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent( - abjad.Offset(0, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(60000, 77)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(120000, 77), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(180000, 77), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(240000, 77)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(360000, 77), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.TerminalQEvent(abjad.Offset(60000, 11)), + nauert.PitchedQEvent(abjad.Offset(0, 1), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(60000, 77)), + nauert.PitchedQEvent(abjad.Offset(120000, 77), (abjad.NamedPitch("c'"),)), + nauert.PitchedQEvent(abjad.Offset(180000, 77), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(240000, 77)), + nauert.PitchedQEvent(abjad.Offset(360000, 77), (abjad.NamedPitch("c'"),)), + nauert.TerminalQEvent(abjad.Offset(60000, 11)), ) ) diff --git a/tests/test_QEventSequence_from_tempo_scaled_leaves.py b/tests/test_QEventSequence_from_tempo_scaled_leaves.py index 4e725eb..a9c493e 100644 --- a/tests/test_QEventSequence_from_tempo_scaled_leaves.py +++ b/tests/test_QEventSequence_from_tempo_scaled_leaves.py @@ -1,10 +1,9 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QEventSequence_from_tempo_scaled_leaves_01(): staff = abjad.Staff([]) - staff.append(abjad.Note(0, (1, 4))) staff.append(abjad.Rest((1, 4))) staff.append(abjad.Rest((1, 8))) @@ -17,35 +16,21 @@ def test_QEventSequence_from_tempo_scaled_leaves_01(): staff.append(abjad.Rest((1, 4))) staff.append(abjad.Note(3, (1, 8))) staff.append(abjad.Chord([0, 1, 4], (1, 4))) - abjad.tie(staff[3:5]) abjad.tie(staff[5:7]) - tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 55) - leaves = abjad.select.leaves(staff) - q_events = abjadext.nauert.QEventSequence.from_tempo_scaled_leaves(leaves, tempo) - - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_tempo_scaled_leaves(leaves, tempo) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent( - abjad.Offset(0, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(12000, 11)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(30000, 11), (abjad.NamedPitch("cs'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(42000, 11), (abjad.NamedPitch("d'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(54000, 11), (abjad.NamedPitch("ef'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(60000, 11)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(84000, 11), (abjad.NamedPitch("ef'"),) - ), - abjadext.nauert.PitchedQEvent( + nauert.PitchedQEvent(abjad.Offset(0, 1), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(12000, 11)), + nauert.PitchedQEvent(abjad.Offset(30000, 11), (abjad.NamedPitch("cs'"),)), + nauert.PitchedQEvent(abjad.Offset(42000, 11), (abjad.NamedPitch("d'"),)), + nauert.PitchedQEvent(abjad.Offset(54000, 11), (abjad.NamedPitch("ef'"),)), + nauert.SilentQEvent(abjad.Offset(60000, 11)), + nauert.PitchedQEvent(abjad.Offset(84000, 11), (abjad.NamedPitch("ef'"),)), + nauert.PitchedQEvent( abjad.Offset(90000, 11), ( abjad.NamedPitch("c'"), @@ -53,14 +38,13 @@ def test_QEventSequence_from_tempo_scaled_leaves_01(): abjad.NamedPitch("e'"), ), ), - abjadext.nauert.TerminalQEvent(abjad.Offset(102000, 11)), + nauert.TerminalQEvent(abjad.Offset(102000, 11)), ) ) def test_QEventSequence_from_tempo_scaled_leaves_02(): staff = abjad.Staff([]) - staff.append(abjad.Note(0, (1, 4))) staff.append(abjad.Rest((1, 4))) staff.append(abjad.Rest((1, 8))) @@ -73,38 +57,26 @@ def test_QEventSequence_from_tempo_scaled_leaves_02(): staff.append(abjad.Rest((1, 4))) staff.append(abjad.Note(3, (1, 8))) staff.append(abjad.Chord([0, 1, 4], (1, 4))) - abjad.tie(staff[3:5]) abjad.tie(staff[5:7]) - tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 58) abjad.attach(tempo, staff[0], context="Staff") tempo = abjad.MetronomeMark(abjad.Duration(1, 4), 77) abjad.attach(tempo, staff[9], context="Staff") - leaves = abjad.select.leaves(staff) - q_events = abjadext.nauert.QEventSequence.from_tempo_scaled_leaves(leaves) - - assert q_events == abjadext.nauert.QEventSequence( + q_events = nauert.QEventSequence.from_tempo_scaled_leaves(leaves) + assert q_events == nauert.QEventSequence( ( - abjadext.nauert.PitchedQEvent( - abjad.Offset(0, 1), (abjad.NamedPitch("c'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(30000, 29)), - abjadext.nauert.PitchedQEvent( - abjad.Offset(75000, 29), (abjad.NamedPitch("cs'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(105000, 29), (abjad.NamedPitch("d'"),) - ), - abjadext.nauert.PitchedQEvent( - abjad.Offset(135000, 29), (abjad.NamedPitch("ef'"),) - ), - abjadext.nauert.SilentQEvent(abjad.Offset(150000, 29)), - abjadext.nauert.PitchedQEvent( + nauert.PitchedQEvent(abjad.Offset(0, 1), (abjad.NamedPitch("c'"),)), + nauert.SilentQEvent(abjad.Offset(30000, 29)), + nauert.PitchedQEvent(abjad.Offset(75000, 29), (abjad.NamedPitch("cs'"),)), + nauert.PitchedQEvent(abjad.Offset(105000, 29), (abjad.NamedPitch("d'"),)), + nauert.PitchedQEvent(abjad.Offset(135000, 29), (abjad.NamedPitch("ef'"),)), + nauert.SilentQEvent(abjad.Offset(150000, 29)), + nauert.PitchedQEvent( abjad.Offset(15600000, 2233), (abjad.NamedPitch("ef'"),) ), - abjadext.nauert.PitchedQEvent( + nauert.PitchedQEvent( abjad.Offset(16470000, 2233), ( abjad.NamedPitch("c'"), @@ -112,6 +84,6 @@ def test_QEventSequence_from_tempo_scaled_leaves_02(): abjad.NamedPitch("e'"), ), ), - abjadext.nauert.TerminalQEvent(abjad.Offset(18210000, 2233)), + nauert.TerminalQEvent(abjad.Offset(18210000, 2233)), ) ) diff --git a/tests/test_QGridContainer___copy__.py b/tests/test_QGridContainer___copy__.py index e0fdb23..d2a05cc 100644 --- a/tests/test_QGridContainer___copy__.py +++ b/tests/test_QGridContainer___copy__.py @@ -1,33 +1,32 @@ import copy import abjad -import abjadext.nauert +from abjadext import nauert def test_QGridContainer___copy___01(): - tree = abjadext.nauert.QGridContainer( + tree = nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf(abjad.Duration(1, 1)), - abjadext.nauert.QGridContainer( + nauert.QGridLeaf(abjad.Duration(1, 1)), + nauert.QGridContainer( (2, 1), children=[ - abjadext.nauert.QGridLeaf(abjad.Duration(3, 1)), - abjadext.nauert.QGridContainer( + nauert.QGridLeaf(abjad.Duration(3, 1)), + nauert.QGridContainer( (4, 1), children=[ - abjadext.nauert.QGridLeaf(abjad.Duration(1, 1)), - abjadext.nauert.QGridLeaf(abjad.Duration(1, 1)), - abjadext.nauert.QGridLeaf(abjad.Duration(1, 1)), + nauert.QGridLeaf(abjad.Duration(1, 1)), + nauert.QGridLeaf(abjad.Duration(1, 1)), + nauert.QGridLeaf(abjad.Duration(1, 1)), ], ), ], ), - abjadext.nauert.QGridLeaf(abjad.Duration(2, 1)), + nauert.QGridLeaf(abjad.Duration(2, 1)), ], ) copied = copy.deepcopy(tree) - assert format(tree) == format(copied) assert tree is not copied assert tree[0] is not copied[0] diff --git a/tests/test_QGridContainer___eq__.py b/tests/test_QGridContainer___eq__.py index ec54828..22792fb 100644 --- a/tests/test_QGridContainer___eq__.py +++ b/tests/test_QGridContainer___eq__.py @@ -1,45 +1,42 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGridContainer___eq___01(): - a = abjadext.nauert.QGridContainer((1, 1), children=[]) - b = abjadext.nauert.QGridContainer((1, 1), children=[]) - + a = nauert.QGridContainer((1, 1), children=[]) + b = nauert.QGridContainer((1, 1), children=[]) assert format(a) == format(b) assert a != b def test_QGridContainer___eq___02(): - a = abjadext.nauert.QGridContainer( + a = nauert.QGridContainer( (1, 1), - children=[abjadext.nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], + children=[nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], ) - b = abjadext.nauert.QGridContainer( + b = nauert.QGridContainer( (1, 1), - children=[abjadext.nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], + children=[nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], ) - assert format(a) == format(b) assert a != b def test_QGridContainer___eq___03(): - a = abjadext.nauert.QGridContainer((1, 1), children=[]) - b = abjadext.nauert.QGridContainer((2, 1), children=[]) - c = abjadext.nauert.QGridContainer( + a = nauert.QGridContainer((1, 1), children=[]) + b = nauert.QGridContainer((2, 1), children=[]) + c = nauert.QGridContainer( (1, 1), - children=[abjadext.nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], + children=[nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], ) - d = abjadext.nauert.QGridContainer( + d = nauert.QGridContainer( (2, 1), - children=[abjadext.nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], + children=[nauert.QGridLeaf(preprolated_duration=abjad.Duration(1, 1))], ) - e = abjadext.nauert.QGridContainer( + e = nauert.QGridContainer( (2, 1), - children=[abjadext.nauert.QGridLeaf(abjad.Duration(2))], + children=[nauert.QGridLeaf(abjad.Duration(2))], ) - assert a != b assert a != c assert a != d diff --git a/tests/test_QGridLeaf___copy__.py b/tests/test_QGridLeaf___copy__.py index b60a844..e8ed1ed 100644 --- a/tests/test_QGridLeaf___copy__.py +++ b/tests/test_QGridLeaf___copy__.py @@ -1,11 +1,11 @@ import copy import abjad -import abjadext.nauert +from abjadext import nauert def test_QGridLeaf___copy___01(): - leaf = abjadext.nauert.QGridLeaf(abjad.Duration(1)) + leaf = nauert.QGridLeaf(abjad.Duration(1)) copied = copy.deepcopy(leaf) assert format(leaf) == format(copied) assert leaf != copied @@ -13,10 +13,10 @@ def test_QGridLeaf___copy___01(): def test_QGridLeaf___copy___02(): - sqe = abjadext.nauert.SilentQEvent(abjad.Offset(1000)) - leaf = abjadext.nauert.QGridLeaf( + sqe = nauert.SilentQEvent(abjad.Offset(1000)) + leaf = nauert.QGridLeaf( abjad.Duration(2), - [abjadext.nauert.QEventProxy(sqe, abjad.Offset(0.5))], + [nauert.QEventProxy(sqe, abjad.Offset(0.5))], ) copied = copy.deepcopy(leaf) assert format(leaf) == format(copied) diff --git a/tests/test_QGridLeaf___eq__.py b/tests/test_QGridLeaf___eq__.py index 56a3487..78d2b26 100644 --- a/tests/test_QGridLeaf___eq__.py +++ b/tests/test_QGridLeaf___eq__.py @@ -1,25 +1,25 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGridLeaf___eq___01(): - a = abjadext.nauert.QGridLeaf(abjad.Duration(1), []) - b = abjadext.nauert.QGridLeaf(abjad.Duration(1), []) + a = nauert.QGridLeaf(abjad.Duration(1), []) + b = nauert.QGridLeaf(abjad.Duration(1), []) assert format(a) == format(b) assert a != b def test_QGridLeaf___eq___02(): - a = abjadext.nauert.QGridLeaf(abjad.Duration(1), []) - sqe = abjadext.nauert.SilentQEvent(abjad.Offset(1000)) - b = abjadext.nauert.QGridLeaf( + a = nauert.QGridLeaf(abjad.Duration(1), []) + sqe = nauert.SilentQEvent(abjad.Offset(1000)) + b = nauert.QGridLeaf( abjad.Duration(1), - [abjadext.nauert.QEventProxy(sqe, abjad.Offset(0.5))], + [nauert.QEventProxy(sqe, abjad.Offset(0.5))], ) - c = abjadext.nauert.QGridLeaf(abjad.Duration(2), []) - d = abjadext.nauert.QGridLeaf( + c = nauert.QGridLeaf(abjad.Duration(2), []) + d = nauert.QGridLeaf( abjad.Duration(2), - [abjadext.nauert.QEventProxy(sqe, abjad.Offset(0.5))], + [nauert.QEventProxy(sqe, abjad.Offset(0.5))], ) assert a != b assert a != c diff --git a/tests/test_QGrid___call__.py b/tests/test_QGrid___call__.py index 6f340c6..7a3db7e 100644 --- a/tests/test_QGrid___call__.py +++ b/tests/test_QGrid___call__.py @@ -1,30 +1,26 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid___call___01(): - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) + q_grid = nauert.QGrid() + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) - ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) - ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.fit_q_events([a, b, c, d, e, f, g]) result = q_grid(abjad.Duration(1, 4)) assert len(result) == 1 @@ -40,31 +36,27 @@ def test_QGrid___call___01(): def test_QGrid___call___02(): - q_grid = abjadext.nauert.QGrid() + q_grid = nauert.QGrid() q_grid.subdivide_leaves([(0, (1, 1, 1))]) q_grid.subdivide_leaves([(1, (1, 1))]) q_grid.subdivide_leaves([(-2, (1, 1, 1))]) - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) - ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) - ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.fit_q_events([a, b, c, d, e, f, g]) result = q_grid(abjad.Duration(1, 4)) assert isinstance(result, list) and len(result) == 1 @@ -111,29 +103,25 @@ def test_QGrid___call___03(): """ Non-binary works too. """ - q_grid = abjadext.nauert.QGrid() + q_grid = nauert.QGrid() q_grid.subdivide_leaves([(0, (1, 1))]) - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) - ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) - ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.fit_q_events([a, b, c, d, e, f, g]) result = q_grid(abjad.Duration(1, 3)) assert isinstance(result, list) and len(result) == 1 diff --git a/tests/test_QGrid___copy__.py b/tests/test_QGrid___copy__.py index ac5f69f..5bb64ae 100644 --- a/tests/test_QGrid___copy__.py +++ b/tests/test_QGrid___copy__.py @@ -1,10 +1,10 @@ import copy -import abjadext.nauert +from abjadext import nauert def test_QGrid___copy___01(): - q_grid = abjadext.nauert.QGrid() + q_grid = nauert.QGrid() copied = copy.deepcopy(q_grid) assert format(q_grid) == format(copied) assert q_grid != copied diff --git a/tests/test_QGrid___eq__.py b/tests/test_QGrid___eq__.py index 8b80c93..f41a3ad 100644 --- a/tests/test_QGrid___eq__.py +++ b/tests/test_QGrid___eq__.py @@ -1,59 +1,59 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid___eq___01(): - a = abjadext.nauert.QGrid() - b = abjadext.nauert.QGrid() + a = nauert.QGrid() + b = nauert.QGrid() assert format(a) == format(b) assert a != b def test_QGrid___eq___02(): - a = abjadext.nauert.QGrid( - root_node=abjadext.nauert.QGridContainer( + a = nauert.QGrid( + root_node=nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(100)), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(100)), abjad.Offset(0.5), ) ], ) ], ), - next_downbeat=abjadext.nauert.QGridLeaf( + next_downbeat=nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) + nauert.QEventProxy( + nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) ) ], ), ) - b = abjadext.nauert.QGrid( - root_node=abjadext.nauert.QGridContainer( + b = nauert.QGrid( + root_node=nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(100)), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(100)), abjad.Offset(0.5), ) ], ) ], ), - next_downbeat=abjadext.nauert.QGridLeaf( + next_downbeat=nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) + nauert.QEventProxy( + nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) ) ], ), @@ -63,16 +63,16 @@ def test_QGrid___eq___02(): def test_QGrid___eq___03(): - a = abjadext.nauert.QGrid() - b = abjadext.nauert.QGrid( - root_node=abjadext.nauert.QGridContainer( + a = nauert.QGrid() + b = nauert.QGrid( + root_node=nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(100)), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(100)), abjad.Offset(0.5), ) ], @@ -80,37 +80,37 @@ def test_QGrid___eq___03(): ], ) ) - c = abjadext.nauert.QGrid( - next_downbeat=abjadext.nauert.QGridLeaf( + c = nauert.QGrid( + next_downbeat=nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) + nauert.QEventProxy( + nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) ) ], ) ) d = ( - abjadext.nauert.QGrid( - root_node=abjadext.nauert.QGridContainer( + nauert.QGrid( + root_node=nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(100)), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(100)), abjad.Offset(0.5), ) ], ) ], ), - next_downbeat=abjadext.nauert.QGridLeaf( + next_downbeat=nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.TerminalQEvent(abjad.Offset(200)), + nauert.QEventProxy( + nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9), ) ], diff --git a/tests/test_QGrid_distance.py b/tests/test_QGrid_distance.py index 8af0c4f..24217f2 100644 --- a/tests/test_QGrid_distance.py +++ b/tests/test_QGrid_distance.py @@ -1,50 +1,46 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid_distance_01(): - q_grid = abjadext.nauert.QGrid() + q_grid = nauert.QGrid() assert q_grid.distance is None - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) - ) + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) q_grid.fit_q_events([a]) assert q_grid.distance == abjad.Offset(0) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) q_grid.fit_q_events([b]) assert q_grid.distance == abjad.Offset(1, 40) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) q_grid.fit_q_events([c]) assert q_grid.distance == abjad.Offset(1, 6) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) q_grid.fit_q_events([d]) assert q_grid.distance == abjad.Offset(1, 4) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) q_grid.fit_q_events([e]) assert q_grid.distance == abjad.Offset(29, 100) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) q_grid.fit_q_events([f]) assert q_grid.distance == abjad.Offset(1, 4) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) - ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.fit_q_events([g]) assert q_grid.distance == abjad.Offset(3, 14) diff --git a/tests/test_QGrid_fit_q_events.py b/tests/test_QGrid_fit_q_events.py index 8893e02..9bd9b43 100644 --- a/tests/test_QGrid_fit_q_events.py +++ b/tests/test_QGrid_fit_q_events.py @@ -1,30 +1,26 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid_fit_q_events_01(): - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) + q_grid = nauert.QGrid() + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) - ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) - ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.fit_q_events([a, b, c, d, e, f, g]) assert q_grid.leaves[0].q_event_proxies == [a, b, c, d] assert q_grid.leaves[1].q_event_proxies == [e, f, g] diff --git a/tests/test_QGrid_pickle.py b/tests/test_QGrid_pickle.py index 1774690..31c98ff 100644 --- a/tests/test_QGrid_pickle.py +++ b/tests/test_QGrid_pickle.py @@ -1,30 +1,30 @@ import pickle import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid_pickle_01(): - q_grid = abjadext.nauert.QGrid( - root_node=abjadext.nauert.QGridContainer( + q_grid = nauert.QGrid( + root_node=nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(100)), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(100)), abjad.Offset(0.5), ) ], ) ], ), - next_downbeat=abjadext.nauert.QGridLeaf( + next_downbeat=nauert.QGridLeaf( preprolated_duration=abjad.Duration(1, 1), q_event_proxies=[ - abjadext.nauert.QEventProxy( - abjadext.nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) + nauert.QEventProxy( + nauert.TerminalQEvent(abjad.Offset(200)), abjad.Offset(0.9) ) ], ), diff --git a/tests/test_QGrid_subdivide_leaf.py b/tests/test_QGrid_subdivide_leaf.py index 51c17e9..ee64910 100644 --- a/tests/test_QGrid_subdivide_leaf.py +++ b/tests/test_QGrid_subdivide_leaf.py @@ -1,36 +1,32 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid_subdivide_leaf_01(): - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.PitchedQEvent(abjad.Offset(0), [0]), abjad.Offset(0) + q_grid = nauert.QGrid() + a = nauert.QEventProxy(nauert.PitchedQEvent(abjad.Offset(0), [0]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.PitchedQEvent(abjad.Offset(9, 20), [1]), abjad.Offset(9, 20) ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.PitchedQEvent(abjad.Offset(9, 20), [1]), abjad.Offset(9, 20) + c = nauert.QEventProxy( + nauert.PitchedQEvent(abjad.Offset(1, 2), [2]), abjad.Offset(1, 2) ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.PitchedQEvent(abjad.Offset(1, 2), [2]), abjad.Offset(1, 2) - ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.PitchedQEvent(abjad.Offset(11, 20), [3]), abjad.Offset(11, 20) - ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.PitchedQEvent(abjad.Offset(1), [4]), abjad.Offset(1) + d = nauert.QEventProxy( + nauert.PitchedQEvent(abjad.Offset(11, 20), [3]), abjad.Offset(11, 20) ) + e = nauert.QEventProxy(nauert.PitchedQEvent(abjad.Offset(1), [4]), abjad.Offset(1)) q_grid.leaves[0].q_event_proxies.extend([a, b, c, d]) q_grid.leaves[1].q_event_proxies.append(e) result = q_grid.subdivide_leaf(q_grid.leaves[0], (2, 3)) assert result == [a, b, c, d] - root_node = abjadext.nauert.QGridContainer( + root_node = nauert.QGridContainer( (1, 1), children=[ - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(2, 1), q_event_proxies=[] ), - abjadext.nauert.QGridLeaf( + nauert.QGridLeaf( preprolated_duration=abjad.Duration(3, 1), q_event_proxies=[] ), ], diff --git a/tests/test_QGrid_subdivide_leaves.py b/tests/test_QGrid_subdivide_leaves.py index bfc2614..158f178 100644 --- a/tests/test_QGrid_subdivide_leaves.py +++ b/tests/test_QGrid_subdivide_leaves.py @@ -1,30 +1,26 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QGrid_subdivide_leaves_01(): - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) + q_grid = nauert.QGrid() + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) - ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) - ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.leaves[0].q_event_proxies.extend([a, b, c, d]) q_grid.leaves[1].q_event_proxies.extend([e, f, g]) assert q_grid.root_node.rtm_format == "1" @@ -42,28 +38,24 @@ def test_QGrid_subdivide_leaves_01(): def test_QGrid_subdivide_leaves_02(): - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0) - ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) - ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) + q_grid = nauert.QGrid() + a = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0)) + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 20), ["B"]), abjad.Offset(1, 20) ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(9, 20), ["C"]), abjad.Offset(9, 20) ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["D"]), abjad.Offset(1, 2) ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(11, 20), ["E"]), abjad.Offset(11, 20) ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1) + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(19, 20), ["F"]), abjad.Offset(19, 20) ) + g = nauert.QEventProxy(nauert.SilentQEvent(abjad.Offset(1), ["G"]), abjad.Offset(1)) q_grid.leaves[0].q_event_proxies.extend([a, b, c, d]) q_grid.leaves[1].q_event_proxies.extend([e, f, g]) assert q_grid.root_node.rtm_format == "1" diff --git a/tests/test_QuantizationJob___call__.py b/tests/test_QuantizationJob___call__.py index 31d3aee..4a82e43 100644 --- a/tests/test_QuantizationJob___call__.py +++ b/tests/test_QuantizationJob___call__.py @@ -1,69 +1,69 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QuantizationJob___call___01(): job_id = 1 definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) + search_tree = nauert.UnweightedSearchTree(definition) q_event_proxies = [ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ), ] - job = abjadext.nauert.QuantizationJob(job_id, search_tree, q_event_proxies) + job = nauert.QuantizationJob(job_id, search_tree, q_event_proxies) job() assert len(job.q_grids) == 10 diff --git a/tests/test_QuantizationJob___init__.py b/tests/test_QuantizationJob___init__.py index 2509cce..f41a3cd 100644 --- a/tests/test_QuantizationJob___init__.py +++ b/tests/test_QuantizationJob___init__.py @@ -1,69 +1,69 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_QuantizationJob___init___01(): job_id = 1 definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) + search_tree = nauert.UnweightedSearchTree(definition) q_event_proxies = [ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ), ] - job = abjadext.nauert.QuantizationJob(job_id, search_tree, q_event_proxies) + job = nauert.QuantizationJob(job_id, search_tree, q_event_proxies) assert job.job_id == job_id assert job.search_tree == search_tree assert job.q_event_proxies == tuple(q_event_proxies) diff --git a/tests/test_QuantizationJob_pickle.py b/tests/test_QuantizationJob_pickle.py index 9ac91ab..bec702b 100644 --- a/tests/test_QuantizationJob_pickle.py +++ b/tests/test_QuantizationJob_pickle.py @@ -1,71 +1,71 @@ import pickle import abjad -import abjadext.nauert +from abjadext import nauert def test_QuantizationJob_pickle_01(): job_id = 1 definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) + search_tree = nauert.UnweightedSearchTree(definition) q_event_proxies = [ - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ), - abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ), ] - job = abjadext.nauert.QuantizationJob(job_id, search_tree, q_event_proxies) + job = nauert.QuantizationJob(job_id, search_tree, q_event_proxies) pickled = pickle.loads(pickle.dumps(job)) assert pickled is not job assert repr(pickled) == repr(job) diff --git a/tests/test_Quantizer___call__.py b/tests/test_Quantizer___call__.py index 9c53414..fc8d368 100644 --- a/tests/test_Quantizer___call__.py +++ b/tests/test_Quantizer___call__.py @@ -410,10 +410,9 @@ def test_Quantize_09(): ) assert False except TypeError as error: - assert ( - str(error) - == "BeatwiseQTarget is not supposed to be used together with MeasurewiseAttackPointOptimizer." - ) + string = "BeatwiseQTarget is not supposed to be used together" + string += " with MeasurewiseAttackPointOptimizer." + assert str(error) == string def test_Quantize_10(): diff --git a/tests/test_SerialJobHandler___call__.py b/tests/test_SerialJobHandler___call__.py index b798412..f13c777 100644 --- a/tests/test_SerialJobHandler___call__.py +++ b/tests/test_SerialJobHandler___call__.py @@ -3,13 +3,10 @@ class Job(nauert.QuantizationJob): - ### INITIALIZER ### def __init__(self, number): self.number = number - ### SPECIAL METHODS ### - def __call__(self): self.result = [ x for x in abjad.math.yield_all_compositions_of_integer(self.number) diff --git a/tests/test_UnweightedSearchTree___call__.py b/tests/test_UnweightedSearchTree___call__.py index 4206260..fb860fe 100644 --- a/tests/test_UnweightedSearchTree___call__.py +++ b/tests/test_UnweightedSearchTree___call__.py @@ -1,63 +1,63 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_UnweightedSearchTree___call___01(): definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + search_tree = nauert.UnweightedSearchTree(definition) + q_grid = nauert.QGrid() + a = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + g = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ) - h = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + h = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ) - i = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + i = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ) - j = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + j = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ) - k = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + k = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ) diff --git a/tests/test_UnweightedSearchTree___init__.py b/tests/test_UnweightedSearchTree___init__.py index 0af07f7..8ab38d4 100644 --- a/tests/test_UnweightedSearchTree___init__.py +++ b/tests/test_UnweightedSearchTree___init__.py @@ -1,12 +1,12 @@ -import abjadext.nauert +from abjadext import nauert def test_UnweightedSearchTree___init___01(): - search_tree = abjadext.nauert.UnweightedSearchTree() + search_tree = nauert.UnweightedSearchTree() assert search_tree.definition == search_tree.default_definition def test_UnweightedSearchTree___init___02(): definition = {2: None, 3: {2: None}} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) + search_tree = nauert.UnweightedSearchTree(definition) assert search_tree.definition == definition diff --git a/tests/test_UnweightedSearchTree__find_divisible_leaf_indices_and_subdivisions.py b/tests/test_UnweightedSearchTree__find_divisible_leaf_indices_and_subdivisions.py index 679ecc8..083a78d 100644 --- a/tests/test_UnweightedSearchTree__find_divisible_leaf_indices_and_subdivisions.py +++ b/tests/test_UnweightedSearchTree__find_divisible_leaf_indices_and_subdivisions.py @@ -1,63 +1,63 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_UnweightedSearchTree__find_divisible_leaf_indices_and_subdivisions_01(): definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"]), + search_tree = nauert.UnweightedSearchTree(definition) + q_grid = nauert.QGrid() + a = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"]), abjad.Offset(0), abjad.Offset(1), ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"]), + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"]), abjad.Offset(0), abjad.Offset(1), ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"]), + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"]), abjad.Offset(0), abjad.Offset(1), ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"]), + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"]), abjad.Offset(0), abjad.Offset(1), ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"]), + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"]), abjad.Offset(0), abjad.Offset(1), ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"]), + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"]), abjad.Offset(0), abjad.Offset(1), ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"]), + g = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"]), abjad.Offset(0), abjad.Offset(1), ) - h = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"]), + h = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"]), abjad.Offset(0), abjad.Offset(1), ) - i = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"]), + i = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"]), abjad.Offset(0), abjad.Offset(1), ) - j = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"]), + j = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"]), abjad.Offset(0), abjad.Offset(1), ) - k = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"]), + k = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"]), abjad.Offset(0), abjad.Offset(1), ) diff --git a/tests/test_UnweightedSearchTree__find_leaf_subdivisions.py b/tests/test_UnweightedSearchTree__find_leaf_subdivisions.py index 55c6fc7..11f47bb 100644 --- a/tests/test_UnweightedSearchTree__find_leaf_subdivisions.py +++ b/tests/test_UnweightedSearchTree__find_leaf_subdivisions.py @@ -1,10 +1,9 @@ -import abjadext.nauert +from abjadext import nauert def test_UnweightedSearchTree__find_leaf_subdivisions_01(): definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) - + search_tree = nauert.UnweightedSearchTree(definition) assert search_tree._find_leaf_subdivisions((1, (1, 2))) == ( (1, 1), (1, 1, 1), diff --git a/tests/test_UnweightedSearchTree__generate_all_subdivision_commands.py b/tests/test_UnweightedSearchTree__generate_all_subdivision_commands.py index 447a8bf..2c3cfa6 100644 --- a/tests/test_UnweightedSearchTree__generate_all_subdivision_commands.py +++ b/tests/test_UnweightedSearchTree__generate_all_subdivision_commands.py @@ -1,65 +1,65 @@ import copy import abjad -import abjadext.nauert +from abjadext import nauert def test_UnweightedSearchTree__generate_all_subdivision_commands_01(): definition = {2: {2: {2: None}, 3: None}, 5: None} - search_tree = abjadext.nauert.UnweightedSearchTree(definition) - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + search_tree = nauert.UnweightedSearchTree(definition) + q_grid = nauert.QGrid() + a = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + g = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ) - h = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + h = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ) - i = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + i = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ) - j = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + j = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ) - k = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + k = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ) diff --git a/tests/test_WeightedSearchTree___call__.py b/tests/test_WeightedSearchTree___call__.py index 66dc6eb..3bac7b5 100644 --- a/tests/test_WeightedSearchTree___call__.py +++ b/tests/test_WeightedSearchTree___call__.py @@ -1,63 +1,63 @@ import abjad -import abjadext.nauert +from abjadext import nauert def test_WeightedSearchTree___call___01(): definition = {"divisors": (2, 3, 5, 7), "max_depth": 3, "max_divisions": 2} - search_tree = abjadext.nauert.WeightedSearchTree(definition) - q_grid = abjadext.nauert.QGrid() - a = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), + search_tree = nauert.WeightedSearchTree(definition) + q_grid = nauert.QGrid() + a = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(0), ["A"], index=1), abjad.Offset(0), abjad.Offset(1), ) - b = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), + b = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 5), ["B"], index=2), abjad.Offset(0), abjad.Offset(1), ) - c = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), + c = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 4), ["C"], index=3), abjad.Offset(0), abjad.Offset(1), ) - d = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), + d = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 3), ["D"], index=4), abjad.Offset(0), abjad.Offset(1), ) - e = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), + e = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 5), ["E"], index=5), abjad.Offset(0), abjad.Offset(1), ) - f = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), + f = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1, 2), ["F"], index=6), abjad.Offset(0), abjad.Offset(1), ) - g = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), + g = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 5), ["G"], index=7), abjad.Offset(0), abjad.Offset(1), ) - h = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), + h = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(2, 3), ["H"], index=8), abjad.Offset(0), abjad.Offset(1), ) - i = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), + i = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(3, 4), ["I"], index=9), abjad.Offset(0), abjad.Offset(1), ) - j = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), + j = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(4, 5), ["J"], index=10), abjad.Offset(0), abjad.Offset(1), ) - k = abjadext.nauert.QEventProxy( - abjadext.nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), + k = nauert.QEventProxy( + nauert.SilentQEvent(abjad.Offset(1), ["K"], index=11), abjad.Offset(0), abjad.Offset(1), ) diff --git a/tests/test_WeightedSearchTree___init__.py b/tests/test_WeightedSearchTree___init__.py index f05d56d..37eb781 100644 --- a/tests/test_WeightedSearchTree___init__.py +++ b/tests/test_WeightedSearchTree___init__.py @@ -1,5 +1,5 @@ -import abjadext.nauert +from abjadext import nauert def test_WeightedSearchTree___init___01(): - abjadext.nauert.WeightedSearchTree() + nauert.WeightedSearchTree()