Merge pull request #1621 from TimFelixBeyer/patch-13

Speed up hasElement by 2x

music21/stream/base.py

@@ -1434,7 +1434,7 @@ def mergeAttributes(self, other: base.Music21Object):
             if hasattr(other, attr):
                 setattr(self, attr, getattr(other, attr))
 
-    def hasElement(self, obj):
+    def hasElement(self, obj: base.Music21Object) -> bool:
         '''
         Return True if an element, provided as an argument, is contained in
         this Stream.
@@ -1449,8 +1449,16 @@ def hasElement(self, obj):
         >>> s.hasElement(n1)
         True
         '''
-        objId = id(obj)
-        return self.coreHasElementByMemoryLocation(objId)
+        if id(obj) in self._offsetDict:
+            return True
+
+        for e in self._elements:
+            if e is obj:  # pragma: no cover
+                return True
+        for e in self._endElements:
+            if e is obj:  # pragma: no cover
+                return True
+        return False
 
     def hasElementOfClass(self, className, forceFlat=False):
         '''

music21/stream/core.py

@@ -335,32 +335,6 @@ def coreCopyAsDerivation(self: M21ObjType,
             post.setDerivationMethod(methodName, recurse=True)
         return post
 
-    def coreHasElementByMemoryLocation(self, objId: int) -> bool:
-        '''
-        NB -- a "core" stream method that is not necessary for most users. use hasElement(obj)
-
-        Return True if an element object id, provided as an argument, is contained in this Stream.
-
-        >>> s = stream.Stream()
-        >>> n1 = note.Note('g')
-        >>> n2 = note.Note('g#')
-        >>> s.append(n1)
-        >>> s.coreHasElementByMemoryLocation(id(n1))
-        True
-        >>> s.coreHasElementByMemoryLocation(id(n2))
-        False
-        '''
-        if objId in self._offsetDict:
-            return True
-
-        for e in self._elements:
-            if id(e) == objId:  # pragma: no cover
-                return True
-        for e in self._endElements:
-            if id(e) == objId:  # pragma: no cover
-                return True
-        return False
-
     def coreGetElementByMemoryLocation(self, objId):
         '''
         NB -- a "core" stream method that is not necessary for most users.