From 533424037bf75a42b015eb690e0794ba0f9ec276 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Mon, 7 Nov 2016 16:44:04 +0100 Subject: [PATCH] SortedSet, SortedBag: Rename index finding methods Index manipulations in Swift use prepositions indicating horizontal or chronological placement (before/after), not vertical placement (above/below) --- Sources/SortedBag.swift | 8 ++++---- Sources/SortedSet.swift | 8 ++++---- Tests/SortedBagTests.swift | 16 ++++++++-------- Tests/SortedSetTests.swift | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/SortedBag.swift b/Sources/SortedBag.swift index 4211e03..325dbaf 100644 --- a/Sources/SortedBag.swift +++ b/Sources/SortedBag.swift @@ -451,7 +451,7 @@ extension SortedBag { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the bag.) /// /// - Complexity: O(log(`count`)) - public func lowestIndex(above element: Element) -> BTreeIndex? { + public func indexOfFirstElement(after element: Element) -> BTreeIndex? { let index = tree.index(forInserting: element, at: .last) if tree.offset(of: index) == tree.count { return nil } return index @@ -462,7 +462,7 @@ extension SortedBag { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the bag.) /// /// - Complexity: O(log(`count`)) - public func lowestIndex(notBelow element: Element) -> BTreeIndex? { + public func indexOfFirstElement(notBefore element: Element) -> BTreeIndex? { let index = tree.index(forInserting: element, at: .first) if tree.offset(of: index) == tree.count { return nil } return index @@ -473,7 +473,7 @@ extension SortedBag { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the bag.) /// /// - Complexity: O(log(`count`)) - public func highestIndex(below element: Element) -> BTreeIndex? { + public func indexOfLastElement(before element: Element) -> BTreeIndex? { var index = tree.index(forInserting: element, at: .first) if tree.offset(of: index) == 0 { return nil } tree.formIndex(before: &index) @@ -485,7 +485,7 @@ extension SortedBag { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the bag.) /// /// - Complexity: O(log(`count`)) - public func highestIndex(notAbove element: Element) -> BTreeIndex? { + public func indexOfLastElement(notAfter element: Element) -> BTreeIndex? { var index = tree.index(forInserting: element, at: .last) if tree.offset(of: index) == 0 { return nil } tree.formIndex(before: &index) diff --git a/Sources/SortedSet.swift b/Sources/SortedSet.swift index 3515175..ded97ff 100644 --- a/Sources/SortedSet.swift +++ b/Sources/SortedSet.swift @@ -429,7 +429,7 @@ extension SortedSet { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the set.) /// /// - Complexity: O(log(`count`)) - public func lowestIndex(above element: Element) -> BTreeIndex? { + public func indexOfFirstElement(after element: Element) -> BTreeIndex? { let index = tree.index(forInserting: element, at: .last) if tree.offset(of: index) == tree.count { return nil } return index @@ -440,7 +440,7 @@ extension SortedSet { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the set.) /// /// - Complexity: O(log(`count`)) - public func lowestIndex(notBelow element: Element) -> BTreeIndex? { + public func indexOfFirstElement(notBefore element: Element) -> BTreeIndex? { let index = tree.index(forInserting: element, at: .first) if tree.offset(of: index) == tree.count { return nil } return index @@ -451,7 +451,7 @@ extension SortedSet { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the set.) /// /// - Complexity: O(log(`count`)) - public func highestIndex(below element: Element) -> BTreeIndex? { + public func indexOfLastElement(before element: Element) -> BTreeIndex? { var index = tree.index(forInserting: element, at: .first) if tree.offset(of: index) == 0 { return nil } tree.formIndex(before: &index) @@ -463,7 +463,7 @@ extension SortedSet { /// This function never returns `endIndex`. (If it returns non-nil, the returned index can be used to subscript the set.) /// /// - Complexity: O(log(`count`)) - public func highestIndex(notAbove element: Element) -> BTreeIndex? { + public func indexOfLastElement(notAfter element: Element) -> BTreeIndex? { var index = tree.index(forInserting: element, at: .last) if tree.offset(of: index) == 0 { return nil } tree.formIndex(before: &index) diff --git a/Tests/SortedBagTests.swift b/Tests/SortedBagTests.swift index edd1d20..9dbf32f 100644 --- a/Tests/SortedBagTests.swift +++ b/Tests/SortedBagTests.swift @@ -363,12 +363,12 @@ class SortedBagTests: XCTestCase { } } - func test_lowestIndexAbove() { + func test_indexOfFirstElementAfter() { let c = 100 let bag = SortedBag((0 ..< c).map { 2 * $0 }.repeatEach(3)) for i in 0 ..< 2 * c { - let index = bag.lowestIndex(above: i) + let index = bag.indexOfFirstElement(after: i) if i < 2 * (c - 1) { XCTAssertNotNil(index) guard let index = index else { continue } @@ -381,12 +381,12 @@ class SortedBagTests: XCTestCase { } } - func test_lowestIndexNotBelow() { + func test_indexOfFirstElementNotBefore() { let c = 100 let bag = SortedBag((0 ..< c).map { 2 * $0 }.repeatEach(3)) for i in 0 ..< 2 * c { - let index = bag.lowestIndex(notBelow: i) + let index = bag.indexOfFirstElement(notBefore: i) if i < 2 * c - 1 { XCTAssertNotNil(index) guard let index = index else { continue } @@ -407,12 +407,12 @@ class SortedBagTests: XCTestCase { } } - func test_highestIndexBelow() { + func test_indexOfLastElementBefore() { let c = 100 let bag = SortedBag((0 ..< c).map { 2 * $0 }.repeatEach(3)) for i in -2 ..< 2 * c { - let index = bag.highestIndex(below: i) + let index = bag.indexOfLastElement(before: i) if i > 0 { XCTAssertNotNil(index) guard let index = index else { continue } @@ -433,12 +433,12 @@ class SortedBagTests: XCTestCase { } } - func test_highestIndexNotAbove() { + func test_indexOfLastElementNotAfter() { let c = 100 let bag = SortedBag((0 ..< c).map { 2 * $0 }.repeatEach(3)) for i in -2 ..< 2 * c { - let index = bag.highestIndex(notAbove: i) + let index = bag.indexOfLastElement(notAfter: i) if i >= 0 { XCTAssertNotNil(index) guard let index = index else { continue } diff --git a/Tests/SortedSetTests.swift b/Tests/SortedSetTests.swift index fb6bdfe..9f56392 100644 --- a/Tests/SortedSetTests.swift +++ b/Tests/SortedSetTests.swift @@ -320,12 +320,12 @@ class SortedSetTests: XCTestCase { } } - func test_lowestIndexAbove() { + func test_indexOfFirstElementAfter() { let c = 100 let set = SortedSet((0 ..< c).map { 2 * $0 }) for i in 0 ..< 2 * c { - let index = set.lowestIndex(above: i) + let index = set.indexOfFirstElement(after: i) if i < 2 * (c - 1) { XCTAssertNotNil(index) guard let index = index else { continue } @@ -343,12 +343,12 @@ class SortedSetTests: XCTestCase { } } - func test_lowestIndexNotBelow() { + func test_indexOfFirstElementNotBefore() { let c = 100 let set = SortedSet((0 ..< c).map { 2 * $0 }) for i in 0 ..< 2 * c { - let index = set.lowestIndex(notBelow: i) + let index = set.indexOfFirstElement(notBefore: i) if i < 2 * c - 1 { XCTAssertNotNil(index) guard let index = index else { continue } @@ -366,12 +366,12 @@ class SortedSetTests: XCTestCase { } } - func test_highestIndexBelow() { + func test_indexOfLastElementBefore() { let c = 100 let set = SortedSet((0 ..< c).map { 2 * $0 }) for i in -2 ..< 2 * c { - let index = set.highestIndex(below: i) + let index = set.indexOfLastElement(before: i) if i > 0 { XCTAssertNotNil(index) guard let index = index else { continue } @@ -389,12 +389,12 @@ class SortedSetTests: XCTestCase { } } - func test_highestIndexNotAbove() { + func test_indexOfLastElementNotAfter() { let c = 100 let set = SortedSet((0 ..< c).map { 2 * $0 }) for i in -2 ..< 2 * c { - let index = set.highestIndex(notAbove: i) + let index = set.indexOfLastElement(notAfter: i) if i >= 0 { XCTAssertNotNil(index) guard let index = index else { continue }