Merge branch 'master' into master

Author: TheIronBorn

.github/CONTRIBUTING.md

@@ -54,4 +54,4 @@ For the unit tests:
 
 ## Want to chat?
 
-This isn't just a repo with a bunch of code... If you want to learn more about how an algorithm works or want to discuss better ways of solving problems, then open a [Github issue](https://github.com/raywenderlich/swift-algorithm-club/issues) and we'll talk!
+This isn't just a repo with a bunch of code... If you want to learn more about how an algorithm works or want to discuss better ways of solving problems, then open a [Github issue](https://github.com/raywenderlich/swift-algorithm-club/issues) and we'll talk!

AVL Tree/AVLTree.playground/Sources/AVLTree.swift

@@ -341,11 +341,11 @@ extension AVLTree {
       }
     } else {
       // Handle stem cases
-      if let replacement = node.leftChild?.maximum() , replacement !== node {
+      if let replacement = node.leftChild?.maximum(), replacement !== node {
         node.key = replacement.key
         node.payload = replacement.payload
         delete(node: replacement)
-      } else if let replacement = node.rightChild?.minimum() , replacement !== node {
+      } else if let replacement = node.rightChild?.minimum(), replacement !== node {
         node.key = replacement.key
         node.payload = replacement.payload
         delete(node: replacement)
@@ -354,7 +354,6 @@ extension AVLTree {
   }
 }
 
-
 // MARK: - Debugging
 
 extension TreeNode: CustomDebugStringConvertible {

AVL Tree/AVLTree.swift

@@ -341,11 +341,11 @@ extension AVLTree {
       }
     } else {
       // Handle stem cases
-      if let replacement = node.leftChild?.maximum() , replacement !== node {
+      if let replacement = node.leftChild?.maximum(), replacement !== node {
         node.key = replacement.key
         node.payload = replacement.payload
         delete(node: replacement)
-      } else if let replacement = node.rightChild?.minimum() , replacement !== node {
+      } else if let replacement = node.rightChild?.minimum(), replacement !== node {
         node.key = replacement.key
         node.payload = replacement.payload
         delete(node: replacement)
@@ -354,7 +354,6 @@ extension AVLTree {
   }
 }
 
-
 // MARK: - Debugging
 
 extension TreeNode: CustomDebugStringConvertible {

AVL Tree/Tests/TreeNodeTests.swift

@@ -27,7 +27,6 @@ class TreeNodeTests: XCTestCase {
         super.tearDown()
     }
 
-
     func testSingleNodeCreationNOPayload() {
         let treeNode = TreeNode<String, String>(key: "Building")
         XCTAssertNil(treeNode.payload, "Payload for this case should be nil")

All-Pairs Shortest Paths/APSP/APSP/FloydWarshall.swift

@@ -175,7 +175,7 @@ public struct FloydWarshallResult<T>: APSPResult where T: Hashable {
   public func path(fromVertex from: Vertex<T>, toVertex to: Vertex<T>, inGraph graph: AbstractGraph<T>) -> [T]? {
 
     if let path = recursePathFrom(fromVertex: from, toVertex: to, path: [ to ], inGraph: graph) {
-      let pathValues = path.map() { vertex in
+      let pathValues = path.map { vertex in
         vertex.data
       }
       return pathValues

All-Pairs Shortest Paths/APSP/APSP/Helpers.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /**
  Print a matrix, optionally specifying only the cells to display with the triplet (i, j, k) -> matrix[i][j], matrix[i][k], matrix[k][j]
  */

Array2D/Array2D.playground/Contents.swift

@@ -7,13 +7,13 @@ public struct Array2D<T> {
   public let columns: Int
   public let rows: Int
   fileprivate var array: [T]
-  
+
   public init(columns: Int, rows: Int, initialValue: T) {
     self.columns = columns
     self.rows = rows
     array = .init(repeating: initialValue, count: rows*columns)
   }
-  
+
   public subscript(column: Int, row: Int) -> T {
     get {
       precondition(column < columns, "Column \(column) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")
@@ -28,7 +28,6 @@ public struct Array2D<T> {
   }
 }
 
-
 // initialization
 var matrix = Array2D(columns: 3, rows: 5, initialValue: 0)
 

Array2D/Array2D.swift

@@ -7,13 +7,13 @@ public struct Array2D<T> {
   public let columns: Int
   public let rows: Int
   fileprivate var array: [T]
-  
+
   public init(columns: Int, rows: Int, initialValue: T) {
     self.columns = columns
     self.rows = rows
     array = .init(repeating: initialValue, count: rows*columns)
   }
-  
+
   public subscript(column: Int, row: Int) -> T {
     get {
       precondition(column < columns, "Column \(column) Index is out of range. Array<T>(columns: \(columns), rows:\(rows))")

B-Tree/BTree.playground/Contents.swift

@@ -14,8 +14,7 @@ bTree[3]
 
 bTree.remove(2)
 
-bTree.traverseKeysInOrder {
-  key in
+bTree.traverseKeysInOrder { key in
   print(key)
 }