Merge pull request kodecocodes#1 from raywenderlich/master

update

Author: JaapWijnen

Breadth-First Search/Tests/Graph.swift

@@ -39,7 +39,7 @@ public class Node: CustomStringConvertible, Equatable {
   }
 
   public func remove(edge: Edge) {
-    neighbors.removeAtIndex(neighbors.indexOf { $0 === edge }!)
+    neighbors.remove(at: neighbors.index { $0 === edge }!)
   }
 }
 
@@ -56,13 +56,13 @@ public class Graph: CustomStringConvertible, Equatable {
     self.nodes = []
   }
 
-  public func addNode(label: String) -> Node {
+  public func addNode(_ label: String) -> Node {
     let node = Node(label: label)
     nodes.append(node)
     return node
   }
 
-  public func addEdge(source: Node, neighbor: Node) {
+  public func addEdge(_ source: Node, neighbor: Node) {
     let edge = Edge(neighbor: neighbor)
     source.neighbors.append(edge)
   }
@@ -78,15 +78,15 @@ public class Graph: CustomStringConvertible, Equatable {
     return description
   }
 
-  public func findNodeWithLabel(label: String) -> Node {
+  public func findNodeWithLabel(_ label: String) -> Node {
     return nodes.filter { $0.label == label }.first!
   }
 
   public func duplicate() -> Graph {
     let duplicated = Graph()
 
     for node in nodes {
-      duplicated.addNode(node.label)
+      let _ = duplicated.addNode(node.label)
     }
 
     for node in nodes {

Breadth-First Search/Tests/Queue.swift

@@ -13,7 +13,7 @@ public struct Queue<T> {
     return array.count
   }
 
-  public mutating func enqueue(element: T) {
+  public mutating func enqueue(_ element: T) {
     array.append(element)
   }
 

Breadth-First Search/Tests/Tests.xcodeproj/project.pbxproj

@@ -89,11 +89,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0820;
 					};
 				};
 			};
@@ -230,6 +231,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -242,6 +244,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Breadth-First Search/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Merge Sort/MergeSort.playground/Contents.swift

@@ -12,6 +12,9 @@ func merge<T: Comparable>(leftPile: [T], rightPile: [T]) -> [T] {
   var leftIndex = 0
   var rightIndex = 0
   var orderedPile = [T]()
+  if orderedPile.capacity < leftPile.count + rightPile.count {
+    orderedPile.reserveCapacity(leftPile.count + rightPile.count)
+  }
 
   while leftIndex < leftPile.count && rightIndex < rightPile.count {
     if leftPile[leftIndex] < rightPile[rightIndex] {

Merge Sort/MergeSort.swift

@@ -18,6 +18,9 @@ func merge<T: Comparable>(leftPile: [T], rightPile: [T]) -> [T] {
   var leftIndex = 0
   var rightIndex = 0
   var orderedPile = [T]()
+  if orderedPile.capacity < leftPile.count + rightPile.count {
+    orderedPile.reserveCapacity(leftPile.count + rightPile.count)
+  }
 
   while leftIndex < leftPile.count && rightIndex < rightPile.count {
     if leftPile[leftIndex] < rightPile[rightIndex] {

Threaded Binary Tree/README.markdown

@@ -158,31 +158,31 @@ outlined above.  We use these predecessor/successor attributes to great effect
 in this new algorithm for both forward and backward traversals:
 
 ```swift
-func traverseInOrderForward(visit: T -> Void) {
-  var n: ThreadedBinaryTree
-  n = minimum()
-  while true {
-    visit(n.value)
-    if let successor = n.successor() {
-      n = successor
-    } else {
-      break
+    public func traverseInOrderForward(_ visit: (T) -> Void) {
+        var n: ThreadedBinaryTree
+        n = minimum()
+        while true {
+            visit(n.value)
+            if let successor = n.successor() {
+                n = successor
+            } else {
+                break
+            }
+        }
     }
-  }
-}
 
-func traverseInOrderBackward(visit: T -> Void) {
-  var n: ThreadedBinaryTree
-  n = maximum()
-  while true {
-    visit(n.value)
-    if let predecessor = n.predecessor() {
-      n = predecessor
-    } else {
-      break
+    public func traverseInOrderBackward(_ visit: (T) -> Void) {
+        var n: ThreadedBinaryTree
+        n = maximum()
+        while true {
+            visit(n.value)
+            if let predecessor = n.predecessor() {
+                n = predecessor
+            } else {
+                break
+            }
+        }
     }
-  }
-}
 ```
 Again, this a method of `ThreadedBinaryTree`, so we'd call it via
 `node.traverseInorderForward(visitFunction)`.  Note that we are able to specify
@@ -221,7 +221,7 @@ continuously manage the `leftThread` and `rightThread` variables.  Rather than
 walking through some boring code, it is best to explain this with an example
 (although you can read through [the implementation](ThreadedBinaryTree.swift)
 if you want to know the finer details).  Please note that this requires
-knowledge of binary search trees, so make sure you have 
+knowledge of binary search trees, so make sure you have
 [read this first](../Binary Search Tree/).
 
 > Note: we do allow duplicate nodes in this implementation of a threaded binary
@@ -342,11 +342,12 @@ Many of these methods are inherent to binary search trees as well, so you can
 find [further documentation here](../Binary Search Tree/).
 
 
-## See also 
+## See also
 
 [Threaded Binary Tree on Wikipedia](https://en.wikipedia.org/wiki/Threaded_binary_tree)
 
 *Written for the Swift Algorithm Club by
 [Jayson Tung](https://github.com/JFTung)*
+*Migrated to Swift 3 by Jaap Wijnen*
 
 *Images made using www.draw.io*

Threaded Binary Tree/ThreadedBinaryTreeTests.swift renamed to Threaded Binary Tree/ThreadedBinaryTree.playground/Contents.swift

@@ -1,12 +1,8 @@
-/*
-  TESTS
-  I don't have access to an Apple computer, so I can't make a Playground or any
-  of that fancy stuff.  Here's a simple demonstration of the ThreadedBinaryTree
-  class.  It follows the examples in the README.
-*/
+//: Playground - noun: a place where people can play
+
 
 // Simple little debug function to make testing output pretty
-func check(tree: ThreadedBinaryTree<Int>?) {
+func check(_ tree: ThreadedBinaryTree<Int>?) {
   if let tree = tree {
     print("\(tree.count) Total Nodes:")
     print(tree)
@@ -27,9 +23,9 @@ func check(tree: ThreadedBinaryTree<Int>?) {
     } else {
       print("This is an INVALID threaded binary tree.")
     }
-  } else {
-    print("This tree is nil.")
-  }
+    } else {
+      print("This tree is nil.")
+    }
 }