Merge pull request kodecocodes#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)
 }
 

Fizz Buzz/README.markdown

@@ -1,7 +1,7 @@
 /*
   Euclid's algorithm for finding the greatest common divisor
 */
-func gcd(m: Int, _ n: Int) -> Int {
+func gcd(_ m: Int, _ n: Int) -> Int {
   var a = 0
   var b = max(m, n)
   var r = min(m, n)
@@ -16,7 +16,7 @@ func gcd(m: Int, _ n: Int) -> Int {
 
 /*
 // 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)
@@ -29,6 +29,6 @@ func gcd(a: Int, _ b: Int) -> Int {
 /*
   Returns the least common multiple of two numbers.
 */
-func lcm(m: Int, _ n: Int) -> Int {
+func lcm(_ m: Int, _ n: Int) -> Int {
   return m*n / gcd(m, n)
 }

GCD/GCD.playground/Contents.swift

@@ -17,7 +17,7 @@ where `a % b` calculates the remainder of `a` divided by `b`.
 Here is an implementation of this idea in Swift:
 
 ```swift
-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)
@@ -68,7 +68,7 @@ gcd(841, 299)     // 1
 Here is a slightly different implementation of Euclid's algorithm. Unlike the first version this doesn't use recursion but only a basic `while` loop.
 
 ```swift
-func gcd(m: Int, _ n: Int) -> Int {
+func gcd(_ m: Int, _ n: Int) -> Int {
   var a = 0
   var b = max(m, n)
   var r = min(m, n)
@@ -101,7 +101,7 @@ We can calculate the LCM using Euclid's algorithm too:
 In code:
 
 ```swift
-func lcm(m: Int, _ n: Int) -> Int {
+func lcm(_ m: Int, _ n: Int) -> Int {
   return m*n / gcd(m, n)
 }
 ```

GCD/GCD.swift

@@ -1,129 +1,34 @@
 //: Playground - noun: a place where people can play
 
-public struct HashTable<Key: Hashable, Value> {
-  private typealias Element = (key: Key, value: Value)
-  private typealias Bucket = [Element]
-
-  private var buckets: [Bucket]
-  private(set) var count = 0
-
-  public init(capacity: Int) {
-    assert(capacity > 0)
-    buckets = .init(count: capacity, repeatedValue: [])
-  }
-
-  public var isEmpty: Bool {
-    return count == 0
-  }
-
-  private func indexForKey(key: Key) -> Int {
-    return abs(key.hashValue) % buckets.count
-  }
-}
-
-extension HashTable {
-  public subscript(key: Key) -> Value? {
-    get {
-      return valueForKey(key)
-    }
-    set {
-      if let value = newValue {
-        updateValue(value, forKey: key)
-      } else {
-        removeValueForKey(key)
-      }
-    }
-  }
-
-  public func valueForKey(key: Key) -> Value? {
-    let index = indexForKey(key)
-
-    for element in buckets[index] {
-      if element.key == key {
-        return element.value
-      }
-    }
-    return nil  // key not in hash table
-  }
-
-  public mutating func updateValue(value: Value, forKey key: Key) -> Value? {
-    let index = indexForKey(key)
-
-    // Do we already have this key in the bucket?
-    for (i, element) in buckets[index].enumerate() {
-      if element.key == key {
-        let oldValue = element.value
-        buckets[index][i].value = value
-        return oldValue
-      }
-    }
-
-    // This key isn't in the bucket yet; add it to the chain.
-    buckets[index].append((key: key, value: value))
-    count += 1
-    return nil
-  }
-
-  public mutating func removeValueForKey(key: Key) -> Value? {
-    let index = indexForKey(key)
-
-    // Find the element in the bucket's chain and remove it.
-    for (i, element) in buckets[index].enumerate() {
-      if element.key == key {
-        buckets[index].removeAtIndex(i)
-        count -= 1
-        return element.value
-      }
-    }
-    return nil  // key not in hash table
-  }
-
-  public mutating func removeAll() {
-    buckets = .init(count: buckets.count, repeatedValue: [])
-    count = 0
-  }
-}
-
-extension HashTable: CustomStringConvertible {
-  public var description: String {
-    return buckets.flatMap { b in b.map { e in "\(e.key) = \(e.value)" } }.joinWithSeparator(", ")
-  }
-}
-
-extension HashTable: CustomDebugStringConvertible {
-  public var debugDescription: String {
-    var s = ""
-    for (i, bucket) in buckets.enumerate() {
-      s += "bucket \(i): " + bucket.map { e in "\(e.key) = \(e.value)" }.joinWithSeparator(", ") + "\n"
-    }
-    return s
-  }
-}
-
-
-
 // Playing with hash values
+
 "firstName".hashValue
 abs("firstName".hashValue) % 5
+
 "lastName".hashValue
 abs("lastName".hashValue) % 5
+
 "hobbies".hashValue
 abs("hobbies".hashValue) % 5
 
-
-
 // Playing with the hash table
+
 var hashTable = HashTable<String, String>(capacity: 5)
 
 hashTable["firstName"] = "Steve"
 hashTable["lastName"] = "Jobs"
 hashTable["hobbies"] = "Programming Swift"
 
-hashTable.description
+print(hashTable)
 print(hashTable.debugDescription)
 
 let x = hashTable["firstName"]
 hashTable["firstName"] = "Tim"
+
 let y = hashTable["firstName"]
 hashTable["firstName"] = nil
+
 let z = hashTable["firstName"]
+
+print(hashTable)
+print(hashTable.debugDescription)