Skip to content

GH-112498 Add heapremove and heapfix #112550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kristjanvalur wants to merge 15 commits into from
Closed

GH-112498 Add heapremove and heapfix #112550

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d1d7b6a
Add the heapremove() function
kristjanvalur Nov 28, 2023
344a35a
fixes
kristjanvalur Nov 28, 2023
5b79953
whitespace
kristjanvalur Nov 28, 2023
e4ffa87
Add operations count test
kristjanvalur Nov 28, 2023
2af67d7
documentation
kristjanvalur Nov 28, 2023
9a83767
fix doc
kristjanvalur Nov 28, 2023
c646dc3
use heapremove/heapfix as separate functions
kristjanvalur Nov 30, 2023
acd9e06
docs
kristjanvalur Nov 30, 2023
5cdb92a
whitespace
kristjanvalur Nov 30, 2023
b297445
fixup
kristjanvalur Dec 1, 2023
08cc0f6
Fix negative index heapremove
kristjanvalur Dec 1, 2023
352764b
heapremove now performs a comparison to do either "siftup" _or_ "sift…
kristjanvalur Jan 2, 2024
bbd45a7
remove heapq.heapfix()
kristjanvalur Jan 3, 2024
11dc5f9
Rename heapremove() to heapremove_index()
kristjanvalur Jan 3, 2024
7dbceb0
Add heapremove()
kristjanvalur Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
whitespace
  • Loading branch information
@kristjanvalur
kristjanvalur committed Jan 5, 2024
commit 5b79953a588ebc38ece23d522221b89a68614d78
7 changes: 3 additions & 4 deletions Lib/test/test_heapq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def test_remove(self):
self.module.heapremove(data, len(data))
with self.assertRaises(IndexError) as e:
self.module.heapremove(data, -len(data) - 1)

for i in range(len(data)):
i = random.randrange(-len(data), len(data))
if random.random() < 0.05:
Expand All @@ -291,7 +291,7 @@ def test_remove_replace(self):
self.module.heapremove(data, len(data))
with self.assertRaises(IndexError) as e:
self.module.heapremove(data, -len(data) - 1)

for i in range(200):
i = random.randrange(-len(data), len(data))
if random.random() < 0.05:
Expand All @@ -303,15 +303,14 @@ def test_remove_replace(self):
v = data[i]
assert self.module.heapremove(data, i, replace) is v
self.check_invariant(data)

self.assertEqual(len(data), 100)

def test_remove_replace_err(self):
data = [random.random() for i in range(100)]
self.module.heapify(data)
with self.assertRaisesRegex(TypeError, r"not supported.*'str' and 'float'"):
self.module.heapremove(data, 50, "foo")


class TestHeapPython(TestHeap, TestCase):
module = py_heapq
Expand Down