fix bug in beams, restore standardDeviation as deprecated

cuthbertLab · Mar 17, 2018 · 8753ba9 · 8753ba9
1 parent a32b559
commit 8753ba9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/music21/common/numberTools.py b/music21/common/numberTools.py
@@ -17,6 +17,7 @@
 
 from fractions import Fraction
 from music21 import defaults
+from music21.common.decorators import deprecated
 
 __all__ = ['ordinals', 'musicOrdinals',
 
@@ -41,6 +42,7 @@
 
            'fromRoman', 'toRoman',
            'ordinalAbbreviation',
+           'standardDeviation',
            ]
 
 ordinals = ['Zeroth', 'First', 'Second', 'Third', 'Fourth', 'Fifth',
@@ -597,6 +599,25 @@ def nearestMultiple(n, unit):
         return matchHigh, round(matchHigh - n, 7), round(n - matchHigh, 7)
 
 
+@deprecated('2018-01-01 v5', '2018-08-01', 'use statistics.stdev instead')
+def standardDeviation(coll, bassel=False):
+    '''
+    DEPRECATED: use statistics.stdev instead.
+    
+    Given a collection of values, return the standard deviation.
+
+    :rtype: float
+    '''
+    avg = sum(coll) / float(len(coll))
+    diffColl = [math.pow(val - avg, 2) for val in coll]
+    # with a sample standard deviation (not a whole population)
+    # subtract 1 from the length
+    # this is bassel's correction
+    if bassel:
+        return math.sqrt(sum(diffColl) / float(len(diffColl) - 1))
+    else:
+        return math.sqrt(sum(diffColl) / float(len(diffColl)))
+
 def dotMultiplier(dots):
     '''
     dotMultiplier(dots) returns how long to multiply the note

diff --git a/music21/meter.py b/music21/meter.py
@@ -43,9 +43,12 @@
 
 
 validDenominators = [1, 2, 4, 8, 16, 32, 64, 128] # in order
-beamableDurationTypes = (duration.typeFromNumDict[8],
-            duration.typeFromNumDict[16], duration.typeFromNumDict[32],
-            duration.typeFromNumDict[64], duration.typeFromNumDict[128])
+beamableDurationTypes = (
+    duration.typeFromNumDict[8],
+    duration.typeFromNumDict[16], duration.typeFromNumDict[32],
+    duration.typeFromNumDict[64], duration.typeFromNumDict[128],
+    duration.typeFromNumDict[256],
+    )
 
 # also [pow(2,x) for x in range(8)]
 MIN_DENOMINATOR_TYPE = '128th'
@@ -2259,13 +2262,14 @@ def _getLevelList(self, levelCount, flat=True):
         '''
         Recursive utility function
 
-
         >>> b = meter.MeterSequence('4/4', 4)
         >>> b[1] = b[1].subdivide(2)
         >>> b[3] = b[3].subdivide(2)
         >>> b[3][0] = b[3][0].subdivide(2)
         >>> b
         <MeterSequence {1/4+{1/8+1/8}+1/4+{{1/16+1/16}+1/8}}>
+        >>> b._getLevelList(0)
+        [<MeterTerminal 1/4>, <MeterTerminal 1/4>, <MeterTerminal 1/4>, <MeterTerminal 1/4>]
         >>> meter.MeterSequence(b._getLevelList(0))
         <MeterSequence {1/4+1/4+1/4+1/4}>
         >>> meter.MeterSequence(b._getLevelList(1))
@@ -3780,6 +3784,8 @@ def fixBeamsOneElementDepth(i, el, depth):
                     # not archetypeSpanNext
                     #environLocal.printDebug(['matching partial left'])
                     beamType = 'partial-left'
+                elif (beamNext is None or beamNumber not in beamNext.getNumbers()):
+                    beamType = 'partial-right'
                 else:
                     beamType = 'start'
 
@@ -3870,7 +3876,7 @@ def _naiveBeams(srcList):
         staticmethod, does not need instance:
 
         >>> durList = [0, -1, -2, -3]
-        >>> srcList = [note.Note(quarterLength=2**x) for x in durList]
+        >>> srcList = [note.Note(quarterLength=2 ** x) for x in durList]
         >>> srcList.append(note.Rest(type='32nd'))
         >>> meter.TimeSignature._naiveBeams(srcList)
         [None,
@@ -4057,7 +4063,6 @@ def _mergeConnectingPartialBeams(beamsList):
                 thisBeam.direction = None
                 prevBeam.type = 'continue'
 
-
         return beamsList
 
     def setDisplay(self, value, partitionRequest=None):

diff --git a/music21/stream/makeNotation.py b/music21/stream/makeNotation.py
@@ -159,8 +159,8 @@ def makeBeams(s, *, inPlace=False):
             offset = 0.0
             if m.paddingLeft != 0.0:
                 offset = opFrac(m.paddingLeft)
-            elif (noteStream.highestTime < lastTimeSignature.barDuration.quarterLength):
-                offset = (lastTimeSignature.barDuration.quarterLength - noteStream.highestTime)
+            elif (noteStream.highestTime < barQL):
+                offset = barQL - noteStream.highestTime
 
             beamsList = lastTimeSignature.getBeams(noteStream, measureStartOffset=offset)
 
@@ -173,7 +173,7 @@ def makeBeams(s, *, inPlace=False):
 
     del mColl  # remove Stream no longer needed
 
-    s.streamStatus.beams = True
+    returnObj.streamStatus.beams = True
     if inPlace is not True:
         return returnObj