Merge pull request kodecocodes#4 from raywenderlich/master

JaapWijnen · web-flow · commit d4b54ffeffcd · 2016-10-31T20:20:48.000+01:00
update master
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/Longest Common Subsequence/README.markdown b/Longest Common Subsequence/README.markdown
@@ -152,15 +152,15 @@ func backtrack(_ matrix: [[Int]]) -> String {
 	}
   }
   
-  return String(lcs.characters.reverse())
+  return String(lcs.characters.reversed())
 }
 ```  
 
 This backtracks from `matrix[n+1][m+1]` (bottom-right corner) to `matrix[1][1]` (top-right corner), looking for characters that are common to both strings. It adds those characters to a new string, `lcs`.
 
 The `charInSequence` variable is an index into the string given by `self`. Initially this points to the last character of the string. Each time we decrement `i`, we also move back `charInSequence`. When the two characters are found to be equal, we add the character at `self[charInSequence]` to the new `lcs` string. (We can't just write `self[i]` because `i` may not map to the current position inside the Swift string.)
 
-Due to backtracking, characters are added in reverse order, so at the end of the function we call `reverse()` to put the string in the right order. (Appending new characters to the end of the string and then reversing it once is faster than always inserting the characters at the front of the string.)
+Due to backtracking, characters are added in reverse order, so at the end of the function we call `reversed()` to put the string in the right order. (Appending new characters to the end of the string and then reversing it once is faster than always inserting the characters at the front of the string.)
 
 ## Putting it all together
 
diff --git a/README.markdown b/README.markdown
@@ -103,6 +103,7 @@ Bad sorting algorithms (don't use these!):
 - [Shunting Yard Algorithm](Shunting Yard/). Convert infix expressions to postfix.
 - Statistics
 - [Karatsuba Multiplication](Karatsuba Multiplication/). Another take on elementary multiplication.
+- [Haversine Distance](HaversineDistance/). Calculating the distance between 2 points from a sphere.
 
 ### Machine learning
 
diff --git a/Shuffle/README.markdown b/Shuffle/README.markdown
@@ -12,7 +12,7 @@ extension Array {
     var temp = [Element]()
     while !isEmpty {
       let i = random(count)
-      let obj = removeAtIndex(i)
+      let obj = remove(at: i)
       temp.append(obj)
     }
     self = temp
@@ -44,7 +44,7 @@ Here is a much improved version of the shuffle algorithm:
 ```swift
 extension Array {
   public mutating func shuffle() {
-    for i in (count - 1).stride(through: 1, by: -1) {
+    for i in stride(from: count - 1, through: 1, by: -1) {
       let j = random(i + 1)
       if i != j {
         swap(&self[i], &self[j])
@@ -96,8 +96,8 @@ There is a slight variation on this algorithm that is useful for when you want t
 Here is the code:
 
 ```swift
-public func shuffledArray(n: Int) -> [Int] {
-  var a = [Int](count: n, repeatedValue: 0)
+public func shuffledArray(_ n: Int) -> [Int] {
+  var a = [Int](repeating: 0, count: n)
   for i in 0..<n {
     let j = random(i + 1)
     if i != j {
diff --git a/Shuffle/Shuffle.playground/Contents.swift b/Shuffle/Shuffle.playground/Contents.swift
@@ -3,7 +3,7 @@
 import Foundation
 
 /* Returns a random integer between 0 and n-1. */
-public func random(n: Int) -> Int {
+public func random(_ n: Int) -> Int {
   return Int(arc4random_uniform(UInt32(n)))
 }
 
@@ -12,7 +12,7 @@ public func random(n: Int) -> Int {
 /* Fisher-Yates / Knuth shuffle */
 extension Array {
   public mutating func shuffle() {
-    for i in (count - 1).stride(through: 1, by: -1) {
+    for i in stride(from: count - 1, through: 1, by: -1) {
       let j = random(i + 1)
       if i != j {
         swap(&self[i], &self[j])
@@ -29,8 +29,8 @@ list.shuffle()
 
 
 /* Create a new array of numbers that is already shuffled. */
-public func shuffledArray(n: Int) -> [Int] {
-  var a = [Int](count: n, repeatedValue: 0)
+public func shuffledArray(_ n: Int) -> [Int] {
+  var a = [Int](repeating: 0, count: n)
   for i in 0..<n {
     let j = random(i + 1)
     if i != j {
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()
   }
 }
diff --git a/Two-Sum Problem/README.markdown b/Two-Sum Problem/README.markdown
@@ -8,10 +8,10 @@ There are a variety of solutions to this problem (some better than others). The
 
 This solution uses a dictionary to store differences between each element in the array and the sum `k` that we're looking for. The dictionary also stores the indices of each element.
 
-With this approach, each key in the dictionary corresponds to a new target value. If one of the successive numbers from the array is equal to one of the dictionary's keys, then we know there exist two numbers that sum to `k`. 
+With this approach, each key in the dictionary corresponds to a new target value. If one of the successive numbers from the array is equal to one of the dictionary's keys, then we know there exist two numbers that sum to `k`.
 
 ```swift
-func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
+func twoSumProblem(_ a: [Int], k: Int) -> ((Int, Int))? {
   var dict = [Int: Int]()
 
   for i in 0 ..< a.count {
@@ -69,7 +69,7 @@ The running time of this algorithm is **O(n)** because it potentially may need t
 Here is the code in Swift:
 
 ```swift
-func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
+func twoSumProblem(_ a: [Int], k: Int) -> ((Int, Int))? {
   var i = 0
   var j = a.count - 1
 
@@ -78,9 +78,9 @@ func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
     if sum == k {
       return (i, j)
     } else if sum < k {
-      ++i
+      i += 1
     } else {
-      --j
+      j -= 1
     }
   }
   return nil
diff --git a/Two-Sum Problem/Solution 1/2Sum.playground/Contents.swift b/Two-Sum Problem/Solution 1/2Sum.playground/Contents.swift
@@ -1,6 +1,6 @@
 //: Playground - noun: a place where people can play
 
-func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
+func twoSumProblem(_ a: [Int], k: Int) -> ((Int, Int))? {
   var map = [Int: Int]()
 
   for i in 0 ..< a.count {
diff --git a/Two-Sum Problem/Solution 1/2Sum.playground/timeline.xctimeline b/Two-Sum Problem/Solution 1/2Sum.playground/timeline.xctimeline
diff --git a/Two-Sum Problem/Solution 1/2Sum.swift b/Two-Sum Problem/Solution 1/2Sum.swift
diff --git a/Two-Sum Problem/Solution 2/2Sum.playground/Contents.swift b/Two-Sum Problem/Solution 2/2Sum.playground/Contents.swift
@@ -1,6 +1,6 @@
 //: Playground - noun: a place where people can play
 
-func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
+func twoSumProblem(_ a: [Int], k: Int) -> ((Int, Int))? {
   var i = 0
   var j = a.count - 1
 
@@ -9,9 +9,9 @@ func twoSumProblem(a: [Int], k: Int) -> ((Int, Int))? {
     if sum == k {
       return (i, j)
     } else if sum < k {
-      ++i
+      i += 1
     } else {
-      --j
+      j -= 1
     }
   }
   return nil
diff --git a/Two-Sum Problem/Solution 2/2Sum.swift b/Two-Sum Problem/Solution 2/2Sum.swift

Original file line number	Diff line number	Diff line change
`@@ -152,15 +152,15 @@ func backtrack(_ matrix: [[Int]]) -> String {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- return String(lcs.characters.reverse())`
	`155`	`+ return String(lcs.characters.reversed())`
`156`	`156`	`}`
`157`	`157`	```
`158`	`158`
`159`	`159`	This backtracks from `matrix[n+1][m+1]` (bottom-right corner) to `matrix[1][1]` (top-right corner), looking for characters that are common to both strings. It adds those characters to a new string, `lcs`.
`160`	`160`
`161`	`161`	The `charInSequence` variable is an index into the string given by `self`. Initially this points to the last character of the string. Each time we decrement `i`, we also move back `charInSequence`. When the two characters are found to be equal, we add the character at `self[charInSequence]` to the new `lcs` string. (We can't just write `self[i]` because `i` may not map to the current position inside the Swift string.)
`162`	`162`
`163`		-Due to backtracking, characters are added in reverse order, so at the end of the function we call `reverse()` to put the string in the right order. (Appending new characters to the end of the string and then reversing it once is faster than always inserting the characters at the front of the string.)
	`163`	+Due to backtracking, characters are added in reverse order, so at the end of the function we call `reversed()` to put the string in the right order. (Appending new characters to the end of the string and then reversing it once is faster than always inserting the characters at the front of the string.)
`164`	`164`
`165`	`165`	`## Putting it all together`
`166`	`166`
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`	`}`