move the text cases to swift 3 syntax

Author: Divyendu Singh

Bucket Sort/BucketSort.swift

@@ -21,6 +21,30 @@
 //
 
 import Foundation
+// FIXME: comparison operators with optionals were removed from the Swift Standard Libary.
+// Consider refactoring the code to use the non-optional operators.
+fileprivate func < <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
+  switch (lhs, rhs) {
+  case let (l?, r?):
+    return l < r
+  case (nil, _?):
+    return true
+  default:
+    return false
+  }
+}
+
+// FIXME: comparison operators with optionals were removed from the Swift Standard Libary.
+// Consider refactoring the code to use the non-optional operators.
+fileprivate func >= <T : Comparable>(lhs: T?, rhs: T?) -> Bool {
+  switch (lhs, rhs) {
+  case let (l?, r?):
+    return l >= r
+  default:
+    return !(lhs < rhs)
+  }
+}
+
 
 //////////////////////////////////////
 // MARK: Main algorithm
@@ -39,7 +63,7 @@ import Foundation
     - Returns: A new array with sorted elements
  */
 
-public func bucketSort<T: Sortable>(elements: [T], distributor: Distributor, sorter: Sorter, buckets: [Bucket<T>]) -> [T] {
+public func bucketSort<T: Sortable>(_ elements: [T], distributor: Distributor, sorter: Sorter, buckets: [Bucket<T>]) -> [T] {
     precondition(allPositiveNumbers(elements))
     precondition(enoughSpaceInBuckets(buckets, elements: elements))
 
@@ -57,12 +81,12 @@ public func bucketSort<T: Sortable>(elements: [T], distributor: Distributor, sor
     return results
 }
 
-private func allPositiveNumbers<T: Sortable>(array: [T]) -> Bool {
+private func allPositiveNumbers<T: Sortable>(_ array: [T]) -> Bool {
     return array.filter { $0.toInt() >= 0 }.count > 0
 }
 
-private func enoughSpaceInBuckets<T: Sortable>(buckets: [Bucket<T>], elements: [T]) -> Bool {
-    let maximumValue = elements.maxElement()?.toInt()
+private func enoughSpaceInBuckets<T: Sortable>(_ buckets: [Bucket<T>], elements: [T]) -> Bool {
+    let maximumValue = elements.max()?.toInt()
     let totalCapacity = buckets.count * (buckets.first?.capacity)!
 
     return totalCapacity >= maximumValue
@@ -74,7 +98,7 @@ private func enoughSpaceInBuckets<T: Sortable>(buckets: [Bucket<T>], elements: [
 
 
 public protocol Distributor {
-    func distribute<T: Sortable>(element: T, inout buckets: [Bucket<T>])
+    func distribute<T: Sortable>(_ element: T, buckets: inout [Bucket<T>])
 }
 
 /*
@@ -96,7 +120,7 @@ public struct RangeDistributor: Distributor {
 
     public init() {}
 
-    public func distribute<T: Sortable>(element: T, inout buckets: [Bucket<T>]) {
+    public func distribute<T: Sortable>(_ element: T, buckets: inout [Bucket<T>]) {
         let value = element.toInt()
         let bucketCapacity = buckets.first!.capacity
 
@@ -121,14 +145,14 @@ public protocol Sortable: IntConvertible, Comparable {
 //////////////////////////////////////
 
 public protocol Sorter {
-    func sort<T: Sortable>(items: [T]) -> [T]
+    func sort<T: Sortable>(_ items: [T]) -> [T]
 }
 
 public struct InsertionSorter: Sorter {
 
     public init() {}
 
-    public func sort<T: Sortable>(items: [T]) -> [T] {
+    public func sort<T: Sortable>(_ items: [T]) -> [T] {
         var results = items
         for i in 0 ..< results.count {
             var j = i
@@ -158,13 +182,13 @@ public struct Bucket<T:Sortable> {
         elements = [T]()
     }
 
-    public mutating func add(item: T) {
+    public mutating func add(_ item: T) {
         if elements.count < capacity {
             elements.append(item)
         }
     }
 
-    public func sort(algorithm: Sorter) -> [T] {
+    public func sort(_ algorithm: Sorter) -> [T] {
         return algorithm.sort(elements)
     }
 }

Bucket Sort/Tests/Tests.swift

@@ -25,7 +25,7 @@ class TestTests: XCTestCase {
 
         largeArray = [Int]()
         for _ in 0..<total {
-            largeArray!.append( random() % maximum )
+            largeArray!.append( Int(arc4random_uniform( UInt32( maximum ) ) ) )
         }
 
         sparsedArray = [Int]()
@@ -57,9 +57,9 @@ class TestTests: XCTestCase {
 
     // MARK: Private functions
 
-    private func performBucketSort(elements: [Int], totalBuckets: Int) -> [Int] {
+    fileprivate func performBucketSort(_ elements: [Int], totalBuckets: Int) -> [Int] {
 
-        let value = (elements.maxElement()?.toInt())! + 1
+        let value = (elements.max()?.toInt())! + 1
         let capacityRequired = Int( ceil( Double(value) / Double(totalBuckets) ) )
 
         var buckets = [Bucket<Int>]()
@@ -71,7 +71,7 @@ class TestTests: XCTestCase {
         return results
     }
 
-    func isSorted(array: [Int]) -> Bool {
+    func isSorted(_ array: [Int]) -> Bool {
 
         var index = 0
         var sorted = true

Bucket Sort/Tests/Tests.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0810;
 					};
 				};
 			};
@@ -222,6 +223,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -234,6 +236,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;
 		};