Merge pull request kodecocodes#267 from JaapWijnen/graph-swift3-migrate

kelvinlauKL · web-flow · commit 2924e181db5c · 2016-11-07T07:32:35.000-08:00
Migrate Graph to swift 3
diff --git a/Graph/Graph.playground/Contents.swift b/Graph/Graph.playground/Contents.swift
@@ -1,11 +1,7 @@
 import Graph
 
-// Create the vertices
-var adjacencyMatrixGraph = AdjacencyMatrixGraph<Int>()
-var adjacencyListGraph = AdjacencyListGraph<Int>()
-
-for graph in [ adjacencyMatrixGraph, adjacencyListGraph ] {
-
+for graph in [AdjacencyMatrixGraph<Int>(), AdjacencyListGraph<Int>()] {
+    
   let v1 = graph.createVertex(1)
   let v2 = graph.createVertex(2)
   let v3 = graph.createVertex(3)
diff --git a/Graph/Graph.playground/timeline.xctimeline b/Graph/Graph.playground/timeline.xctimeline
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Timeline
+   version = "3.0">
+   <TimelineItems>
+      <LoggerValueHistoryTimelineItem
+         documentLocation = "#CharacterRangeLen=12&amp;CharacterRangeLoc=1238&amp;EndingColumnNumber=15&amp;EndingLineNumber=38&amp;StartingColumnNumber=3&amp;StartingLineNumber=38&amp;Timestamp=498745868.545441"
+         selectedRepresentationIndex = "1"
+         shouldTrackSuperviewWidth = "NO">
+      </LoggerValueHistoryTimelineItem>
+   </TimelineItems>
+</Timeline>
diff --git a/Graph/Graph.xcodeproj/project.pbxproj b/Graph/Graph.xcodeproj/project.pbxproj
@@ -158,11 +158,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					49BFA2FC1CDF886B00522D66 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 					49BFA3061CDF886B00522D66 = {
 						CreatedOnToolsVersion = 7.3;
@@ -250,8 +251,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -298,8 +301,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -319,6 +324,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -328,6 +334,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -341,13 +348,15 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		49BFA3131CDF886B00522D66 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -360,6 +369,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.swift-algorithm-club.Graph";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
diff --git a/Graph/Graph.xcodeproj/xcshareddata/xcschemes/Graph.xcscheme b/Graph/Graph.xcodeproj/xcshareddata/xcschemes/Graph.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Graph/Graph.xcodeproj/xcshareddata/xcschemes/GraphTests.xcscheme b/Graph/Graph.xcodeproj/xcshareddata/xcschemes/GraphTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Graph/Graph/AdjacencyListGraph.swift b/Graph/Graph/AdjacencyListGraph.swift
@@ -7,7 +7,9 @@
 
 import Foundation
 
-private class EdgeList<T where T: Equatable, T: Hashable> {
+
+
+private class EdgeList<T> where T: Equatable, T: Hashable {
 
   var vertex: Vertex<T>
   var edges: [Edge<T>]? = nil
@@ -16,15 +18,15 @@ private class EdgeList<T where T: Equatable, T: Hashable> {
     self.vertex = vertex
   }
 
-  func addEdge(edge: Edge<T>) {
+  func addEdge(_ edge: Edge<T>) {
     edges?.append(edge)
   }
 
 }
 
-public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGraph<T> {
+open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashable {
 
-  private var adjacencyList: [EdgeList<T>] = []
+  fileprivate var adjacencyList: [EdgeList<T>] = []
 
   public required init() {
     super.init()
@@ -34,7 +36,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
     super.init(fromGraph: graph)
   }
 
-  public override var vertices: [Vertex<T>] {
+  open override var vertices: [Vertex<T>] {
     get {
       var vertices = [Vertex<T>]()
       for edgeList in adjacencyList {
@@ -44,7 +46,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
     }
   }
 
-  public override var edges: [Edge<T>] {
+  open override var edges: [Edge<T>] {
     get {
       var allEdges = Set<Edge<T>>()
       for edgeList in adjacencyList {
@@ -60,7 +62,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
     }
   }
 
-  public override func createVertex(data: T) -> Vertex<T> {
+  open override func createVertex(_ data: T) -> Vertex<T> {
     // check if the vertex already exists
     let matchingVertices = vertices.filter() { vertex in
       return vertex.data == data
@@ -76,24 +78,24 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
     return vertex
   }
 
-  public override func addDirectedEdge(from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {
+  open override func addDirectedEdge(_ from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {
     // works
     let edge = Edge(from: from, to: to, weight: weight)
     let edgeList = adjacencyList[from.index]
-    if edgeList.edges?.count > 0 {
-      edgeList.addEdge(edge)
+    if let _ = edgeList.edges {
+        edgeList.addEdge(edge)
     } else {
-      edgeList.edges = [edge]
+        edgeList.edges = [edge]
     }
   }
 
-  public override func addUndirectedEdge(vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {
+  open override func addUndirectedEdge(_ vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {
     addDirectedEdge(vertices.0, to: vertices.1, withWeight: weight)
     addDirectedEdge(vertices.1, to: vertices.0, withWeight: weight)
   }
 
 
-  public override func weightFrom(sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {
+  open override func weightFrom(_ sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {
     guard let edges = adjacencyList[sourceVertex.index].edges else {
       return nil
     }
@@ -107,11 +109,11 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
     return nil
   }
 
-  public override func edgesFrom(sourceVertex: Vertex<T>) -> [Edge<T>] {
+  open override func edgesFrom(_ sourceVertex: Vertex<T>) -> [Edge<T>] {
     return adjacencyList[sourceVertex.index].edges ?? []
   }
 
-  public override var description: String {
+  open override var description: String {
     get {
       var rows = [String]()
       for edgeList in adjacencyList {
@@ -129,10 +131,10 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap
           row.append(value)
         }
 
-        rows.append("\(edgeList.vertex.data) -> [\(row.joinWithSeparator(", "))]")
+        rows.append("\(edgeList.vertex.data) -> [\(row.joined(separator: ", "))]")
       }
 
-      return rows.joinWithSeparator("\n")
+      return rows.joined(separator: "\n")
     }
   }
 }
diff --git a/Graph/Graph/AdjacencyMatrixGraph.swift b/Graph/Graph/AdjacencyMatrixGraph.swift
@@ -7,12 +7,12 @@
 
 import Foundation
 
-public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGraph<T> {
+open class AdjacencyMatrixGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashable {
 
   // If adjacencyMatrix[i][j] is not nil, then there is an edge from
   // vertex i to vertex j.
-  private var adjacencyMatrix: [[Double?]] = []
-  private var _vertices: [Vertex<T>] = []
+  fileprivate var adjacencyMatrix: [[Double?]] = []
+  fileprivate var _vertices: [Vertex<T>] = []
 
   public required init() {
     super.init()
@@ -22,13 +22,13 @@ public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGr
     super.init(fromGraph: graph)
   }
 
-  public override var vertices: [Vertex<T>] {
+  open override var vertices: [Vertex<T>] {
     get {
       return _vertices
     }
   }
 
-  public override var edges: [Edge<T>] {
+  open override var edges: [Edge<T>] {
     get {
       var edges = [Edge<T>]()
       for row in 0 ..< adjacencyMatrix.count {
@@ -44,7 +44,7 @@ public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGr
 
   // Adds a new vertex to the matrix.
   // Performance: possibly O(n^2) because of the resizing of the matrix.
-  public override func createVertex(data: T) -> Vertex<T> {
+  open override func createVertex(_ data: T) -> Vertex<T> {
     // check if the vertex already exists
     let matchingVertices = vertices.filter() { vertex in
       return vertex.data == data
@@ -63,28 +63,28 @@ public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGr
     }
 
     // Add one new row at the bottom.
-    let newRow = [Double?](count: adjacencyMatrix.count + 1, repeatedValue: nil)
+    let newRow = [Double?](repeating: nil, count: adjacencyMatrix.count + 1)
     adjacencyMatrix.append(newRow)
 
     _vertices.append(vertex)
 
     return vertex
   }
 
-  public override func addDirectedEdge(from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {
+  open override func addDirectedEdge(_ from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {
     adjacencyMatrix[from.index][to.index] = weight
   }
 
-  public override func addUndirectedEdge(vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {
+  open override func addUndirectedEdge(_ vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {
     addDirectedEdge(vertices.0, to: vertices.1, withWeight: weight)
     addDirectedEdge(vertices.1, to: vertices.0, withWeight: weight)
   }
 
-  public override func weightFrom(sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {
+  open override func weightFrom(_ sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {
     return adjacencyMatrix[sourceVertex.index][destinationVertex.index]
   }
 
-  public override func edgesFrom(sourceVertex: Vertex<T>) -> [Edge<T>] {
+  open override func edgesFrom(_ sourceVertex: Vertex<T>) -> [Edge<T>] {
     var outEdges = [Edge<T>]()
     let fromIndex = sourceVertex.index
     for column in 0..<adjacencyMatrix.count {
@@ -95,7 +95,7 @@ public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGr
     return outEdges
   }
 
-  public override var description: String {
+  open override var description: String {
     get {
       var grid = [String]()
       let n = self.adjacencyMatrix.count
@@ -111,7 +111,7 @@ public class AdjacencyMatrixGraph<T where T: Equatable, T: Hashable>: AbstractGr
         }
         grid.append(row)
       }
-      return (grid as NSArray).componentsJoinedByString("\n")
+      return (grid as NSArray).componentsJoined(by: "\n")
     }
   }
 
diff --git a/Graph/Graph/Edge.swift b/Graph/Graph/Edge.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct Edge<T where T: Equatable, T: Hashable>: Equatable {
+public struct Edge<T>: Equatable where T: Equatable, T: Hashable {
 
   public let from: Vertex<T>
   public let to: Vertex<T>
@@ -35,7 +35,7 @@ extension Edge: Hashable {
     get {
       var string = "\(from.description)\(to.description)"
       if weight != nil {
-        string.appendContentsOf("\(weight!)")
+        string.append("\(weight!)")
       }
       return string.hashValue
     }
diff --git a/Graph/Graph/Graph.swift b/Graph/Graph/Graph.swift
diff --git a/Graph/Graph/Vertex.swift b/Graph/Graph/Vertex.swift
diff --git a/Graph/README.markdown b/Graph/README.markdown

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@`
`7`	`7`
`8`	`8`	`import Foundation`
`9`	`9`
`10`		`-private class EdgeList<T where T: Equatable, T: Hashable> {`
	`10`	`+`
	`11`	`+`
	`12`	`+private class EdgeList<T> where T: Equatable, T: Hashable {`
`11`	`13`
`12`	`14`	`var vertex: Vertex<T>`
`13`	`15`	`var edges: [Edge<T>]? = nil`
`@@ -16,15 +18,15 @@ private class EdgeList<T where T: Equatable, T: Hashable> {`
`16`	`18`	`self.vertex = vertex`
`17`	`19`	`}`
`18`	`20`
`19`		`- func addEdge(edge: Edge<T>) {`
	`21`	`+ func addEdge(_ edge: Edge<T>) {`
`20`	`22`	`edges?.append(edge)`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`}`
`24`	`26`
`25`		`-public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGraph<T> {`
	`27`	`+open class AdjacencyListGraph<T>: AbstractGraph<T> where T: Equatable, T: Hashable {`
`26`	`28`
`27`		`- private var adjacencyList: [EdgeList<T>] = []`
	`29`	`+ fileprivate var adjacencyList: [EdgeList<T>] = []`
`28`	`30`
`29`	`31`	`public required init() {`
`30`	`32`	`super.init()`
`@@ -34,7 +36,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`34`	`36`	`super.init(fromGraph: graph)`
`35`	`37`	`}`
`36`	`38`
`37`		`- public override var vertices: [Vertex<T>] {`
	`39`	`+ open override var vertices: [Vertex<T>] {`
`38`	`40`	`get {`
`39`	`41`	`var vertices = [Vertex<T>]()`
`40`	`42`	`for edgeList in adjacencyList {`
`@@ -44,7 +46,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
`47`		`- public override var edges: [Edge<T>] {`
	`49`	`+ open override var edges: [Edge<T>] {`
`48`	`50`	`get {`
`49`	`51`	`var allEdges = Set<Edge<T>>()`
`50`	`52`	`for edgeList in adjacencyList {`
`@@ -60,7 +62,7 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
`63`		`- public override func createVertex(data: T) -> Vertex<T> {`
	`65`	`+ open override func createVertex(_ data: T) -> Vertex<T> {`
`64`	`66`	`// check if the vertex already exists`
`65`	`67`	`let matchingVertices = vertices.filter() { vertex in`
`66`	`68`	`return vertex.data == data`
`@@ -76,24 +78,24 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`76`	`78`	`return vertex`
`77`	`79`	`}`
`78`	`80`
`79`		`- public override func addDirectedEdge(from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {`
	`81`	`+ open override func addDirectedEdge(_ from: Vertex<T>, to: Vertex<T>, withWeight weight: Double?) {`
`80`	`82`	`// works`
`81`	`83`	`let edge = Edge(from: from, to: to, weight: weight)`
`82`	`84`	`let edgeList = adjacencyList[from.index]`
`83`		`- if edgeList.edges?.count > 0 {`
`84`		`- edgeList.addEdge(edge)`
	`85`	`+ if let _ = edgeList.edges {`
	`86`	`+ edgeList.addEdge(edge)`
`85`	`87`	`} else {`
`86`		`- edgeList.edges = [edge]`
	`88`	`+ edgeList.edges = [edge]`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`
`90`		`- public override func addUndirectedEdge(vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {`
	`92`	`+ open override func addUndirectedEdge(_ vertices: (Vertex<T>, Vertex<T>), withWeight weight: Double?) {`
`91`	`93`	`addDirectedEdge(vertices.0, to: vertices.1, withWeight: weight)`
`92`	`94`	`addDirectedEdge(vertices.1, to: vertices.0, withWeight: weight)`
`93`	`95`	`}`
`94`	`96`
`95`	`97`
`96`		`- public override func weightFrom(sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {`
	`98`	`+ open override func weightFrom(_ sourceVertex: Vertex<T>, to destinationVertex: Vertex<T>) -> Double? {`
`97`	`99`	`guard let edges = adjacencyList[sourceVertex.index].edges else {`
`98`	`100`	`return nil`
`99`	`101`	`}`
`@@ -107,11 +109,11 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`107`	`109`	`return nil`
`108`	`110`	`}`
`109`	`111`
`110`		`- public override func edgesFrom(sourceVertex: Vertex<T>) -> [Edge<T>] {`
	`112`	`+ open override func edgesFrom(_ sourceVertex: Vertex<T>) -> [Edge<T>] {`
`111`	`113`	`return adjacencyList[sourceVertex.index].edges ?? []`
`112`	`114`	`}`
`113`	`115`
`114`		`- public override var description: String {`
	`116`	`+ open override var description: String {`
`115`	`117`	`get {`
`116`	`118`	`var rows = [String]()`
`117`	`119`	`for edgeList in adjacencyList {`
`@@ -129,10 +131,10 @@ public class AdjacencyListGraph<T where T: Equatable, T: Hashable>: AbstractGrap`
`129`	`131`	`row.append(value)`
`130`	`132`	`}`
`131`	`133`
`132`		`- rows.append("\(edgeList.vertex.data) -> [\(row.joinWithSeparator(", "))]")`
	`134`	`+ rows.append("\(edgeList.vertex.data) -> [\(row.joined(separator: ", "))]")`
`133`	`135`	`}`
`134`	`136`
`135`		`- return rows.joinWithSeparator("\n")`
	`137`	`+ return rows.joined(separator: "\n")`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`import Foundation`
`9`	`9`
`10`		`-public struct Edge<T where T: Equatable, T: Hashable>: Equatable {`
	`10`	`+public struct Edge<T>: Equatable where T: Equatable, T: Hashable {`
`11`	`11`
`12`	`12`	`public let from: Vertex<T>`
`13`	`13`	`public let to: Vertex<T>`
`@@ -35,7 +35,7 @@ extension Edge: Hashable {`
`35`	`35`	`get {`
`36`	`36`	`var string = "\(from.description)\(to.description)"`
`37`	`37`	`if weight != nil {`
`38`		`- string.appendContentsOf("\(weight!)")`
	`38`	`+ string.append("\(weight!)")`
`39`	`39`	`}`
`40`	`40`	`return string.hashValue`
`41`	`41`	`}`