Merge pull request kodecocodes#350 from taiheng/feature/swift3-combsort

Migrate Combsort to Swift 3 syntax

Author: kelvinlauKL

.travis.yml

@@ -19,6 +19,7 @@ script:
 # - xcodebuild test -project ./Breadth-First\ Search/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./Bucket\ Sort/Tests/Tests.xcodeproj -scheme Tests
 - xcodebuild test -project ./B-Tree/Tests/Tests.xcodeproj -scheme Tests
+- xcodebuild test -project ./Comb\ Sort/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Counting\ Sort/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Depth-First\ Search/Tests/Tests.xcodeproj -scheme Tests
 # - xcodebuild test -project ./Graph/Graph.xcodeproj -scheme GraphTests

Comb Sort/Comb Sort.playground/Contents.swift

@@ -4,34 +4,12 @@
 
 import Cocoa
 
-func combSort (input: [Int]) -> [Int] {
-  var copy = input
-  var gap = copy.count
-  let shrink = 1.3
-
-  while gap > 1 {
-    gap = Int(Double(gap) / shrink)
-    if gap < 1 {
-      gap = 1
-    }
-
-    var index = 0
-    while index + gap < copy.count {
-      if copy[index] > copy[index + gap] {
-        swap(&copy[index], &copy[index + gap])
-      }
-      index += 1
-    }
-  }
-  return copy
-}
-
 // Test Comb Sort with small array of ten values
 let array = [2, 32, 9, -1, 89, 101, 55, -10, -12, 67]
 combSort(array)
 
 // Test Comb Sort with large array of 1000 random values
-var bigArray = [Int](count: 1000, repeatedValue: 0)
+var bigArray = [Int](repeating: 0, count: 1000)
 var i = 0
 while i < 1000 {
   bigArray[i] = Int(arc4random_uniform(1000) + 1)

Comb Sort/Comb Sort.playground/Sources/Comb Sort.swift

@@ -0,0 +1,36 @@
+//  Comb Sort.swift
+//  Comb Sort
+//
+//  Created by Stephen.Rutstein on 7/16/16.
+//  Copyright © 2016 Stephen.Rutstein. All rights reserved.
+//
+
+import Foundation
+
+public func combSort<T: Comparable>(_ input: [T]) -> [T] {
+    var copy: [T] = input
+    var gap = copy.count
+    let shrink = 1.3
+    
+    while gap > 1 {
+        gap = (Int)(Double(gap) / shrink)
+        if gap < 1 {
+            gap = 1
+        }
+        
+        var index = 0
+        while !(index + gap >= copy.count) {
+            if copy[index] > copy[index + gap] {
+                swap(&copy[index], &copy[index + gap])
+            }
+            index += 1
+        }
+    }
+    return copy
+}
+
+fileprivate func swap<T: Comparable>(a: inout T, b: inout T) {
+    let temp = a
+    a = b
+    b = temp
+}

Comb Sort/Comb Sort.swift

@@ -7,8 +7,8 @@
 
 import Foundation
 
-func combSort (input: [Int]) -> [Int] {
-    var copy: [Int] = input
+public func combSort<T: Comparable>(_ input: [T]) -> [T] {
+    var copy: [T] = input
     var gap = copy.count
     let shrink = 1.3
 
@@ -29,7 +29,7 @@ func combSort (input: [Int]) -> [Int] {
     return copy
 }
 
-func swap (inout a: Int, inout b: Int) {
+fileprivate func swap<T: Comparable>(a: inout T, b: inout T) {
     let temp = a
     a = b
     b = temp

Comb Sort/Tests/CombSortTests.swift

@@ -0,0 +1,28 @@
+//
+//  CombSortTests.swift
+//  Tests
+//
+//  Created by theng on 2017-01-09.
+//  Copyright © 2017 Swift Algorithm Club. All rights reserved.
+//
+
+import XCTest
+
+class CombSortTests: XCTestCase {
+    var sequence: [Int]!
+    let expectedSequence: [Int] = [-12, -10, -1, 2, 9, 32, 55, 67, 89, 101]
+
+    override func setUp() {
+        super.setUp()
+        sequence = [2, 32, 9, -1, 89, 101, 55, -10, -12, 67]
+    }
+    
+    override func tearDown() {
+        super.tearDown()
+    }
+
+    func testCombSort() {
+        let sortedSequence = combSort(sequence)
+        XCTAssertEqual(sortedSequence, expectedSequence)
+    }
+}

Comb Sort/Tests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>