From 17a1e4c1dec24be6b10cdf8ad7ecddfa520418c1 Mon Sep 17 00:00:00 2001 From: laurentaylormarshall Date: Tue, 23 Oct 2018 22:40:49 -0500 Subject: [PATCH 1/7] Updates tests to check for Swift 4.2. Updates build settings to use Swift 4.2. --- Comb Sort/Tests/CombSortTests.swift | 6 +++--- Comb Sort/Tests/Tests.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Comb Sort/Tests/CombSortTests.swift b/Comb Sort/Tests/CombSortTests.swift index 783fbd150..166065484 100644 --- a/Comb Sort/Tests/CombSortTests.swift +++ b/Comb Sort/Tests/CombSortTests.swift @@ -12,9 +12,9 @@ class CombSortTests: XCTestCase { var sequence: [Int]! let expectedSequence: [Int] = [-12, -10, -1, 2, 9, 32, 55, 67, 89, 101] - func testSwift4(){ - #if swift(>=4.0) - print("Hello, Swift 4!") + func testSwiftVersion(){ + #if swift(>=4.2) + print("Hello, Swift 4.2!") #endif } diff --git a/Comb Sort/Tests/Tests.xcodeproj/project.pbxproj b/Comb Sort/Tests/Tests.xcodeproj/project.pbxproj index 14d059271..4582b3f2d 100644 --- a/Comb Sort/Tests/Tests.xcodeproj/project.pbxproj +++ b/Comb Sort/Tests/Tests.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -237,7 +237,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; From 8da637c1d1c92cc65ea3eeb63275dc6117432b67 Mon Sep 17 00:00:00 2001 From: laurentaylormarshall Date: Tue, 23 Oct 2018 23:32:46 -0500 Subject: [PATCH 2/7] Removes Swift 4.0 check. Removes unused import. Refactors an if statement into a guard to be more Swift-y. --- Slow Sort/SlowSort.playground/Contents.swift | 5 ----- Slow Sort/SlowSort.swift | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Slow Sort/SlowSort.playground/Contents.swift b/Slow Sort/SlowSort.playground/Contents.swift index 95bf80739..7c686782c 100644 --- a/Slow Sort/SlowSort.playground/Contents.swift +++ b/Slow Sort/SlowSort.playground/Contents.swift @@ -1,8 +1,3 @@ -// last checked with Xcode 9.0b4 -#if swift(>=4.0) -print("Hello, Swift 4!") -#endif - var numberList = [1, 12, 9, 17, 13, 12] slowsort(0, numberList.count-1, &numberList) diff --git a/Slow Sort/SlowSort.swift b/Slow Sort/SlowSort.swift index 9f264a057..c68a53455 100644 --- a/Slow Sort/SlowSort.swift +++ b/Slow Sort/SlowSort.swift @@ -6,12 +6,9 @@ // // -import Foundation - public func slowsort(_ i: Int, _ j: Int, _ numberList: inout [Int]) { - if i>=j { - return - } + guard i Date: Fri, 26 Oct 2018 18:56:13 -0500 Subject: [PATCH 3/7] Update SlowSort.swift --- Slow Sort/SlowSort.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Slow Sort/SlowSort.swift b/Slow Sort/SlowSort.swift index c68a53455..813f3b7a9 100644 --- a/Slow Sort/SlowSort.swift +++ b/Slow Sort/SlowSort.swift @@ -5,10 +5,8 @@ // Created by Pope Lukas Schramm (Dabendorf Orthodox Religion) on 16-07-16. // // - -public func slowsort(_ i: Int, _ j: Int, _ numberList: inout [Int]) { - guard i Date: Fri, 26 Oct 2018 19:11:33 -0500 Subject: [PATCH 4/7] Updates function name. --- Slow Sort/SlowSort.swift | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Slow Sort/SlowSort.swift b/Slow Sort/SlowSort.swift index 813f3b7a9..3b762042a 100644 --- a/Slow Sort/SlowSort.swift +++ b/Slow Sort/SlowSort.swift @@ -1,19 +1,19 @@ // // SlowSort.swift -// +// // // Created by Pope Lukas Schramm (Dabendorf Orthodox Religion) on 16-07-16. // // func slowSort(_ i: Int, _ j: Int, _ numberList: inout [Int]) { - guard if i < j else { return } - let m = (i+j)/2 - slowsort(i, m, &numberList) - slowsort(m+1, j, &numberList) - if numberList[j] < numberList[m] { - let temp = numberList[j] - numberList[j] = numberList[m] - numberList[m] = temp - } - slowsort(i, j-1, &numberList) + guard if i < j else { return } + let m = (i+j)/2 + slowSort(i, m, &numberList) + slowSort(m+1, j, &numberList) + if numberList[j] < numberList[m] { + let temp = numberList[j] + numberList[j] = numberList[m] + numberList[m] = temp + } + slowSort(i, j-1, &numberList) } From 91b7bb1d1d16f4cbe64399de156b2045ebf6d5be Mon Sep 17 00:00:00 2001 From: Kelvin Lau Date: Thu, 21 Mar 2019 10:17:06 -0400 Subject: [PATCH 5/7] Update SlowSort.swift --- Slow Sort/SlowSort.swift | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Slow Sort/SlowSort.swift b/Slow Sort/SlowSort.swift index bd8288b18..546a36395 100644 --- a/Slow Sort/SlowSort.swift +++ b/Slow Sort/SlowSort.swift @@ -7,14 +7,14 @@ // func slowSort(_ i: Int, _ j: Int, _ numberList: inout [Int]) { - guard if i < j else { return } - let m = (i+j)/2 - slowSort(i, m, &numberList) - slowSort(m+1, j, &numberList) - if numberList[j] < numberList[m] { - let temp = numberList[j] - numberList[j] = numberList[m] - numberList[m] = temp - } - slowSort(i, j-1, &numberList) + guard if i < j else { return } + let m = (i+j)/2 + slowSort(i, m, &numberList) + slowSort(m+1, j, &numberList) + if numberList[j] < numberList[m] { + let temp = numberList[j] + numberList[j] = numberList[m] + numberList[m] = temp + } + slowSort(i, j-1, &numberList) } From 7457ceb7e9ec688ac11db158ac3d32118df49b0f Mon Sep 17 00:00:00 2001 From: Kelvin Lau Date: Thu, 21 Mar 2019 10:25:04 -0400 Subject: [PATCH 6/7] Two-spaced indents --- Comb Sort/Tests/CombSortTests.swift | 32 ++++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/Comb Sort/Tests/CombSortTests.swift b/Comb Sort/Tests/CombSortTests.swift index 166065484..1d83af002 100644 --- a/Comb Sort/Tests/CombSortTests.swift +++ b/Comb Sort/Tests/CombSortTests.swift @@ -9,26 +9,20 @@ import XCTest class CombSortTests: XCTestCase { - var sequence: [Int]! - let expectedSequence: [Int] = [-12, -10, -1, 2, 9, 32, 55, 67, 89, 101] - - func testSwiftVersion(){ - #if swift(>=4.2) - print("Hello, Swift 4.2!") - #endif - } + 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 setUp() { + super.setUp() + sequence = [2, 32, 9, -1, 89, 101, 55, -10, -12, 67] + } - override func tearDown() { - super.tearDown() - } + override func tearDown() { + super.tearDown() + } - func testCombSort() { - let sortedSequence = combSort(sequence) - XCTAssertEqual(sortedSequence, expectedSequence) - } + func testCombSort() { + let sortedSequence = combSort(sequence) + XCTAssertEqual(sortedSequence, expectedSequence) + } } From fdab1a2d7a9f9797ed7be27c5023f284c47f38ea Mon Sep 17 00:00:00 2001 From: Kelvin Lau Date: Thu, 21 Mar 2019 10:25:24 -0400 Subject: [PATCH 7/7] two spaced indents --- Slow Sort/SlowSort.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Slow Sort/SlowSort.swift b/Slow Sort/SlowSort.swift index 546a36395..968f6841b 100644 --- a/Slow Sort/SlowSort.swift +++ b/Slow Sort/SlowSort.swift @@ -12,9 +12,9 @@ func slowSort(_ i: Int, _ j: Int, _ numberList: inout [Int]) { slowSort(i, m, &numberList) slowSort(m+1, j, &numberList) if numberList[j] < numberList[m] { - let temp = numberList[j] - numberList[j] = numberList[m] - numberList[m] = temp + let temp = numberList[j] + numberList[j] = numberList[m] + numberList[m] = temp } slowSort(i, j-1, &numberList) }