Skip to content

Commit ecfcff6

Browse files
committed
Merge branch 'master' into 5.x
# Conflicts: # README.md
2 parents 5e16b7f + d34dd6f commit ecfcff6

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

BTree.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Pod::Spec.new do |spec|
77
spec.watchos.deployment_target = "2.0"
88
spec.summary = 'Fast ordered collections for Swift using in-memory B-trees'
99
spec.author = 'Károly Lőrentey'
10-
spec.homepage = 'https://github.com/lorentey/BTree'
10+
spec.homepage = 'https://github.com/attaswift/BTree'
1111
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
12-
spec.source = { :git => 'https://github.com/lorentey/BTree.git',
12+
spec.source = { :git => 'https://github.com/attaswift/BTree.git',
1313
:tag => 'v' + String(spec.version) }
1414
spec.source_files = 'Sources/*.swift'
1515
spec.social_media_url = 'https://twitter.com/lorentey'

CHANGELOG.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This release contains the following changes:
88
- (Xcode project) The build number is now correctly set in the tvOS framework.
99
- (Xcode project) Code signing has been disabled, following Xcode 8 best practices.
1010

11-
[issue5]: https://github.com/lorentey/BTree/issues/5
11+
[issue5]: https://github.com/attaswift/BTree/issues/5
1212

1313
# 4.0.1 (2016-11-08)
1414

@@ -18,7 +18,7 @@ This is a quick bugfix release restoring support for the Swift Package Manager.
1818

1919
- [Issue #23][issue23]: BTree is not buildable with the Swift Package Manager
2020

21-
[issue23]: https://github.com/lorentey/BTree/issues/21
21+
[issue23]: https://github.com/attaswift/BTree/issues/21
2222

2323
# 4.0.0 (2016-11-07)
2424

@@ -55,9 +55,9 @@ This is a major release incorporating API-breaking changes. It also includes fix
5555
- [Issue #21][issue21]: BTree comparisons (subset/superset) may assert on certain shared subtrees
5656
- `SortedSet.update(with:)` now has a discardable result.
5757

58-
[issue19]: https://github.com/lorentey/BTree/issues/19
59-
[issue20]: https://github.com/lorentey/BTree/issues/20
60-
[issue21]: https://github.com/lorentey/BTree/issues/21
58+
[issue19]: https://github.com/attaswift/BTree/issues/19
59+
[issue20]: https://github.com/attaswift/BTree/issues/20
60+
[issue21]: https://github.com/attaswift/BTree/issues/21
6161

6262

6363
# 3.1.0 (2016-10-06)

README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Fast Sorted Collections for Swift<br>Using In-Memory B-Trees
22

33
[![Swift 4.0](https://img.shields.io/badge/Swift-4.0-blue.svg)](https://swift.org)
4-
[![License](https://img.shields.io/badge/licence-MIT-blue.svg)](https://github.com/lorentey/BTree/blob/master/LICENSE.md)
4+
[![License](https://img.shields.io/badge/licence-MIT-blue.svg)](https://github.com/attaswift/BTree/blob/master/LICENSE.md)
55
[![Platform](https://img.shields.io/badge/platforms-macOS%20∙%20iOS%20∙%20watchOS%20∙%20tvOS-blue.svg)](https://developer.apple.com/platforms/)
66

7-
[![Build Status](https://travis-ci.org/lorentey/BTree.svg?branch=master)](https://travis-ci.org/lorentey/BTree)
8-
[![Code Coverage](https://codecov.io/github/lorentey/BTree/coverage.svg?branch=master)](https://codecov.io/github/lorentey/BTree?branch=master)
7+
[![Build Status](https://travis-ci.org/attaswift/BTree.svg?branch=master)](https://travis-ci.org/attaswift/BTree)
8+
[![Code Coverage](https://codecov.io/github/attaswift/BTree/coverage.svg?branch=master)](https://codecov.io/github/attaswift/BTree?branch=master)
99

1010
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
1111
[![CocoaPod Version](https://img.shields.io/cocoapods/v/BTree.svg)](http://cocoapods.org/pods/BTree)
@@ -118,7 +118,7 @@ Each node in the tree also maintains the count of all elements under it.
118118
This makes the tree an [order statistic tree], where efficient positional lookup is possible.
119119

120120
[B-tree wiki]: https://en.wikipedia.org/wiki/B-tree
121-
[red-black tree]: https://github.com/lorentey/RedBlackTree
121+
[red-black tree]: https://github.com/attaswift/RedBlackTree
122122
[avl wiki]: https://en.wikipedia.org/wiki/AVL_tree
123123
[order statistic tree]: https://en.wikipedia.org/wiki/Order_statistic_tree
124124
[b-plus tree]: https://en.wikipedia.org/wiki/B%2B_tree
@@ -132,7 +132,7 @@ tree-based data structures. This is a result of the Swift engineering team spend
132132
> Indeed, the library lacks even a basic [double-ended queue][deque] construct --
133133
> although Cocoa's `Foundation` framework does include one in `NSArray`.
134134
135-
[deque]: https://github.com/lorentey/Deque
135+
[deque]: https://github.com/attaswift/Deque
136136

137137
However, some problems call for a wider variety of data structures.
138138

@@ -390,7 +390,7 @@ Let's enumerate:
390390
that you cannot mix-n-match trees of different orders.) Thus, on a 64-bit system, a B-tree
391391
holding `Int` elements will store about 2047 elements per node. Wow!
392392

393-
[bTreeNodeSize]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeNode.swift#L23
393+
[bTreeNodeSize]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeNode.swift#L23
394394

395395
- Individual B-tree nodes may be independently shared between multiple B-trees. When mutating a
396396
(partially or fully) shared tree, copy-on-write is restricted to only clone the nodes whose subtree is
@@ -465,17 +465,17 @@ Let's enumerate:
465465
to allow for super speedy elementwise insertions and removals. The counts are carefully recalculated
466466
whenever the path moves off a node's branch in the tree.
467467

468-
[BTreePath]: https://github.com/lorentey/BTree/blob/master/Sources/BTreePath.swift
469-
[BTreeWeakPath]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeIndex.swift#L87
470-
[BTreeStrongPath]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeIterator.swift#L74
471-
[BTreeCursorPath]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeCursor.swift#L96
468+
[BTreePath]: https://github.com/attaswift/BTree/blob/master/Sources/BTreePath.swift
469+
[BTreeWeakPath]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeIndex.swift#L87
470+
[BTreeStrongPath]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeIterator.swift#L74
471+
[BTreeCursorPath]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeCursor.swift#L96
472472

473473
- It would be overkill to create an explicit path to look up or modify a single element in the tree
474474
on its own, so `BTree` also provides a [set of recursive methods][BTree-lookups] that
475475
implement the same sort of lookups and simple mutations.
476476
They are faster when you need to retrieve a single item, but they aren't efficient when called repeatedly.
477477

478-
[BTree-lookups]: https://github.com/lorentey/BTree/blob/master/Sources/BTree.swift#L280-L419
478+
[BTree-lookups]: https://github.com/attaswift/BTree/blob/master/Sources/BTree.swift#L280-L419
479479

480480
- `BTree` includes a [bulk loading algorithm][BTree.bulkLoad] that efficiently initializes fully loaded
481481
trees from any sorted sequence. You can also specify a fill factor that's less than 100% if you expect to
@@ -488,7 +488,7 @@ Let's enumerate:
488488
appending entire B-trees. This comes useful in optimized tree merging algorithms.
489489

490490
[BTree.bulkLoad]: http://lorentey.github.io/BTree/api/Structs/BTree.html#/s:FV5BTree5BTreecuRd__s8SequenceWd__8Iterator7Element_zTxq__rFT14sortedElementsqd__14dropDuplicatesSb5orderSi10fillFactorSd_GS0_xq__
491-
[BTreeBuilder]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeBuilder.swift
491+
[BTreeBuilder]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeBuilder.swift
492492

493493
- [Constructing a B-tree from an unsorted sequence of elements][BTree.unsorted-load] inserts the elements into the tree one by
494494
one; no buffer is allocated to sort elements before loading them into the tree. This is done more
@@ -509,7 +509,7 @@ Let's enumerate:
509509
tree merging construct called [`BTreeMerger`][BTreeMerger].
510510

511511
[BTree]: http://lorentey.github.io/BTree/api/Structs/BTree.html
512-
[BTreeNode]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeNode.swift
512+
[BTreeNode]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeNode.swift
513513
[BTreeKeySelector]: http://lorentey.github.io/BTree/api/Enums/BTreeKeySelector.html
514514
[BTreeIterator]: http://lorentey.github.io/BTree/api/Structs/BTreeIterator.html
515515
[BTreeIndex]: http://lorentey.github.io/BTree/api/Structs/BTreeIndex.html
@@ -520,7 +520,7 @@ Let's enumerate:
520520
[BTree.subtree]: http://lorentey.github.io/BTree/api/Structs/BTree.html#/s:FV5BTree5BTree7subtreeFT4fromx2tox_GS0_xq__
521521
[BTree.union]: http://lorentey.github.io/BTree/api/Structs/BTree.html#/s:FV5BTree5BTree5unionFTGS0_xq__2byOS_21BTreeMatchingStrategy_GS0_xq__
522522
[BTree.symmetricDifference]: http://lorentey.github.io/BTree/api/Structs/BTree.html#/s:FV5BTree5BTree19symmetricDifferenceFTGS0_xq__2byOS_21BTreeMatchingStrategy_GS0_xq__
523-
[BTreeMerger]: https://github.com/lorentey/BTree/blob/master/Sources/BTreeMerger.swift#L318
523+
[BTreeMerger]: https://github.com/attaswift/BTree/blob/master/Sources/BTreeMerger.swift#L318
524524

525525
### <a name="generics">Remark on Performance of Imported Generics</a>
526526
<a name="perf"></a>

Tests/BTreeTests/ListTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class ListTests: XCTestCase {
462462
}
463463

464464
func test_Issue3_CrashInElementwiseAppend() {
465-
// https://github.com/lorentey/BTree/issues/3
465+
// https://github.com/attaswift/BTree/issues/3
466466
var list = List<String>()
467467
for i in 0 ..< 1000 {
468468
list.append("item \(i)")

generate-docs.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jazzy \
2121
--clean \
2222
--author "Károly Lőrentey" \
2323
--author_url "https://twitter.com/lorentey" \
24-
--github_url "https://github.com/lorentey/$module" \
25-
--github-file-prefix "https://github.com/lorentey/$module/tree/$ref" \
24+
--github_url "https://github.com/attaswift/$module" \
25+
--github-file-prefix "https://github.com/attaswift/$module/tree/$ref" \
2626
--module-version "$version" \
2727
--xcodebuild-arguments "-scheme,$scheme" \
2828
--module "$module" \

0 commit comments

Comments
 (0)