Merge pull request kodecocodes#2 from raywenderlich/master

update master

Author: JaapWijnen

Breadth-First Search/BreadthFirstSearch.playground/Pages/Simple example.xcplaygroundpage/Contents.swift

@@ -1,4 +1,4 @@
-func breadthFirstSearch(graph: Graph, source: Node) -> [String] {
+func breadthFirstSearch(_ graph: Graph, source: Node) -> [String] {
   var queue = Queue<Node>()
   queue.enqueue(source)
 

Breadth-First Search/BreadthFirstSearch.playground/Pages/Simple example.xcplaygroundpage/timeline.xctimeline

@@ -1,11 +1,11 @@
 public class Edge: Equatable {
   public var neighbor: Node
 
-  public init(neighbor: Node) {
+  public init(_ neighbor: Node) {
     self.neighbor = neighbor
   }
 }
 
-public func == (lhs: Edge, rhs: Edge) -> Bool {
+public func == (_ lhs: Edge, rhs: Edge) -> Bool {
   return lhs.neighbor == rhs.neighbor
 }

Breadth-First Search/BreadthFirstSearch.playground/Sources/Edge.swift

@@ -5,14 +5,14 @@ public class Graph: CustomStringConvertible, Equatable {
     self.nodes = []
   }
 
-  public func addNode(label: String) -> Node {
-    let node = Node(label: label)
+  public func addNode(_ label: String) -> Node {
+    let node = Node(label)
     nodes.append(node)
     return node
   }
 
-  public func addEdge(source: Node, neighbor: Node) {
-    let edge = Edge(neighbor: neighbor)
+  public func addEdge(_ source: Node, neighbor: Node) {
+    let edge = Edge(neighbor)
     source.neighbors.append(edge)
   }
 
@@ -27,7 +27,7 @@ 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!
   }
 
@@ -50,6 +50,6 @@ public class Graph: CustomStringConvertible, Equatable {
   }
 }
 
-public func == (lhs: Graph, rhs: Graph) -> Bool {
+public func == (_ lhs: Graph, rhs: Graph) -> Bool {
   return lhs.nodes == rhs.nodes
 }

Breadth-First Search/BreadthFirstSearch.playground/Sources/Graph.swift

@@ -5,7 +5,7 @@ public class Node: CustomStringConvertible, Equatable {
   public var distance: Int?
   public var visited: Bool
 
-  public init(label: String) {
+  public init(_ label: String) {
     self.label = label
     neighbors = []
     visited = false
@@ -22,11 +22,11 @@ public class Node: CustomStringConvertible, Equatable {
     return distance != nil
   }
 
-  public func remove(edge: Edge) {
-    neighbors.removeAtIndex(neighbors.indexOf { $0 === edge }!)
+  public func remove(_ edge: Edge) {
+    neighbors.remove(at: neighbors.index { $0 === edge }!)
   }
 }
 
-public func == (lhs: Node, rhs: Node) -> Bool {
+public func == (_ lhs: Node, rhs: Node) -> Bool {
   return lhs.label == rhs.label && lhs.neighbors == rhs.neighbors
 }

Breadth-First Search/BreadthFirstSearch.playground/Sources/Node.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/BreadthFirstSearch.playground/Sources/Queue.swift

@@ -1,4 +1,4 @@
-func breadthFirstSearch(graph: Graph, source: Node) -> [String] {
+func breadthFirstSearch(_ graph: Graph, source: Node) -> [String] {
   var queue = Queue<Node>()
   queue.enqueue(source)
 

Breadth-First Search/BreadthFirstSearch.swift

@@ -90,7 +90,7 @@ For an unweighted graph, this tree defines a shortest path from the starting nod
 Simple implementation of breadth-first search using a queue:
 
 ```swift
-func breadthFirstSearch(graph: Graph, source: Node) -> [String] {
+func breadthFirstSearch(_ graph: Graph, source: Node) -> [String] {
   var queue = Queue<Node>()
   queue.enqueue(source)
 

Breadth-First Search/README.markdown

@@ -1,16 +1,17 @@
 //: Playground - noun: a place where people can play
 
 extension String {
-  func indexOf(pattern: String) -> String.Index? {
-    for i in self.startIndex ..< self.endIndex {
+  func indexOf(_ pattern: String) -> String.Index? {
+    
+    for i in self.characters.indices {
       var j = i
       var found = true
-      for p in pattern.startIndex ..< pattern.endIndex {
-        if j == self.endIndex || self[j] != pattern[p] {
+      for p in pattern.characters.indices{
+        if j == self.characters.endIndex || self[j] != pattern[p] {
           found = false
           break
         } else {
-          j = j.successor()
+            j = self.characters.index(after: j)
         }
       }
       if found {