Merge pull request kodecocodes#345 from gonini/migration

vincentngo · web-flow · commit 11566eb26a4f · 2017-01-04T18:59:59.000-05:00
Update Minimum Spanning Tree (Unweighted Graph) to Swift 3 syntax
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ script:
 # - xcodebuild test -project ./K-Means/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Linked\ List/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./Longest\ Common\ Subsequence/Tests/Tests.xcodeproj -scheme Tests
-# - xcodebuild test -project ./Minimum\ Spanning\ Tree\ \(Unweighted\)/Tests/Tests.xcodeproj -scheme Tests
+- xcodebuild test -project ./Minimum\ Spanning\ Tree\ \(Unweighted\)/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Priority\ Queue/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./Queue/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Quicksort/Tests/Tests.xcodeproj -scheme Tests
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Pages/Minimum spanning tree example.xcplaygroundpage/Contents.swift b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Pages/Minimum spanning tree example.xcplaygroundpage/Contents.swift
@@ -1,4 +1,4 @@
-func breadthFirstSearchMinimumSpanningTree(graph: Graph, source: Node) -> Graph {
+func breadthFirstSearchMinimumSpanningTree(_ graph: Graph, source: Node) -> Graph {
   let minimumSpanningTree = graph.duplicate()
 
   var queue = Queue<Node>()
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Pages/Minimum spanning tree example.xcplaygroundpage/timeline.xctimeline b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Pages/Minimum spanning tree example.xcplaygroundpage/timeline.xctimeline
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/Graph.swift b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/Graph.swift
@@ -5,13 +5,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)
   }
@@ -27,15 +27,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)
+        _ = duplicated.addNode(node.label)
     }
 
     for node in nodes {
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/Node.swift b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/Node.swift
@@ -22,8 +22,8 @@ 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 }!)
   }
 }
 
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/Queue.swift b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.playground/Sources/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)
   }
 
diff --git a/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.swift b/Minimum Spanning Tree (Unweighted)/MinimumSpanningTree.swift
@@ -1,4 +1,4 @@
-func breadthFirstSearchMinimumSpanningTree(graph: Graph, source: Node) -> Graph {
+func breadthFirstSearchMinimumSpanningTree(_ graph: Graph, source: Node) -> Graph {
   let minimumSpanningTree = graph.duplicate()
 
   var queue = Queue<Node>()
diff --git a/Minimum Spanning Tree (Unweighted)/Tests/Graph.swift b/Minimum Spanning Tree (Unweighted)/Tests/Graph.swift
@@ -38,8 +38,8 @@ 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 }!)
   }
 }
 
@@ -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)
+      _ = duplicated.addNode(node.label)
     }
 
     for node in nodes {
diff --git a/Minimum Spanning Tree (Unweighted)/Tests/Queue.swift b/Minimum Spanning Tree (Unweighted)/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)
   }
 
diff --git a/Minimum Spanning Tree (Unweighted)/Tests/Tests.xcodeproj/project.pbxproj b/Minimum Spanning Tree (Unweighted)/Tests/Tests.xcodeproj/project.pbxproj
@@ -94,6 +94,7 @@
 				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;
 		};

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-func breadthFirstSearchMinimumSpanningTree(graph: Graph, source: Node) -> Graph {`
	`1`	`+func breadthFirstSearchMinimumSpanningTree(_ graph: Graph, source: Node) -> Graph {`
`2`	`2`	`let minimumSpanningTree = graph.duplicate()`
`3`	`3`
`4`	`4`	`var queue = Queue<Node>()`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ public class Graph: CustomStringConvertible, Equatable {`
`5`	`5`	`self.nodes = []`
`6`	`6`	`}`
`7`	`7`
`8`		`- public func addNode(label: String) -> Node {`
	`8`	`+ public func addNode(_ label: String) -> Node {`
`9`	`9`	`let node = Node(label: label)`
`10`	`10`	`nodes.append(node)`
`11`	`11`	`return node`
`12`	`12`	`}`
`13`	`13`
`14`		`- public func addEdge(source: Node, neighbor: Node) {`
	`14`	`+ public func addEdge(_ source: Node, neighbor: Node) {`
`15`	`15`	`let edge = Edge(neighbor: neighbor)`
`16`	`16`	`source.neighbors.append(edge)`
`17`	`17`	`}`
`@@ -27,15 +27,15 @@ public class Graph: CustomStringConvertible, Equatable {`
`27`	`27`	`return description`
`28`	`28`	`}`
`29`	`29`
`30`		`- public func findNodeWithLabel(label: String) -> Node {`
	`30`	`+ public func findNodeWithLabel(_ label: String) -> Node {`
`31`	`31`	`return nodes.filter { $0.label == label }.first!`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public func duplicate() -> Graph {`
`35`	`35`	`let duplicated = Graph()`
`36`	`36`
`37`	`37`	`for node in nodes {`
`38`		`- duplicated.addNode(node.label)`
	`38`	`+ _ = duplicated.addNode(node.label)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`for node in nodes {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public class Node: CustomStringConvertible, Equatable {`
`22`	`22`	`return distance != nil`
`23`	`23`	`}`
`24`	`24`
`25`		`- public func remove(edge: Edge) {`
`26`		`- neighbors.removeAtIndex(neighbors.indexOf { $0 === edge }!)`
	`25`	`+ public func remove(_ edge: Edge) {`
	`26`	`+ neighbors.remove(at: neighbors.index { $0 === edge }!)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public struct Queue<T> {`
`13`	`13`	`return array.count`
`14`	`14`	`}`
`15`	`15`
`16`		`- public mutating func enqueue(element: T) {`
	`16`	`+ public mutating func enqueue(_ element: T) {`
`17`	`17`	`array.append(element)`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class Node: CustomStringConvertible, Equatable {`
`38`	`38`	`return distance != nil`
`39`	`39`	`}`
`40`	`40`
`41`		`- public func remove(edge: Edge) {`
`42`		`- neighbors.removeAtIndex(neighbors.indexOf { $0 === edge }!)`
	`41`	`+ public func remove(_ edge: Edge) {`
	`42`	`+ neighbors.remove(at: neighbors.index { $0 === edge }!)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -56,13 +56,13 @@ public class Graph: CustomStringConvertible, Equatable {`
`56`	`56`	`self.nodes = []`
`57`	`57`	`}`
`58`	`58`
`59`		`- public func addNode(label: String) -> Node {`
	`59`	`+ public func addNode(_ label: String) -> Node {`
`60`	`60`	`let node = Node(label: label)`
`61`	`61`	`nodes.append(node)`
`62`	`62`	`return node`
`63`	`63`	`}`
`64`	`64`
`65`		`- public func addEdge(source: Node, neighbor: Node) {`
	`65`	`+ public func addEdge(_ source: Node, neighbor: Node) {`
`66`	`66`	`let edge = Edge(neighbor: neighbor)`
`67`	`67`	`source.neighbors.append(edge)`
`68`	`68`	`}`
`@@ -78,15 +78,15 @@ public class Graph: CustomStringConvertible, Equatable {`
`78`	`78`	`return description`
`79`	`79`	`}`
`80`	`80`
`81`		`- public func findNodeWithLabel(label: String) -> Node {`
	`81`	`+ public func findNodeWithLabel(_ label: String) -> Node {`
`82`	`82`	`return nodes.filter { $0.label == label }.first!`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public func duplicate() -> Graph {`
`86`	`86`	`let duplicated = Graph()`
`87`	`87`
`88`	`88`	`for node in nodes {`
`89`		`- duplicated.addNode(node.label)`
	`89`	`+ _ = duplicated.addNode(node.label)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`for node in nodes {`