Skip to content
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

Jump to bottom

Add a min-max heap implementation that can be used to back a priority queue #61

Merged
merged 63 commits into from
Aug 7, 2021
Merged

Add a min-max heap implementation that can be used to back a priority queue #61

merged 63 commits into from
Aug 7, 2021

Commits on Aug 6, 2021

  1. Add PriorityQueue implementation built on top of a MinMaxHeap

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    91b7e50 View commit details
    Browse the repository at this point in the history

  2. Merge MinMaxHeap into PriorityQueue

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    f81c588 View commit details
    Browse the repository at this point in the history

  3. Add unordered read-only view into underlying heap

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    c42096c View commit details
    Browse the repository at this point in the history

  4. Start filling in PriorityQueue benchmarks

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    107a9b4 View commit details
    Browse the repository at this point in the history

  5. Implement our own swapAt() 

    storage.swapAt exhibits excessive allocations
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    db87e18 View commit details
    Browse the repository at this point in the history

  6. Rename _delete(at:) to _remove(at:)

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    101bc2c View commit details
    Browse the repository at this point in the history

  7. Rename removeMin/removeMax -> popMin/popMax

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    1171c0a View commit details
    Browse the repository at this point in the history

  8. Use magic values 1, 2 to refer to the items in the first max level 

    Co-authored-by: Tim Vermeulen <tvermeulen@apple.com>
    @AquaGeek
    AquaGeek and Tim Vermeulen committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    11ba582 View commit details
    Browse the repository at this point in the history

  9. Specify logarithmic complexities as "O(log count) / 2" instead of "… 

    …O(log n)"

Co-authored-by: Tim Vermeulen <tvermeulen@apple.com>
    @AquaGeek
    AquaGeek and Tim Vermeulen committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    a9efa56 View commit details
    Browse the repository at this point in the history

  10. Clarify logic in popMax

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    919c019 View commit details
    Browse the repository at this point in the history

  11. Simplify logic in _remove(at:)

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    5cca169 View commit details
    Browse the repository at this point in the history

  12. Move the bounds checking into the various index computation methods 

    They will all now return `nil` for invalid indices.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    5b80eeb View commit details
    Browse the repository at this point in the history

  13. Floyd's heap construction algorithm should start from count/2 - 1

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    9fe1481 View commit details
    Browse the repository at this point in the history

  14. Add ObjC wrapper around CFBinaryHeap to benchmarks

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    1ceb496 View commit details
    Browse the repository at this point in the history

  15. Fix benchmarks that broke because of renames

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    9f319ab View commit details
    Browse the repository at this point in the history

  16. Add removeMin/removeMax

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    9182557 View commit details
    Browse the repository at this point in the history

  17. Make _minMaxHeapIsMinLevel an instance method

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    8e92d77 View commit details
    Browse the repository at this point in the history

  18. Split _indexOfChildOrGrandchild(of:sortedUsing:) into two separate fu… 

    …nctions

There is a large performance cost with passing a predicate function.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    18de4fc View commit details
    Browse the repository at this point in the history

  19. Defer comparing children when determining largest/smallest descendant 

    If the given index has 4 grandchildren, we can skip comparing the children.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    25b88e6 View commit details
    Browse the repository at this point in the history

  20. Added an iterator of the min and max views to the priority queue

    @AmanuelEphrem @AquaGeek
    AmanuelEphrem authored and AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    0b46a53 View commit details
    Browse the repository at this point in the history

  21. seperated iterator implementation into a new file

    @AmanuelEphrem @AquaGeek
    AmanuelEphrem authored and AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    daa4f94 View commit details
    Browse the repository at this point in the history

  22. Use renamed popMin/Max in Iterator instead of removeMin/Max

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    ee35cc1 View commit details
    Browse the repository at this point in the history

  23. Fix code formatting 

    Indentation of 2 spaces and 80 char column width
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    c095031 View commit details
    Browse the repository at this point in the history

  24. Add sequence initializer

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    6452adf View commit details
    Browse the repository at this point in the history

  25. Fix code formatting in benchmarks

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    4f6471f View commit details
    Browse the repository at this point in the history

  26. Fix benchmark names

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    309fa96 View commit details
    Browse the repository at this point in the history

  27. Remove init from Collection 

    This should already be handled by the init from Sequence
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    edc6bcd View commit details
    Browse the repository at this point in the history

  28. Add conformance to ExpressibleByArrayLiteral

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    43d13ea View commit details
    Browse the repository at this point in the history

  29. Move ExpressibleByArrayLiteral conformance to separate file

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    feb9b7c View commit details
    Browse the repository at this point in the history

  30. Update PriorityQueue's CMakeLists.txt

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    21efcf9 View commit details
    Browse the repository at this point in the history

  31. Make ascending and descending iterators public

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    e8501bc View commit details
    Browse the repository at this point in the history

  32. Inline ALL THE THINGS!

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    6cb5842 View commit details
    Browse the repository at this point in the history

  33. Iterative instead of recursive implementation, @inline(__always) a co… 

    …uple more critical functions.
    @hassila @AquaGeek
    hassila authored and AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    07f0649 View commit details
    Browse the repository at this point in the history

  34. Address PR feedback, thanks!

    @hassila @AquaGeek
    hassila authored and AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    fdcd604 View commit details
    Browse the repository at this point in the history

  35. Check invariants on insertion and deletion

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    593eadb View commit details
    Browse the repository at this point in the history

  36. Minor code formatting cleanup

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    021704b View commit details
    Browse the repository at this point in the history

  37. Add copyright header to test file

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    88faaee View commit details
    Browse the repository at this point in the history

  38. Fix missing empty line

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    2557ef1 View commit details
    Browse the repository at this point in the history

  39. Add naïve implementation of insert(contentsOf:)

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    a4f9ba0 View commit details
    Browse the repository at this point in the history

  40. Add documentation on complexity of init<S:Sequence>(_:)

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    69583d8 View commit details
    Browse the repository at this point in the history

  41. Cite source paper in documentation

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    b8507fa View commit details
    Browse the repository at this point in the history

  42. Rename PriorityQueue -> MinMaxHeap 

    We'll be reintroducing the PriorityQueue type as a wrapper.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    cb78920 View commit details
    Browse the repository at this point in the history

  43. Mark insert(contentsOf:) as inlinable 

    This results in ~10x speedup in my initial tests.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    f3349e5 View commit details
    Browse the repository at this point in the history

  44. Rename argument label "startingAt" -> "elementAt" 

    These functions used to be recursive, so "startingAt" made sense.
Now that they're iterative, we should fix the label.
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    2bc784a View commit details
    Browse the repository at this point in the history

  45. Remove coefficients from complexity docs

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    ceae6ea View commit details
    Browse the repository at this point in the history

  46. Make _minMaxHeapIsMinLevel take an index instead of a count

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    272bb02 View commit details
    Browse the repository at this point in the history

  47. Rename MinMaxHeap -> Heap

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    d1c529e View commit details
    Browse the repository at this point in the history

  48. Add documentation for Heap

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    d7bf55d View commit details
    Browse the repository at this point in the history

  49. Make Heap.Iterator init and direction internal

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    60b6ab2 View commit details
    Browse the repository at this point in the history

  50. Fix reference to queue in documentation 

    Co-authored-by: Dante Broggi <34220985+Dante-Broggi@users.noreply.github.com>
    @AquaGeek @Dante-Broggi
    AquaGeek and Dante-Broggi committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    c37395c View commit details
    Browse the repository at this point in the history

  51. Don't wrap integers in CFBinaryHeap benchmark in NSNumber

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    23dbd4f View commit details
    Browse the repository at this point in the history

  52. Avoid heap allocation altogether

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    7b633fd View commit details
    Browse the repository at this point in the history

  53. Add table with performance of operations

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    b7a0f7f View commit details
    Browse the repository at this point in the history

  54. Add heap performance graph

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    55538df View commit details
    Browse the repository at this point in the history

  55. Apply suggestions from code review 

    Co-authored-by: Karoy Lorentey <klorentey@apple.com>
    @AquaGeek @lorentey
    AquaGeek and lorentey committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    55b5500 View commit details
    Browse the repository at this point in the history

  56. Make _checkInvariants comments a doc comment

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    563c75e View commit details
    Browse the repository at this point in the history

  57. Split Heap.Iterator into two separate views 

    Adapted from Daryle Walker's (github.com/CTMacUser) suggestions
    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    42fbc80 View commit details
    Browse the repository at this point in the history

  58. Prefix heap storage variable with an underscore

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    32358a9 View commit details
    Browse the repository at this point in the history

  59. Update benchmark image

    @AquaGeek
    AquaGeek committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    7d1044e View commit details
    Browse the repository at this point in the history

  60. Fix Sources/PriorityQueueModule/CMakeLists.txt 

    Heap+Iterator.swift was renamed to Heap+OrderedViews.swift

Co-authored-by: Karoy Lorentey <klorentey@apple.com>
    @AquaGeek @lorentey
    AquaGeek and lorentey committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    bd1f007 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2021

  1. CFBinaryHeap is only available on Darwin

    @lorentey
    lorentey committed Aug 7, 2021
    Configuration menu
    Copy the full SHA
    c6a7954 View commit details
    Browse the repository at this point in the history

  2. CFBinaryHeap is only available on Darwin

    @lorentey
    lorentey committed Aug 7, 2021
    Configuration menu
    Copy the full SHA
    4bc94ac View commit details
    Browse the repository at this point in the history

  3. CFBinaryHeap is only available on Darwin

    @lorentey
    lorentey committed Aug 7, 2021
    Configuration menu
    Copy the full SHA
    083102e View commit details
    Browse the repository at this point in the history