Merge pull request #235 from ssarber/counting-sort-swift3

Convert to Swift 3 syntax to get rid of Xcode 8 errors
kodecocodes · Sep 27, 2016 · 353cc52 · 353cc52
2 parents c4e3f34 + 17887c3
commit 353cc52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Counting Sort/CountingSort.playground/Contents.swift b/Counting Sort/CountingSort.playground/Contents.swift
@@ -1,6 +1,6 @@
 //: Playground - noun: a place where people can play
 
-enum CountingSortError: ErrorType {
+enum CountingSortError: Error {
   case ArrayEmpty
 }
 
@@ -11,9 +11,9 @@ func countingSort(array: [Int]) throws -> [Int] {
 
   // Step 1
   // Create an array to store the count of each element
-  let maxElement = array.maxElement() ?? 0
+  let maxElement = array.max() ?? 0
 
-  var countArray = [Int](count: Int(maxElement + 1), repeatedValue: 0)
+  var countArray = [Int](repeating: 0, count: Int(maxElement + 1))
   for element in array {
     countArray[element] += 1
   }
@@ -29,7 +29,7 @@ func countingSort(array: [Int]) throws -> [Int] {
 
   // Step 3
   // Place the element in the final array as per the number of elements before it
-  var sortedArray = [Int](count: array.count, repeatedValue: 0)
+  var sortedArray = [Int](repeating: 0, count: array.count)
   for element in array {
     countArray[element] -= 1
     sortedArray[countArray[element]] = element
@@ -38,4 +38,4 @@ func countingSort(array: [Int]) throws -> [Int] {
 }
 
 
-try countingSort([10, 9, 8, 7, 1, 2, 7, 3])
+try countingSort(array: [10, 9, 8, 7, 1, 2, 7, 3])
diff --git a/Counting Sort/README.markdown b/Counting Sort/README.markdown
@@ -20,9 +20,9 @@ Count 0 1 1 1 0 0 0 2 1 1 1
 Here is the code to accomplish this:
 
 ```swift
-  let maxElement = array.maxElement() ?? 0
-  
-  var countArray = [Int](count: Int(maxElement + 1), repeatedValue: 0)
+  let maxElement = array.max() ?? 0
+
+  var countArray = [Int](repeating: 0, count: Int(maxElement + 1))
   for element in array {
     countArray[element] += 1
   }
@@ -62,7 +62,7 @@ Output 1 2 3 7 7 8 9 10
 Here is the code for this final step:
 
 ```swift
-  var sortedArray = [Int](count: array.count, repeatedValue: 0)
+  var sortedArray = [Int](repeating: 0, count: array.count)
   for element in array {
     countArray[element] -= 1
     sortedArray[countArray[element]] = element