Merge branch 'rick527009-topological-sort'

Chris Pilcher · Chris Pilcher · commit 5f8f38404334 · 2016-10-25T21:36:52.000+13:00
diff --git a/.travis.yml b/.travis.yml
@@ -38,5 +38,5 @@ script:
 # - xcodebuild test -project ./Shortest\ Path\ \(Unweighted\)/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Single-Source\ Shortest\ Paths\ \(Weighted\)/SSSP.xcodeproj -scheme SSSPTests
 - xcodebuild test -project ./Stack/Tests/Tests.xcodeproj -scheme Tests
-# - xcodebuild test -project ./Topological\ Sort/Tests/Tests.xcodeproj -scheme Tests
+- xcodebuild test -project ./Topological\ Sort/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./Treap/Treap/Treap.xcodeproj -scheme Tests
diff --git a/Topological Sort/Graph.swift b/Topological Sort/Graph.swift
@@ -7,7 +7,7 @@ public class Graph: CustomStringConvertible {
     adjacencyLists = [Node : [Node]]()
   }
 
-  public func addNode(value: Node) -> Node {
+  public func addNode(_ value: Node) -> Node {
     adjacencyLists[value] = []
     return value
   }
diff --git a/Topological Sort/Tests/Tests.xcodeproj/project.pbxproj b/Topological Sort/Tests/Tests.xcodeproj/project.pbxproj
@@ -92,11 +92,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -157,8 +158,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 = "-";
@@ -201,8 +204,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 = "-";
@@ -221,6 +226,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -232,6 +238,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 = Debug;
 		};
@@ -243,6 +250,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;
 		};
diff --git a/Topological Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme b/Topological Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Topological Sort/Tests/TopologicalSortTests.swift b/Topological Sort/Tests/TopologicalSortTests.swift
@@ -2,9 +2,9 @@ import Foundation
 import XCTest
 
 extension Graph {
-  public func loadEdgeList(lines: [String]) {
+  public func loadEdgeList(_ lines: [String]) {
     for line in lines {
-      let items = line.componentsSeparatedByString(" ").filter { s in !s.isEmpty }
+      let items = line.components(separatedBy: " ").filter { s in !s.isEmpty }
       if adjacencyList(forNode: items[0]) == nil {
         addNode(items[0])
       }
@@ -20,10 +20,10 @@ class TopologicalSort: XCTestCase {
 
   // The topological sort is valid if a node does not have any of its
   // predecessors in its adjacency list.
-  func checkIsValidTopologicalSort(graph: Graph, _ a: [Graph.Node]) {
-    for i in (a.count - 1).stride(to: 0, by: -1) {
+  func checkIsValidTopologicalSort(_ graph: Graph, _ a: [Graph.Node]) {
+    for i in stride(from: (a.count - 1), to: 0, by: -1) {
       if let neighbors = graph.adjacencyList(forNode: a[i]) {
-        for j in (i - 1).stride(through: 0, by: -1) {
+        for j in stride(from: (i - 1), through: 0, by: -1) {
           XCTAssertFalse(neighbors.contains(a[j]), "\(a) is not a valid topological sort")
         }
       }
diff --git a/Topological Sort/Topological Sort.playground/Sources/Graph.swift b/Topological Sort/Topological Sort.playground/Sources/Graph.swift
@@ -7,7 +7,7 @@ public class Graph: CustomStringConvertible {
     adjacencyLists = [Node : [Node]]()
   }
 
-  public func addNode(value: Node) -> Node {
+  public func addNode(_ value: Node) -> Node {
     adjacencyLists[value] = []
     return value
   }
diff --git a/Topological Sort/Topological Sort.playground/Sources/TopologicalSort1.swift b/Topological Sort/Topological Sort.playground/Sources/TopologicalSort1.swift
@@ -1,10 +1,10 @@
 extension Graph {
-  private func depthFirstSearch(source: Node, inout visited: [Node : Bool]) -> [Node] {
+  private func depthFirstSearch(_ source: Node, visited: inout [Node : Bool]) -> [Node] {
     var result = [Node]()
 
     if let adjacencyList = adjacencyList(forNode: source) {
       for nodeInAdjacencyList in adjacencyList {
-        if let seen = visited[nodeInAdjacencyList] where !seen {
+        if let seen = visited[nodeInAdjacencyList], !seen {
           result = depthFirstSearch(nodeInAdjacencyList, visited: &visited) + result
         }
       }
diff --git a/Topological Sort/Topological Sort.playground/Sources/TopologicalSort3.swift b/Topological Sort/Topological Sort.playground/Sources/TopologicalSort3.swift
@@ -12,10 +12,10 @@ extension Graph {
       visited[node] = false
     }
 
-    func depthFirstSearch(source: Node) {
+    func depthFirstSearch(_ source: Node) {
       if let adjacencyList = adjacencyList(forNode: source) {
         for neighbor in adjacencyList {
-          if let seen = visited[neighbor] where !seen {
+          if let seen = visited[neighbor], !seen {
             depthFirstSearch(neighbor)
           }
         }
@@ -25,11 +25,11 @@ extension Graph {
     }
 
     for (node, _) in visited {
-      if let seen = visited[node] where !seen {
+      if let seen = visited[node], !seen {
         depthFirstSearch(node)
       }
     }
 
-    return stack.reverse()
+    return stack.reversed()
   }
 }
diff --git a/Topological Sort/TopologicalSort1.swift b/Topological Sort/TopologicalSort1.swift
@@ -1,10 +1,10 @@
 extension Graph {
-  private func depthFirstSearch(source: Node, inout visited: [Node : Bool]) -> [Node] {
+  private func depthFirstSearch(_ source: Node, visited: inout [Node : Bool]) -> [Node] {
     var result = [Node]()
 
     if let adjacencyList = adjacencyList(forNode: source) {
       for nodeInAdjacencyList in adjacencyList {
-        if let seen = visited[nodeInAdjacencyList] where !seen {
+        if let seen = visited[nodeInAdjacencyList], !seen {
           result = depthFirstSearch(nodeInAdjacencyList, visited: &visited) + result
         }
       }
diff --git a/Topological Sort/TopologicalSort3.swift b/Topological Sort/TopologicalSort3.swift
@@ -12,10 +12,10 @@ extension Graph {
       visited[node] = false
     }
 
-    func depthFirstSearch(source: Node) {
+    func depthFirstSearch(_ source: Node) {
       if let adjacencyList = adjacencyList(forNode: source) {
         for neighbor in adjacencyList {
-          if let seen = visited[neighbor] where !seen {
+          if let seen = visited[neighbor], !seen {
             depthFirstSearch(neighbor)
           }
         }
@@ -25,11 +25,11 @@ extension Graph {
     }
 
     for (node, _) in visited {
-      if let seen = visited[node] where !seen {
+      if let seen = visited[node], !seen {
         depthFirstSearch(node)
       }
     }
 
-    return stack.reverse()
+    return stack.reversed()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class Graph: CustomStringConvertible {`
`7`	`7`	`adjacencyLists = [Node : [Node]]()`
`8`	`8`	`}`
`9`	`9`
`10`		`- public func addNode(value: Node) -> Node {`
	`10`	`+ public func addNode(_ value: Node) -> Node {`
`11`	`11`	`adjacencyLists[value] = []`
`12`	`12`	`return value`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`extension Graph {`
`2`		`- private func depthFirstSearch(source: Node, inout visited: [Node : Bool]) -> [Node] {`
	`2`	`+ private func depthFirstSearch(_ source: Node, visited: inout [Node : Bool]) -> [Node] {`
`3`	`3`	`var result = [Node]()`
`4`	`4`
`5`	`5`	`if let adjacencyList = adjacencyList(forNode: source) {`
`6`	`6`	`for nodeInAdjacencyList in adjacencyList {`
`7`		`- if let seen = visited[nodeInAdjacencyList] where !seen {`
	`7`	`+ if let seen = visited[nodeInAdjacencyList], !seen {`
`8`	`8`	`result = depthFirstSearch(nodeInAdjacencyList, visited: &visited) + result`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ extension Graph {`
`12`	`12`	`visited[node] = false`
`13`	`13`	`}`
`14`	`14`
`15`		`- func depthFirstSearch(source: Node) {`
	`15`	`+ func depthFirstSearch(_ source: Node) {`
`16`	`16`	`if let adjacencyList = adjacencyList(forNode: source) {`
`17`	`17`	`for neighbor in adjacencyList {`
`18`		`- if let seen = visited[neighbor] where !seen {`
	`18`	`+ if let seen = visited[neighbor], !seen {`
`19`	`19`	`depthFirstSearch(neighbor)`
`20`	`20`	`}`
`21`	`21`	`}`
`@@ -25,11 +25,11 @@ extension Graph {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`for (node, _) in visited {`
`28`		`- if let seen = visited[node] where !seen {`
	`28`	`+ if let seen = visited[node], !seen {`
`29`	`29`	`depthFirstSearch(node)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- return stack.reverse()`
	`33`	`+ return stack.reversed()`
`34`	`34`	`}`
`35`	`35`	`}`