trackler 2.0.6.15 → 2.0.6.16

data/tracks/swift/exercises/simple-linked-list/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "SimpleLinkedList"
+)

data/tracks/swift/exercises/simple-linked-list/{SimpleLinkedListExample.swift → Sources/SimpleLinkedListExample.swift}

@@ -7,8 +7,8 @@ private extension Array {
 }
 
 class Element<T> {
-    var value: T? = nil
-    var next: Element? = nil
+    var value: T?
+    var next: Element?
 
     init() { }
 

data/tracks/swift/exercises/simple-linked-list/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/simple-linked-list/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import SimpleLinkedListTests
+
+XCTMain([
+    testCase(SimpleLinkedListTests.allTests),
+    ])

data/tracks/swift/exercises/simple-linked-list/{SimpleLinkedListTest.swift → Tests/SimpleLinkedListTests/SimpleLinkedListTests.swift}

@@ -1,10 +1,7 @@
-#if swift(>=3.0)
-    import XCTest
-#endif
-
-// Use Optionals and Generic Classes
-class SimpleLinkedListTest: XCTestCase {
+import XCTest
+@testable import SimpleLinkedList
 
+class SimpleLinkedListTests: XCTestCase {
     func testConstructorA() {
         let one = Element(1, nil)
         let two = Element(2, one)
@@ -80,4 +77,17 @@ class SimpleLinkedListTest: XCTestCase {
         XCTAssertEqual(Array(1...10), Element.fromArray(Array(1...10)).toArray())
     }
 
+    static var allTests: [(String, (SimpleLinkedListTests) -> () throws -> Void)] {
+        return [
+            ("testConstructorA", testConstructorA),
+            ("testConstructorB", testConstructorB),
+            ("testToA", testToA),
+            ("testReverseOne", testReverseOne),
+            ("testReverseTwo", testReverseTwo),
+            ("testFromAOne", testFromAOne),
+            ("testFromATwo", testFromATwo),
+            ("testFromATen", testFromATen),
+            ("testRoundtrip", testRoundtrip),
+        ]
+    }
 }

data/tracks/swift/exercises/space-age/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/space-age/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "SpaceAge"
+)

data/tracks/swift/exercises/space-age/{SpaceAgeExample.swift → Sources/SpaceAgeExample.swift}

@@ -1,4 +1,8 @@
-import Darwin
+#if os(Linux)
+    import Glibc
+#elseif os(OSX)
+    import Darwin
+#endif
 
 struct SpaceAge {
     var seconds: Float = 0

data/tracks/swift/exercises/space-age/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/space-age/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import SpaceAgeTests
+
+XCTMain([
+    testCase(SpaceAgeTests.allTests),
+    ])

data/tracks/swift/exercises/space-age/{SpaceAgeTest.swift → Tests/SpaceAgeTests/SpaceAgeTests.swift}

@@ -1,9 +1,7 @@
-#if swift(>=3.0)
-    import XCTest
-#endif
-
-class SpaceAgeTest: XCTestCase {
+import XCTest
+@testable import SpaceAge
 
+class SpaceAgeTests: XCTestCase {
     func testAgeInSeconds() {
         let age = SpaceAge(1_000_000)
         XCTAssertEqual(1_000_000, age.seconds)
@@ -55,4 +53,18 @@ class SpaceAgeTest: XCTestCase {
         XCTAssertEqual(260.16, age.onEarth)
         XCTAssertEqual(1.58, age.onNeptune)
     }
+
+    static var allTests: [(String, (SpaceAgeTests) -> () throws -> Void)] {
+        return [
+            ("testAgeInSeconds", testAgeInSeconds),
+            ("testAgeInEarthYears", testAgeInEarthYears),
+            ("testAgeInMercuryYears", testAgeInMercuryYears),
+            ("testAgeInVenusYears", testAgeInVenusYears),
+            ("testAgeOnMars", testAgeOnMars),
+            ("testAgeOnJupiter", testAgeOnJupiter),
+            ("testAgeOnSaturn", testAgeOnSaturn),
+            ("testAgeOnUranus", testAgeOnUranus),
+            ("testAgeOnNeptune", testAgeOnNeptune),
+        ]
+    }
 }

data/tracks/swift/exercises/strain/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/strain/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "Strain"
+)

data/tracks/swift/exercises/strain/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/strain/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import StrainTests
+
+XCTMain([
+    testCase(StrainTests.allTests),
+    ])

data/tracks/swift/exercises/strain/{StrainTest.swift → Tests/StrainTests/StrainTests.swift}

@@ -1,6 +1,6 @@
-#if swift(>=3.0)
-    import XCTest
-#endif
+import XCTest
+import Foundation
+@testable import Strain
 
 private extension XCTest {
     func XCTAssertEqualMultiArray(_ aArray1: [[Int]], _ aArray2: [[Int]]) {
@@ -8,8 +8,7 @@ private extension XCTest {
     }
 }
 
-class StrainTest: XCTestCase {
-
+class StrainTests: XCTestCase {
     func testEmptyKeep() {
 
         XCTAssertTrue ([].keep {each -> Bool in each < 10}.isEmpty)
@@ -83,4 +82,20 @@ class StrainTest: XCTestCase {
         XCTAssertEqualMultiArray([[1, 2, 3], [2, 1, 2], [2, 2, 1]], result)
     }
 
+    static var allTests: [(String, (StrainTests) -> () throws -> Void)] {
+        return [
+            ("testEmptyKeep", testEmptyKeep),
+            ("testKeepEverything", testKeepEverything),
+            ("testKeepFirstAndLast", testKeepFirstAndLast),
+            ("testKeepNeitherFirstNorLast", testKeepNeitherFirstNorLast),
+            ("testKeepStrings", testKeepStrings),
+            ("testKeepArrays ", testKeepArrays ),
+            ("testEmptyDiscard", testEmptyDiscard),
+            ("testDiscardNothing", testDiscardNothing),
+            ("testDiscardFirstAndLast", testDiscardFirstAndLast),
+            ("testDiscardNeitherFirstNorLast", testDiscardNeitherFirstNorLast),
+            ("testDiscardStrings", testDiscardStrings),
+            ("testDiscardArrays ", testDiscardArrays ),
+        ]
+    }
 }

data/tracks/swift/exercises/sublist/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/sublist/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "Sublist"
+)

data/tracks/swift/exercises/sublist/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/sublist/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import SublistTests
+
+XCTMain([
+    testCase(SublistTests.allTests),
+    ])

data/tracks/swift/exercises/sublist/{SubListTest.swift → Tests/SublistTests/SublistTests.swift}

@@ -1,7 +1,7 @@
 import XCTest
+@testable import Sublist
 
-class SubListTest: XCTestCase {
-
+class SublistTests: XCTestCase {
     func testEmptyLists() {
 
         XCTAssertEqual(.equal, classifier(listOne: [], listTwo: []) )
@@ -92,4 +92,26 @@ class SubListTest: XCTestCase {
 
         XCTAssertEqual(.unequal, classifier(listOne: [1, 0, 1], listTwo: [10, 1]))
     }
+
+    static var allTests: [(String, (SublistTests) -> () throws -> Void)] {
+        return [
+            ("testEmptyLists", testEmptyLists),
+            ("testEmptyListWithinNonEmptyList", testEmptyListWithinNonEmptyList),
+            ("testNonEmptyListContainingEmptyList", testNonEmptyListContainingEmptyList),
+            ("testEqualLists", testEqualLists),
+            ("testDifferentLists", testDifferentLists),
+            ("testFalseStart", testFalseStart),
+            ("testConsecutive", testConsecutive),
+            ("testSublistAtStart", testSublistAtStart),
+            ("testSublistInMiddle", testSublistInMiddle),
+            ("testSublistAtEnd", testSublistAtEnd),
+            ("testAtStartOfSuperList", testAtStartOfSuperList),
+            ("testInMiddleOfSuperList", testInMiddleOfSuperList),
+            ("testAtEndOfSuperList", testAtEndOfSuperList),
+            ("testFirstListMissingElementFromSecondList", testFirstListMissingElementFromSecondList),
+            ("testSecondListMissingElementFromFirstList", testSecondListMissingElementFromFirstList),
+            ("testOrderMattersToAList", testOrderMattersToAList),
+            ("testSameDigitsButDifferentNumbers", testSameDigitsButDifferentNumbers),
+        ]
+    }
 }

data/tracks/swift/exercises/sum-of-multiples/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/sum-of-multiples/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "SumOfMultiples"
+)

data/tracks/swift/exercises/sum-of-multiples/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/sum-of-multiples/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import SumOfMultiplesTests
+
+XCTMain([
+    testCase(SumOfMultiplesTests.allTests),
+    ])

data/tracks/swift/exercises/sum-of-multiples/{SumOfMultiplesTest.swift → Tests/SumOfMultiplesTests/SumOfMultiplesTests.swift}

@@ -1,9 +1,7 @@
-#if swift(>=3.0)
-    import XCTest
-#endif
-
-class SumOfMultiplesTest: XCTestCase {
+import XCTest
+@testable import SumOfMultiples
 
+class SumOfMultiplesTests: XCTestCase {
     func testSumTo1() {
         XCTAssertEqual(0, SumOfMultiples.toLimit(1, inMultiples: [3, 5]))
     }
@@ -48,4 +46,19 @@ class SumOfMultiplesTest: XCTestCase {
         XCTAssertEqual(45, SumOfMultiples.toLimit(10, inMultiples: [0, 1]))
     }
 
+    static var allTests: [(String, (SumOfMultiplesTests) -> () throws -> Void)] {
+        return [
+            ("testSumTo1", testSumTo1),
+            ("testSumTo3", testSumTo3),
+            ("testSumTo10", testSumTo10),
+            ("testSumTo100", testSumTo100),
+            ("testSumTo1000", testSumTo1000),
+            ("testConfigurable_7_13_17_to_20", testConfigurable_7_13_17_to_20),
+            ("testConfigurable_4_6_to_15", testConfigurable_4_6_to_15),
+            ("testConfigurable_5_6_8_to_150", testConfigurable_5_6_8_to_150),
+            ("testConfigurable_43_47_to_10000", testConfigurable_43_47_to_10000),
+            ("testConfigurable_0_to_10", testConfigurable_0_to_10),
+            ("testConfigurable_0_1_to_10", testConfigurable_0_1_to_10),
+        ]
+    }
 }

data/tracks/swift/exercises/tournament/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/tournament/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "Tournament"
+)

data/tracks/swift/exercises/tournament/{TournamentExample.swift → Sources/TournamentExample.swift}

@@ -1,4 +1,4 @@
-import Darwin
+import Foundation
 
 private extension String {
 
@@ -49,7 +49,7 @@ struct Tournament {
             return wins * 3 + draws
         }
 
-        mutating func addOutcome( _ outcome: Outcome ) -> Void {
+        mutating func addOutcome( _ outcome: Outcome ) {
             switch outcome {
             case .loss :
                 losses += 1
@@ -63,8 +63,8 @@ struct Tournament {
         }
     }
 
-    private var teams = [String : TeamResult]()
-    private mutating func addResult(_ team1: String, team2: String, outcome: Outcome) -> Void {
+    private var teams = [String: TeamResult]()
+    private mutating func addResult(_ team1: String, team2: String, outcome: Outcome) {
         // Invert outcome for the second team.
         let outcome2: Outcome  = (outcome == Outcome.win) ? Outcome.loss :
             (outcome == Outcome.loss) ? Outcome.win :
@@ -75,7 +75,7 @@ struct Tournament {
 
     private var teamResult = TeamResult()
 
-    private mutating func addTeamOutcome(_ team: String, _ outcome: Outcome) -> Void {
+    private mutating func addTeamOutcome(_ team: String, _ outcome: Outcome) {
         if teams[team] != nil {
             teamResult = teams[team]!
             teamResult.addOutcome(outcome)
@@ -117,12 +117,12 @@ struct Tournament {
 
         textOutput += header
         func sortKeysByValue() -> [String] {
-            var sortByValue = [(String, Int)]()
+            var sortByValue = [(team : String, score: Int, mp: Int)]()
             for each in Array(teams.keys) {
                 let tempVal = teams[each]!
-                sortByValue.append((each, tempVal.score))
+                sortByValue.append((each, tempVal.score, tempVal.played))
             }
-            sortByValue.sort { $0.1 > $1.1 }
+            sortByValue.sort { $0.score == $1.score ? $0.mp > $1.mp : $0.score > $1.score  }
             var sortedKeys = [String]()
             for each in sortByValue {
                 sortedKeys.append(each.0)
@@ -185,5 +185,4 @@ struct Tournament {
 
         return tournament.writeResults()
     }
-
 }

data/tracks/swift/exercises/tournament/Sources/deleteme.swift

@@ -0,0 +1 @@
+//Solution goes in Sources

data/tracks/swift/exercises/tournament/Tests/LinuxMain.swift

@@ -0,0 +1,6 @@
+import XCTest
+@testable import TournamentTests
+
+XCTMain([
+    testCase(TournamentTests.allTests),
+    ])

data/tracks/swift/exercises/tournament/{TournamentTest.swift → Tests/TournamentTests/TournamentTests.swift}

@@ -1,9 +1,7 @@
-#if swift(>=3.0)
-    import XCTest
-#endif
-
-class TournamentTest: XCTestCase {
+import XCTest
+@testable import Tournament
 
+class TournamentTests: XCTestCase {
     let input1 =
         "Allegoric Alaskians;Blithering Badgers;win\n" +
             "Devastating Donkeys;Courageous Californians;draw\n" +
@@ -14,15 +12,14 @@ class TournamentTest: XCTestCase {
 
     let input2 =
         "Allegoric Alaskians;Blithering Badgers;win\n" +
-            "Devastating Donkeys_Courageous Californians;draw\n" +
+            "Devastating Donkeys;Courageous Californians;draw\n" +
             "Devastating Donkeys;Allegoric Alaskians;win\n" +
             "\n" +
             "Courageous Californians;Blithering Badgers;loss\n" +
             "Bla;Bla;Bla\n" +
             "Blithering Badgers;Devastating Donkeys;loss\n" +
             "# Yackity yackity yack\n" +
-            "Allegoric Alaskians;Courageous Californians;win\n" +
-    "Devastating Donkeys;Courageous Californians;draw"
+            "Allegoric Alaskians;Courageous Californians;win\n"
 
     let input3 =
         "Allegoric Alaskians;Blithering Badgers;win\n" +
@@ -65,4 +62,11 @@ class TournamentTest: XCTestCase {
         XCTAssertEqual(tournament.tally(input3), expected3)
     }
 
+    static var allTests: [(String, (TournamentTests) -> () throws -> Void)] {
+        return [
+            ("testGoodInput", testGoodInput),
+            ("testIgnoreBadlines", testIgnoreBadlines),
+            ("testinCompleteCompetition", testinCompleteCompetition),
+        ]
+    }
 }

data/tracks/swift/exercises/transpose/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj

data/tracks/swift/exercises/transpose/Package.swift

@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "Transpose"
+)