Merge remote-tracking branch 'upstream/master'

Peter Bødskov · Peter Bødskov · commit 0055795d669c · 2017-01-05T08:00:19.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -23,12 +23,12 @@ script:
 # - xcodebuild test -project ./Depth-First\ Search/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Graph/Graph.xcodeproj -scheme GraphTests
 # - xcodebuild test -project ./Heap/Tests/Tests.xcodeproj -scheme Tests
-# - xcodebuild test -project ./Heap\ Sort/Tests/Tests.xcodeproj -scheme Tests
+- xcodebuild test -project ./Heap\ Sort/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./Insertion\ Sort/Tests/Tests.xcodeproj -scheme Tests
 # - 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/Heap Sort/HeapSort.swift b/Heap Sort/HeapSort.swift
@@ -1,8 +1,8 @@
 extension Heap {
   public mutating func sort() -> [T] {
-    for i in (elements.count - 1).stride(through: 1, by: -1) {
+    for i in stride(from: (elements.count - 1), through: 1, by: -1) {
       swap(&elements[0], &elements[i])
-      shiftDown(index: 0, heapSize: i)
+      shiftDown(0, heapSize: i)
     }
     return elements
   }
@@ -12,7 +12,7 @@ extension Heap {
   Sorts an array using a heap.
   Heapsort can be performed in-place, but it is not a stable sort.
 */
-public func heapsort<T>(a: [T], _ sort: (T, T) -> Bool) -> [T] {
+public func heapsort<T>(_ a: [T], _ sort: @escaping (T, T) -> Bool) -> [T] {
   let reverseOrder = { i1, i2 in sort(i2, i1) }
   var h = Heap(array: a, sort: reverseOrder)
   return h.sort()
diff --git a/Heap Sort/README.markdown b/Heap Sort/README.markdown
@@ -48,13 +48,13 @@ Here's how you can implement heap sort in Swift:
 
 ```swift
 extension Heap {
-  public mutating func sort() -> [T] {
-    for i in (elements.count - 1).stride(through: 1, by: -1) {
-      swap(&elements[0], &elements[i])
-      shiftDown(index: 0, heapSize: i)
-    }
+    public mutating func sort() -> [T] {
+        for i in stride(from: (elements.count - 1), through: 1, by: -1) {
+            swap(&elements[0], &elements[i])
+            shiftDown(0, heapSize: i)
+        }
     return elements
-  }
+    }
 }
 ```
 
@@ -70,10 +70,10 @@ Because we need a max-heap to sort from low-to-high, you need to give `Heap` the
 We can write a handy helper function for that:
 
 ```swift
-public func heapsort<T>(a: [T], _ sort: (T, T) -> Bool) -> [T] {
-  let reverseOrder = { i1, i2 in sort(i2, i1) }
-  var h = Heap(array: a, sort: reverseOrder)
-  return h.sort()
+public func heapsort<T>(_ a: [T], _ sort: @escaping (T, T) -> Bool) -> [T] {
+    let reverseOrder = { i1, i2 in sort(i2, i1) }
+    var h = Heap(array: a, sort: reverseOrder)
+    return h.sort()
 }
 ```
 
diff --git a/Heap Sort/Tests/Tests.xcodeproj/project.pbxproj b/Heap Sort/Tests/Tests.xcodeproj/project.pbxproj
@@ -86,11 +86,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Swift Algorithm Club";
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0820;
 					};
 				};
 			};
@@ -149,8 +150,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 = "-";
@@ -193,8 +196,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 = "-";
@@ -213,6 +218,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -224,6 +230,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;
 		};
@@ -235,6 +242,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/Heap Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme b/Heap Sort/Tests/Tests.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Heap/Heap.swift b/Heap/Heap.swift
@@ -46,7 +46,7 @@ public struct Heap<T> {
   fileprivate mutating func buildHeap(fromArray array: [T]) {
     elements = array
     for i in stride(from: (elements.count/2 - 1), through: 0, by: -1) {
-      shiftDown(index: i, heapSize: elements.count)
+      shiftDown(i, heapSize: elements.count)
     }
   }
 
@@ -98,7 +98,7 @@ public struct Heap<T> {
    */
   public mutating func insert(_ value: T) {
     elements.append(value)
-    shiftUp(index: elements.count - 1)
+    shiftUp(elements.count - 1)
   }
 
   public mutating func insert<S: Sequence>(_ sequence: S) where S.Iterator.Element == T {
@@ -116,7 +116,7 @@ public struct Heap<T> {
     
     assert(isOrderedBefore(value, elements[i]))
     elements[i] = value
-    shiftUp(index: i)
+    shiftUp(i)
   }
 
   /**
@@ -142,14 +142,14 @@ public struct Heap<T> {
    * Removes an arbitrary node from the heap. Performance: O(log n). You need
    * to know the node's index, which may actually take O(n) steps to find.
    */
-  public mutating func removeAt(index: Int) -> T? {
+  public mutating func removeAt(_ index: Int) -> T? {
     guard index < elements.count else { return nil }
     
     let size = elements.count - 1
     if index != size {
       swap(&elements[index], &elements[size])
-      shiftDown(index: index, heapSize: size)
-      shiftUp(index: index)
+      shiftDown(index, heapSize: size)
+      shiftUp(index)
     }
     return elements.removeLast()
   }
@@ -158,7 +158,7 @@ public struct Heap<T> {
    * Takes a child node and looks at its parents; if a parent is not larger
    * (max-heap) or not smaller (min-heap) than the child, we exchange them.
    */
-  mutating func shiftUp(index: Int) {
+  mutating func shiftUp(_ index: Int) {
     var childIndex = index
     let child = elements[childIndex]
     var parentIndex = self.parentIndex(ofIndex: childIndex)
@@ -173,14 +173,14 @@ public struct Heap<T> {
   }
 
   mutating func shiftDown() {
-    shiftDown(index: 0, heapSize: elements.count)
+    shiftDown(0, heapSize: elements.count)
   }
 
   /**
    * Looks at a parent node and makes sure it is still larger (max-heap) or
    * smaller (min-heap) than its childeren.
    */
-  mutating func shiftDown(index: Int, heapSize: Int) {
+  mutating func shiftDown(_ index: Int, heapSize: Int) {
     var parentIndex = index
 
     while true {
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 {`