Merge pull request #1 from raywenderlich/master

update fork

Author: JaapWijnen

Binary Tree/BinaryTree.playground/Contents.swift

@@ -53,26 +53,26 @@ tree.count  // 12
 
 
 extension BinaryTree {
-  public func traverseInOrder(@noescape process: T -> Void) {
+  public func traverseInOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
-      left.traverseInOrder(process)
+      left.traverseInOrder(process: process)
       process(value)
-      right.traverseInOrder(process)
+      right.traverseInOrder(process: process)
     }
   }
 
-  public func traversePreOrder(@noescape process: T -> Void) {
+  public func traversePreOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
       process(value)
-      left.traversePreOrder(process)
-      right.traversePreOrder(process)
+      left.traversePreOrder(process: process)
+      right.traversePreOrder(process: process)
     }
   }
 
-  public func traversePostOrder(@noescape process: T -> Void) {
+  public func traversePostOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
-      left.traversePostOrder(process)
-      right.traversePostOrder(process)
+      left.traversePostOrder(process: process)
+      right.traversePostOrder(process: process)
       process(value)
     }
   }

Binary Tree/README.markdown

@@ -111,26 +111,26 @@ Something you often need to do with trees is traverse them, i.e. look at all the
 Here is how you'd implement that:
 
 ```swift
-  public func traverseInOrder(@noescape process: T -> Void) {
+  public func traverseInOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
-      left.traverseInOrder(process)
+      left.traverseInOrder(process: process)
       process(value)
-      right.traverseInOrder(process)
+      right.traverseInOrder(process: process)
     }
   }
 
-  public func traversePreOrder(@noescape process: T -> Void) {
+  public func traversePreOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
       process(value)
-      left.traversePreOrder(process)
-      right.traversePreOrder(process)
+      left.traversePreOrder(process: process)
+      right.traversePreOrder(process: process)
     }
   }
 
-  public func traversePostOrder(@noescape process: T -> Void) {
+  public func traversePostOrder(process: (T) -> Void) {
     if case let .Node(left, value, right) = self {
-      left.traversePostOrder(process)
-      right.traversePostOrder(process)
+      left.traversePostOrder(process: process)
+      right.traversePostOrder(process: process)
       process(value)
     }
   }

Bounded Priority Queue/BoundedPriorityQueue.playground/Sources/BoundedPriorityQueue.swift

@@ -12,7 +12,7 @@ public class BoundedPriorityQueue<T: Comparable> {
   private typealias Node = LinkedListNode<T>
 
   private(set) public var count = 0
-  private var head: Node?
+  fileprivate var head: Node?
   private var tail: Node?
   private var maxElements: Int
 
@@ -28,7 +28,7 @@ public class BoundedPriorityQueue<T: Comparable> {
     return head?.value
   }
 
-  public func enqueue(value: T) {
+  public func enqueue(_ value: T) {
     if let node = insert(value, after: findInsertionPoint(value)) {
       // If the newly inserted node is the last one in the list, then update
       // the tail pointer.
@@ -44,7 +44,7 @@ public class BoundedPriorityQueue<T: Comparable> {
     }
   }
 
-  private func insert(value: T, after: Node?) -> Node? {
+  private func insert(_ value: T, after: Node?) -> Node? {
     if let previous = after {
 
       // If the queue is full and we have to insert at the end of the list,
@@ -78,11 +78,11 @@ public class BoundedPriorityQueue<T: Comparable> {
 
   /* Find the node after which to insert the new value. If this returns nil,
      the new value should be inserted at the head of the list. */
-  private func findInsertionPoint(value: T) -> Node? {
+  private func findInsertionPoint(_ value: T) -> Node? {
     var node = head
     var prev: Node? = nil
 
-    while let current = node where value < current.value {
+    while let current = node, value < current.value {
       prev = node
       node = current.next
     }

Bounded Priority Queue/README.markdown

@@ -35,7 +35,7 @@ public class BoundedPriorityQueue<T: Comparable> {
   private typealias Node = LinkedListNode<T>
 
   private(set) public var count = 0
-  private var head: Node?
+  fileprivate var head: Node?
   private var tail: Node?
   private var maxElements: Int
 
@@ -55,7 +55,7 @@ public class BoundedPriorityQueue<T: Comparable> {
 The `BoundedPriorityQueue` class contains a doubly linked list of `LinkedListNode` objects. Nothing special here yet. The fun stuff happens in the `enqueue()` method:
 
 ```swift
-public func enqueue(value: T) {
+public func enqueue(_ value: T) {
   if let node = insert(value, after: findInsertionPoint(value)) {
     // If the newly inserted node is the last one in the list, then update
     // the tail pointer.
@@ -71,7 +71,7 @@ public func enqueue(value: T) {
   }
 }
 
-private func insert(value: T, after: Node?) -> Node? {
+private func insert(_ value: T, after: Node?) -> Node? {
   if let previous = after {
 
     // If the queue is full and we have to insert at the end of the list,
@@ -105,7 +105,7 @@ private func insert(value: T, after: Node?) -> Node? {
 
 /* Find the node after which to insert the new value. If this returns nil,
    the new value should be inserted at the head of the list. */
-private func findInsertionPoint(value: T) -> Node? {
+private func findInsertionPoint(_ value: T) -> Node? {
   var node = head
   var prev: Node? = nil
 

Fizz Buzz/FizzBuzz.playground/Contents.swift

@@ -1,4 +1,4 @@
-func fizzBuzz(numberOfTurns: Int) {
+func fizzBuzz(_ numberOfTurns: Int) {
   for i in 1...numberOfTurns {
     var result = ""
 

Fizz Buzz/FizzBuzz.playground/playground.xcworkspace/contents.xcworkspacedata

@@ -1,4 +1,4 @@
-func fizzBuzz(numberOfTurns: Int) {
+func fizzBuzz(_ numberOfTurns: Int) {
   for i in 1...numberOfTurns {
     var result = ""
 

Fizz Buzz/FizzBuzz.playground/timeline.xctimeline

@@ -58,7 +58,7 @@ Finding numbers divisible by five:
 Here is a simple implementation in Swift:
 
 ```swift
-func fizzBuzz(numberOfTurns: Int) {
+func fizzBuzz(_ numberOfTurns: Int) {
   for i in 1...numberOfTurns {
     var result = ""
 

Fizz Buzz/FizzBuzz.swift

@@ -1,7 +1,7 @@
 //: Playground - noun: a place where people can play
 
 // Recursive version
-func gcd(a: Int, _ b: Int) -> Int {
+func gcd(_ a: Int, _ b: Int) -> Int {
   let r = a % b
   if r != 0 {
     return gcd(b, r)
@@ -26,7 +26,7 @@ func gcd(m: Int, _ n: Int) -> Int {
 }
 */
 
-func lcm(m: Int, _ n: Int) -> Int {
+func lcm(_ m: Int, _ n: Int) -> Int {
   return m*n / gcd(m, n)
 }