traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small code and comment cleanups

This commit is contained in:
Raymond Hettinger 2014-05-19 22:13:45 +01:00
parent 1f54814094
commit 356902dd75
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/heapq.py
View File

@ -141,9 +141,8 @@ def heappop(heap):
returnitem = heap[0] returnitem = heap[0]
heap[0] = lastelt heap[0] = lastelt
_siftup(heap, 0) _siftup(heap, 0)
else:
returnitem = lastelt
return returnitem return returnitem
return lastelt
def heapreplace(heap, item): def heapreplace(heap, item):
"""Pop and return the current smallest value, and add the new item. """Pop and return the current smallest value, and add the new item.
@ -357,14 +356,14 @@ def merge(*iterables):
# Algorithm notes for nlargest() and nsmallest() # Algorithm notes for nlargest() and nsmallest()
# ============================================== # ==============================================
# #
# Makes just a single pass over the data while keeping the k most extreme values # Make a single pass over the data while keeping the k most extreme values
# in a heap. Memory consumption is limited to keeping k values in a list. # in a heap. Memory consumption is limited to keeping k values in a list.
# #
# Measured performance for random inputs: # Measured performance for random inputs:
# #
# number of comparisons # number of comparisons
# n inputs k-extreme values (average of 5 trials) % more than min() # n inputs k-extreme values (average of 5 trials) % more than min()
# ------------- ---------------- - ------------------- ----------------- # ------------- ---------------- --------------------- -----------------
# 1,000 100 3,317 133.2% # 1,000 100 3,317 133.2%
# 10,000 100 14,046 40.5% # 10,000 100 14,046 40.5%
# 100,000 100 105,749 5.7% # 100,000 100 105,749 5.7%
@ -542,15 +541,6 @@ def nlargest(n, iterable, key=None):
if __name__ == "__main__": if __name__ == "__main__":
# Simple sanity test
heap = []
data = [1, 3, 5, 7, 9, 2, 4, 6, 8, 0]
for item in data:
heappush(heap, item)
sort = []
while heap:
sort.append(heappop(heap))
print(sort)
import doctest import doctest
doctest.testmod() doctest.testmod()