Merge pull request #532 from remlostime/heap-sort-swift

[Swift 4] Update Heap Sort

Author: kelvinlauKL

Heap Sort/HeapSort.swift

@@ -1,7 +1,7 @@
 extension Heap {
   public mutating func sort() -> [T] {
     for i in stride(from: (elements.count - 1), through: 1, by: -1) {
-      swap(&elements[0], &elements[i])
+        elements.swapAt(0, i)
       shiftDown(0, heapSize: i)
     }
     return elements

Heap Sort/Tests/HeapSortTests.swift

@@ -1,26 +1,33 @@
 import XCTest
 
 class HeapSortTests: XCTestCase {
-  func testSort() {
-    var h1 = Heap(array: [5, 13, 2, 25, 7, 17, 20, 8, 4], sort: >)
-    let a1 = h1.sort()
-    XCTAssertEqual(a1, [2, 4, 5, 7, 8, 13, 17, 20, 25])
+    func testSwift4() {
+        // last checked with Xcode 9.0b4
+        #if swift(>=4.0)
+            print("Hello, Swift 4!")
+        #endif
+    }
+    
+    func testSort() {
+        var h1 = Heap(array: [5, 13, 2, 25, 7, 17, 20, 8, 4], sort: >)
+        let a1 = h1.sort()
+        XCTAssertEqual(a1, [2, 4, 5, 7, 8, 13, 17, 20, 25])
 
-    let a1_ = heapsort([5, 13, 2, 25, 7, 17, 20, 8, 4], <)
-    XCTAssertEqual(a1_, [2, 4, 5, 7, 8, 13, 17, 20, 25])
+        let a1_ = heapsort([5, 13, 2, 25, 7, 17, 20, 8, 4], <)
+        XCTAssertEqual(a1_, [2, 4, 5, 7, 8, 13, 17, 20, 25])
 
-    var h2 = Heap(array: [16, 14, 10, 8, 7, 8, 3, 2, 4, 1], sort: >)
-    let a2 = h2.sort()
-    XCTAssertEqual(a2, [1, 2, 3, 4, 7, 8, 8, 10, 14, 16])
+        var h2 = Heap(array: [16, 14, 10, 8, 7, 8, 3, 2, 4, 1], sort: >)
+        let a2 = h2.sort()
+        XCTAssertEqual(a2, [1, 2, 3, 4, 7, 8, 8, 10, 14, 16])
 
-    let a2_ = heapsort([16, 14, 10, 8, 7, 8, 3, 2, 4, 1], <)
-    XCTAssertEqual(a2_, [1, 2, 3, 4, 7, 8, 8, 10, 14, 16])
+        let a2_ = heapsort([16, 14, 10, 8, 7, 8, 3, 2, 4, 1], <)
+        XCTAssertEqual(a2_, [1, 2, 3, 4, 7, 8, 8, 10, 14, 16])
 
-    var h3 = Heap(array: [1, 2, 3, 4, 5, 6], sort: <)
-    let a3 = h3.sort()
-    XCTAssertEqual(a3, [6, 5, 4, 3, 2, 1])
+        var h3 = Heap(array: [1, 2, 3, 4, 5, 6], sort: <)
+        let a3 = h3.sort()
+        XCTAssertEqual(a3, [6, 5, 4, 3, 2, 1])
 
-    let a3_ = heapsort([1, 2, 3, 4, 5, 6], >)
-    XCTAssertEqual(a3_, [6, 5, 4, 3, 2, 1])
-  }
+        let a3_ = heapsort([1, 2, 3, 4, 5, 6], >)
+        XCTAssertEqual(a3_, [6, 5, 4, 3, 2, 1])
+    }
 }

Heap Sort/Tests/Tests.xcodeproj/project.pbxproj

@@ -230,7 +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;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -242,7 +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;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};