Merge branch 'master' into pr/1692

cuthbertLab · Apr 25, 2024 · cb0223e · cb0223e
2 parents 207d3a5 d33ca3c
commit cb0223e
Show file tree

Hide file tree

Showing 24 changed files with 229 additions and 155 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 18,7 @@ __pycache__/
 .idea/vcs.xml
 .idea/workspace.xml
 .idea/markdown-*.xml
 .idea/copilot
 
 # OSX
 .DS_Store

diff --git a/music21/analysis/reduceChords.py b/music21/analysis/reduceChords.py
@@ -384,8 384,7 @@ def procedure(timespan):
  )
  print(msg)
  # raise ChordReducerException(msg)
- if offset < previousTimespan.endTime:
- offset = previousTimespan.endTime
  offset = max(offset, previousTimespan.endTime)
  scoreTree.removeTimespan(group[0])
  subtree.removeTimespan(group[0])
  newTimespan = group[0].new(offset=offset)
@@ -542,8 541,7 @@ def reduceMeasureToNChords(
  measureObject.flatten().notes,
  weightAlgorithm,
  )
- if maximumNumberOfChords > len(chordWeights):
- maximumNumberOfChords = len(chordWeights)
  maximumNumberOfChords = min(maximumNumberOfChords, len(chordWeights))
  sortedChordWeights = sorted(
  chordWeights,
  key=chordWeights.get,

diff --git a/music21/analysis/reduceChordsOld.py b/music21/analysis/reduceChordsOld.py
@@ -86,8 86,7 @@ def reduceMeasureToNChords(self,
 
  chordWeights = self.computeMeasureChordWeights(mObj, weightAlgorithm)
 
- if numChords > len(chordWeights):
- numChords = len(chordWeights)
  numChords = min(numChords, len(chordWeights))
 
  maxNChords = sorted(chordWeights, key=chordWeights.get, reverse=True)[:numChords]
  if not maxNChords:

diff --git a/music21/analysis/windowed.py b/music21/analysis/windowed.py
@@ -193,10 193,8 @@ def analyze(self, windowSize, windowType='overlap'):
  elif windowType == 'noOverlap':
  start = 0
  end = start   windowSize
- i = 0
- while True:
- if end >= len(self._windowedStream):
- end = len(self._windowedStream)
  for i in range(windowCount):
  end = min(end, len(self._windowedStream))
 
  current = stream.Stream()
  for j in range(start, end):
@@ -210,9 208,6 @@ def analyze(self, windowSize, windowType='overlap'):
 
  start = end
  end = start   windowSize
- i  = 1
- if i >= windowCount:
- break
 
  elif windowType == 'adjacentAverage':
  # first get overlapping windows

diff --git a/music21/base.py b/music21/base.py
@@ -899,7 899,7 @@ def getOffsetBySite(
  returnSpecial: bool = False,
  ) -> OffsetQL|OffsetSpecial:
  return 0.0 # dummy until Astroid #1015 is fixed. Replace with ...
- # using bool instead of t.Literal[True] because of
  # using bool instead of t.Literal[True] because of other errors
 
  def getOffsetBySite(
  self,

diff --git a/music21/braille/text.py b/music21/braille/text.py
@@ -336,8 336,7 @@ def recenterHeadings(self):
  if self.allLines[i].isHeading:
  break
  lineLength = self.allLines[i].textLocation
- if lineLength > maxLineLength:
- maxLineLength = lineLength
  maxLineLength = max(maxLineLength, lineLength)
  for j in range(indexStart, indexFinal):
  brailleTextLine = self.allLines[j]
  lineStrToCenter = str(brailleTextLine)
@@ -565,12 564,10 @@ def insert(self, textLocation, text):
  '''
  if not self.canInsert(textLocation, text):
  raise BrailleTextException('Text cannot be inserted at specified location.')
- self.textLocation = textLocation
- for char in list(text):
- self.allChars[self.textLocation] = char
- self.textLocation  = 1
- if self.textLocation > self.highestUsedLocation:
- self.highestUsedLocation = self.textLocation
  for i, char in enumerate(text, start=textLocation):
  self.allChars[i] = char
  self.textLocation = textLocation   len(text)
  self.highestUsedLocation = max(self.highestUsedLocation, self.textLocation)
 
  def canAppend(self, text, addSpace=True):
  '''
@@ -600,10 597,7 @@ def canAppend(self, text, addSpace=True):
  >>> btl.canAppend('1234', addSpace=False)
  False
  '''
- if self.highestUsedLocation > self.textLocation:
- searchLocation = self.highestUsedLocation
- else:
- searchLocation = self.textLocation
  searchLocation = max(self.highestUsedLocation, self.textLocation)
  addSpaceAmount = 1 if addSpace else 0
  if (searchLocation   len(text)   addSpaceAmount) > self.lineLength:
  return False

diff --git a/music21/common/objects.py b/music21/common/objects.py
@@ -67,8 67,7 @@ class RelativeCounter(collections.Counter):
 
  def __iter__(self):
  sortedKeys = sorted(super().__iter__(), key=lambda x: self[x], reverse=True)
- for k in sortedKeys:
- yield k
  yield from sortedKeys
 
  def items(self):
  for k in self:

diff --git a/music21/features/jSymbolic.py b/music21/features/jSymbolic.py
@@ -3016,8 3016,7 @@ def process(self):
  for p in c.pitches:
  for gSub in p.groups:
  g.append(gSub) # add to temporary group; will act as a set
- if len(g) > found:
- found = len(g)
  found = max(found, len(g))
  self.feature.vector[0] = found
 
 

diff --git a/music21/figuredBass/realizer.py b/music21/figuredBass/realizer.py
@@ -186,10 186,7 @@ def addLyricsToBassNote(bassNote, notationString=None):
  n = notation.Notation(notationString)
  if not n.figureStrings:
  return
- maxLength = 0
- for fs in n.figureStrings:
- if len(fs) > maxLength:
- maxLength = len(fs)
  maxLength = max([len(fs) for fs in n.figureStrings])
  for fs in n.figureStrings:
  spacesInFront = ''
  for i in range(maxLength - len(fs)):

diff --git a/music21/harmony.py b/music21/harmony.py
@@ -1890,7 1890,7 @@ def _getKindFromShortHand(self, sH):
  for charString in getAbbreviationListGivenChordType(chordKind):
  if sH == charString:
  self.chordKind = chordKind
- return originalsH.replace(charString, '')
  return originalsH[len(sH):]
  return originalsH
 
  def _hasPitchAboveC4(self, pitches):
@@ -3162,6 3162,12 @@ def testExpressSusUsingAlterations(self):
 
  self.assertEqual(ch1.pitches, ch2.pitches)
 
  def testDoubledCharacters(self):
  ch1 = ChordSymbol('Co omit5')
  ch2 = ChordSymbol('Cdim omit5')
 
  self.assertEqual(ch1.pitches, ch2.pitches)
 
  def x_testPower(self):
  '''
  power chords should not have inversions

diff --git a/music21/humdrum/spineParser.py b/music21/humdrum/spineParser.py
@@ -401,8 401,7 @@ def parseEventListFromDataStream(self, dataStream=None):
  self.eventList.append(GlobalCommentLine(self.parsePositionInStream, line))
  else:
  thisLine = SpineLine(self.parsePositionInStream, line)
- if thisLine.numSpines > self.maxSpines:
- self.maxSpines = thisLine.numSpines
  self.maxSpines = max(self.maxSpines, thisLine.numSpines)
  self.eventList.append(thisLine)
  self.parsePositionInStream  = 1
  self.fileLength = self.parsePositionInStream

diff --git a/music21/musicxml/m21ToXml.py b/music21/musicxml/m21ToXml.py
@@ -1551,8 1551,7 @@ def setPartsAndRefStream(self) -> None:
  else:
  innerStream.transferOffsetToElements()
  ht = innerStream.highestTime
- if ht > self.highestTime:
- self.highestTime = ht
  self.highestTime = max(self.highestTime, ht)
  self.refStreamOrTimeRange = [0.0, self.highestTime]
  self.parts = list(s.parts)
 

diff --git a/music21/musicxml/xmlToM21.py b/music21/musicxml/xmlToM21.py
@@ -1967,8 1967,7 @@ def xmlMeasureToMeasure(self, mxMeasure: ET.Element) -> stream.Measure:
 
  self.lastMeasureParser = measureParser
 
- if measureParser.staves > self.maxStaves:
- self.maxStaves = measureParser.staves
  self.maxStaves = max(self.maxStaves, measureParser.staves)
 
  if measureParser.transposition is not None:
  self.updateTransposition(measureParser.transposition)

diff --git a/music21/note.py b/music21/note.py
@@ -871,7 871,7 @@ def fullName(self) -> str:
  @property
  def pitches(self) -> tuple[Pitch, ...]:
  '''
- Returns an empty tuple. (Useful for iterating over NotRests since they
  Returns an empty tuple. (Useful for iterating over GeneralNotes since they
  include Notes and Chords.)
  '''
  return ()

diff --git a/music21/scale/intervalNetwork.py b/music21/scale/intervalNetwork.py
@@ -828,8 828,8 @@ def degreeMin(self):
  for n in self.nodes.values():
  if x is None:
  x = n.degree
- if n.degree < x:
- x = n.degree
  else:
  x = min(x, n.degree)
  return x
 
  @property
@@ -847,8 847,8 @@ def degreeMax(self):
  for n in self.nodes.values():
  if x is None:
  x = n.degree
- if n.degree > x:
- x = n.degree
  else:
  x = max(x, n.degree)
  return x
 
  @property
@@ -870,8 870,8 @@ def degreeMaxUnique(self):
  continue
  if x is None:
  x = n.degree
- if n.degree > x:
- x = n.degree
  else:
  x = max(x, n.degree)
  return x
 
  @property

diff --git a/music21/stream/base.py b/music21/stream/base.py
@@ -2828,8 2828,7 @@ def insertAndShift(self, offsetOrItemOrList, itemOrNone=None):
  o = insertList[i]
  e = insertList[i 1]
  qL = e.duration.quarterLength
- if o qL > highestTimeInsert:
- highestTimeInsert = o qL
  highestTimeInsert = max(highestTimeInsert, o qL)
  if lowestOffsetInsert is None or o < lowestOffsetInsert:
  lowestOffsetInsert = o
  i = 2
@@ -8425,8 8424,7 @@ def highestTime(self):
  for e in self._elements:
  candidateOffset = (self.elementOffset(e)
  e.duration.quarterLength)
- if candidateOffset > highestTimeSoFar:
- highestTimeSoFar = candidateOffset
  highestTimeSoFar = max(highestTimeSoFar, candidateOffset)
  self._cache['HighestTime'] = opFrac(highestTimeSoFar)
  return self._cache['HighestTime']
 
@@ -11183,10 11181,7 @@ def makeVoices(self, *, inPlace=False, fillGaps=True):
  # environLocal.printDebug(['makeVoices(): olDict', olDict])
  # find the max necessary voices by finding the max number
  # of elements in each group; these may not all be necessary
- maxVoiceCount = 1
- for group in olDict.values():
- if len(group) > maxVoiceCount:
- maxVoiceCount = len(group)
  maxVoiceCount = max([len(group) for group in olDict.values()] [1])
  if maxVoiceCount == 1: # nothing to do here
  if not inPlace:
  return returnObj

diff --git a/music21/stream/iterator.py b/music21/stream/iterator.py
@@ -508,8 508,7 @@ def __contains__(self, item):
  def __reversed__(self):
  me = self.matchingElements()
  me.reverse()
- for item in me:
- yield item
  yield from me
 
  def clone(self: StreamIteratorType) -> StreamIteratorType:
  '''

diff --git a/music21/stream/makeNotation.py b/music21/stream/makeNotation.py
@@ -523,8 523,7 @@ def makeMeasures(
  refStreamHighestTime = refStreamOrTimeRange.highestTime
  else: # assume it's a list
  refStreamHighestTime = max(refStreamOrTimeRange)
- if refStreamHighestTime > oMax:
- oMax = refStreamHighestTime
  oMax = max(oMax, refStreamHighestTime)
 
  # create a stream of measures to contain the offsets range defined
  # create as many measures as needed to fit in oMax

diff --git a/music21/test/treeYield.py b/music21/test/treeYield.py
@@ -66,16 66,14 @@ def run(self, obj, memo=None):
  dictTuple = ('dict', keyX)
  self.stackVals.append(dictTuple)
  x = obj[keyX]
- for z in self.run(x, memo=memo):
- yield z
  yield from self.run(x, memo=memo)
  self.stackVals.pop()
 
  elif tObj in [list, tuple]:
  for i, x in enumerate(obj):
  listTuple = ('listLike', i)
  self.stackVals.append(listTuple)
- for z in self.run(x, memo=memo):
- yield z
  yield from self.run(x, memo=memo)
  self.stackVals.pop()
 
  else: # objects or uncaught types...
@@ -95,8 93,7 @@ def run(self, obj, memo=None):
  objTuple = ('getattr', x)
  self.stackVals.append(objTuple)
  try:
- for z in self.run(gotValue, memo=memo):
- yield z
  yield from self.run(gotValue, memo=memo)
  except RuntimeError:
  raise ValueError(f'Maximum recursion on:\n{self.currentLevel()}')
  self.stackVals.pop()

diff --git a/music21/tree/core.py b/music21/tree/core.py
@@ -519,12 519,10 @@ def __iter__(self):
  def recurse(node):
  if node is not None:
  if node.leftChild is not None:
- for n in recurse(node.leftChild):
- yield n
  yield from recurse(node.leftChild)
  yield node
  if node.rightChild is not None:
- for n in recurse(node.rightChild):
- yield n
  yield from recurse(node.rightChild)
  return recurse(self.rootNode)
 
  def populateFromSortedList(self, listOfTuples):

diff --git a/music21/tree/node.py b/music21/tree/node.py
@@ -273,18 273,14 @@ def updateEndTimes(self):
  leftChild = self.leftChild
  if leftChild:
  leftChild.updateEndTimes()
- if leftChild.endTimeLow < endTimeLow:
- endTimeLow = leftChild.endTimeLow
- if endTimeHigh < leftChild.endTimeHigh:
- endTimeHigh = leftChild.endTimeHigh
  endTimeLow = min(endTimeLow, leftChild.endTimeLow)
  endTimeHigh = max(endTimeHigh, leftChild.endTimeHigh)
 
  rightChild = self.rightChild
  if rightChild:
  rightChild.updateEndTimes()
- if rightChild.endTimeLow < endTimeLow:
- endTimeLow = rightChild.endTimeLow
- if endTimeHigh < rightChild.endTimeHigh:
- endTimeHigh = rightChild.endTimeHigh
  endTimeLow = min(endTimeLow, rightChild.endTimeLow)
  endTimeHigh = max(endTimeHigh, rightChild.endTimeHigh)
  self.endTimeLow = endTimeLow
  self.endTimeHigh = endTimeHigh
 
@@ -515,18 511,14 @@ def updateEndTimes(self):
  leftChild = self.leftChild
  if leftChild:
  leftChild.updateEndTimes()
- if leftChild.endTimeLow < endTimeLow:
- endTimeLow = leftChild.endTimeLow
- if endTimeHigh < leftChild.endTimeHigh:
- endTimeHigh = leftChild.endTimeHigh
  endTimeLow = min(endTimeLow, leftChild.endTimeLow)
  endTimeHigh = max(endTimeHigh, leftChild.endTimeHigh)
 
  rightChild = self.rightChild
  if rightChild:
  rightChild.updateEndTimes()
- if rightChild.endTimeLow < endTimeLow:
- endTimeLow = rightChild.endTimeLow
- if endTimeHigh < rightChild.endTimeHigh:
- endTimeHigh = rightChild.endTimeHigh
  endTimeLow = min(endTimeLow, rightChild.endTimeLow)
  endTimeHigh = max(endTimeHigh, rightChild.endTimeHigh)
  self.endTimeLow = endTimeLow
  self.endTimeHigh = endTimeHigh