trackler 2.2.1.52 → 2.2.1.53

data/tracks/kotlin/exercises/pig-latin/.meta/src/reference/kotlin/PigLatin.kt

@@ -15,10 +15,10 @@ object PigLatin {
         return word
     }
 
-    private val consonant = Regex("^([^aeiou]?qu|[^aeiou]+)([a-z]*)", RegexOption.IGNORE_CASE)
+    private val consonant = Regex("^([^aeiou]?qu|[^aeiouy]+|[^aeiou]+)([a-z]*)", RegexOption.IGNORE_CASE)
     private fun splitInitialConsonantSound(word: String) = consonant.matchEntire(word)?.groupValues?.drop(1)
 
     private val vowels = Regex("^([aeiou]|y[^aeiou]|xr)[a-z]*", RegexOption.IGNORE_CASE)
     private fun startsWithVowelSound(word: String) = vowels.matches(word)
 
-}
+}

data/tracks/kotlin/exercises/pig-latin/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/kotlin/exercises/pig-latin/src/test/kotlin/PigLatinTest.kt

@@ -1,5 +1,4 @@
 import org.junit.Test
-import org.junit.Ignore
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import kotlin.test.assertEquals
@@ -12,17 +11,20 @@ class PigLatinTest(val input: String, val expectedOutput: String) {
         @Parameterized.Parameters(name = "{index}: translate({0})={1}")
         fun data() = arrayOf(
                 // Ay is added to words that start with vowels
-                arrayOf("apple", "appleay"),
-                arrayOf("ear", "earay"),
-                arrayOf("igloo", "iglooay"),
+                arrayOf("apple",  "appleay"),
+                arrayOf("ear",    "earay"),
+                arrayOf("igloo",  "iglooay"),
                 arrayOf("object", "objectay"),
-                arrayOf("under", "underay"),
+                arrayOf("under",  "underay"),
+
+                // Ay is added to words that start with vowels followed by qu
+                arrayOf("equal",  "equalay"),
 
                 // First letter and ay are moved to the end of words that start with consonants
-                arrayOf("pig", "igpay"),
-                arrayOf("koala", "oalakay"),
-                arrayOf("yellow", "ellowyay"),
-                arrayOf("xenon", "enonxay"),
+                arrayOf("pig",    "igpay"),
+                arrayOf("koala",  "oalakay"),
+                arrayOf("xenon",  "enonxay"),
+                arrayOf("qat",    "atqay"),
 
                 // Ch is treated like a single consonant
                 arrayOf("chair", "airchay"),
@@ -48,14 +50,23 @@ class PigLatinTest(val input: String, val expectedOutput: String) {
                 // Xr is treated like a single vowel
                 arrayOf("xray", "xrayay"),
 
+                // Y is treated like a consonant at the beginning of a word
+                arrayOf("yellow", "ellowyay"),
+
+                // Y is treated like a vowel at the end of a consonant cluster
+                arrayOf("rhythm", "ythmrhay"),
+
+                // Y as second letter in two letter word
+                arrayOf("my",     "ymay"),
+
                 // Phrases are translated
                 arrayOf("quick fast run", "ickquay astfay unray")
         )
     }
 
-
     @Test
     fun test() {
         assertEquals(expectedOutput, PigLatin.translate(input))
     }
+
 }

data/tracks/kotlin/exercises/raindrops/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/raindrops/src/test/kotlin/RaindropsTest.kt

@@ -11,37 +11,30 @@ class RaindropsTest(val input: Int, val expectedOutput: String) {
         @JvmStatic
         @Parameterized.Parameters(name = "{index}: raindrops({0})={1}")
         fun data() = listOf(
-                // Non-primes
-                arrayOf(1, "1"),
-                arrayOf(52, "52"),
-                arrayOf(12121, "12121"),
-
-                // Numbers with 3 as a prime factor
-                arrayOf(3, "Pling"),
-                arrayOf(6, "Pling"),
-                arrayOf(9, "Pling"),
-
-                // Numbers with 5 as a prime factor
-                arrayOf(5, "Plang"),
-                arrayOf(10, "Plang"),
-                arrayOf(25, "Plang"),
-
-                // Numbers with 7 as a prime factor
-                arrayOf(7, "Plong"),
-                arrayOf(14, "Plong"),
-                arrayOf(49, "Plong"),
-
-                // Numbers with multiple activating prime factors
-                arrayOf(15, "PlingPlang"),
-                arrayOf(21, "PlingPlong"),
-                arrayOf(35, "PlangPlong"),
-                arrayOf(105, "PlingPlangPlong")
+                arrayOf(   1, "1"),
+                arrayOf(   3, "Pling"),
+                arrayOf(   5, "Plang"),
+                arrayOf(   7, "Plong"),
+                arrayOf(   6, "Pling"),
+                arrayOf(   8, "8"),
+                arrayOf(   9, "Pling"),
+                arrayOf(  10, "Plang"),
+                arrayOf(  14, "Plong"),
+                arrayOf(  15, "PlingPlang"),
+                arrayOf(  21, "PlingPlong"),
+                arrayOf(  25, "Plang"),
+                arrayOf(  27, "Pling"),
+                arrayOf(  35, "PlangPlong"),
+                arrayOf(  49, "Plong"),
+                arrayOf(  52, "52"),
+                arrayOf( 105, "PlingPlangPlong"),
+                arrayOf(3125, "Plang")
         )
     }
 
-
     @Test
     fun test() {
         assertEquals(expectedOutput, Raindrops.convert(input))
     }
+
 }

data/tracks/kotlin/exercises/react/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/react/src/test/kotlin/ReactTest.kt

@@ -5,6 +5,7 @@ import org.junit.runners.Parameterized
 import kotlin.test.assertEquals
 
 class ReactTest {
+
     @Test
     fun inputCellsHaveValue() {
         val reactor = Reactor<Int>()
@@ -132,7 +133,7 @@ class ReactTest {
         val vals2 = mutableListOf<Int>()
         output.addCallback { vals2.add(it) }
 
-        for (i in 1..10) {
+        for (i in 1..3) {
             sub1.cancel()
         }
 
@@ -170,17 +171,22 @@ class ReactTest {
         val vals = mutableListOf<Int>()
         alwaysTwo.addCallback { vals.add(it) }
 
-        for (i in 1..10) {
+        for (i in 2..5) {
             input.value = i
         }
 
         assertEquals(listOf<Int>(), vals)
     }
+
 }
 
+/*
+ * Extension
+ *
+ * This is a digital logic circuit called an adder:
+ * https://en.wikipedia.org/wiki/Adder_(electronics)
+ */
 @RunWith(Parameterized::class)
-// This is a digital logic circuit called an adder:
-// https://en.wikipedia.org/wiki/Adder_(electronics)
 class ReactAdderTest(val input: Input, val expected: Expected) {
 
     companion object {
@@ -218,4 +224,5 @@ class ReactAdderTest(val input: Input, val expected: Expected) {
 
         assertEquals(expected, Expected(sum=sum.value, carryOut=carryOut.value))
     }
+
 }

data/tracks/kotlin/exercises/robot-simulator/.meta/version

@@ -1 +1 @@
-1.0.0
+2.0.0

data/tracks/kotlin/exercises/roman-numerals/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/roman-numerals/src/test/kotlin/RomanNumeralTest.kt

@@ -12,7 +12,6 @@ class RomanNumeralsTest(val input: Int, val expectedOutput: String) {
         @JvmStatic
         @Parameterized.Parameters(name = "{index}: romanNumeral({0})={1}")
         fun data() = listOf(
-                arrayOf(0, ""),
                 arrayOf(1, "I"),
                 arrayOf(2, "II"),
                 arrayOf(3, "III"),
@@ -34,9 +33,9 @@ class RomanNumeralsTest(val input: Int, val expectedOutput: String) {
         )
     }
 
-
     @Test
     fun test() {
         assertEquals(expectedOutput, RomanNumeral.value(input))
     }
+
 }

data/tracks/kotlin/exercises/rotational-cipher/.meta/version

@@ -1 +1 @@
-1.0.0
+1.1.0

data/tracks/kotlin/exercises/rotational-cipher/src/test/kotlin/RotationalCipherTest.kt

@@ -4,6 +4,13 @@ import kotlin.test.assertEquals
 
 class RotationalCipherTest {
 
+    @Test
+    fun testRotateLowercaseABy0() {
+        val cipher = RotationalCipher(0)
+        assertEquals("a", cipher.encode("a"))
+    }
+
+    @Ignore
     @Test
     fun testRotateLowercaseABy1NoWrapAround() {
         val cipher = RotationalCipher(1)
@@ -17,13 +24,6 @@ class RotationalCipherTest {
         assertEquals("a", cipher.encode("a"))
     }
 
-    @Ignore
-    @Test
-    fun testRotateLowercaseABy0() {
-        val cipher = RotationalCipher(0)
-        assertEquals("a", cipher.encode("a"))
-    }
-
     @Ignore
     @Test
     fun testRotateLowercaseMBy13NoWrapAround() {

data/tracks/kotlin/exercises/scrabble-score/.meta/src/reference/kotlin/{Scrabble.kt → ScrabbleScore.kt}

@@ -1,4 +1,4 @@
-object Scrabble {
+object ScrabbleScore {
     private val scoreToLetters = mapOf(1 to "AEIOULNRST", 2 to "DG", 3 to "BCMP", 4 to "FHVWY", 5 to "K", 8 to "JX", 10 to "QZ").mapValues { it.value.toCharArray() }
     private val letterToScore = scoreToLetters.flatMap { entry -> entry.value.map { char -> Pair(char, entry.key) } }.toMap()
 

data/tracks/kotlin/exercises/scrabble-score/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/scrabble-score/src/test/kotlin/ScrabbleScoreTest.kt

@@ -1,5 +1,4 @@
 import org.junit.Test
-import org.junit.Ignore
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import kotlin.test.assertEquals
@@ -11,20 +10,23 @@ class ScrabbleScoreTest(val input: String, val expectedOutput: Int) {
         @JvmStatic
         @Parameterized.Parameters(name = "{index}: scoreWord({0})={1}")
         fun data() = listOf(
-                arrayOf("", 0),
-                arrayOf(" \t\n", 0),
                 arrayOf("a", 1),
+                arrayOf("A", 1),
                 arrayOf("f", 4),
+                arrayOf("at", 2),
+                arrayOf("zoo", 12),
                 arrayOf("street", 6),
                 arrayOf("quirky", 22),
-                arrayOf("OXYPHENBUTAZONE", 41),
-                arrayOf("alacrity", 13)
+                arrayOf("OxyphenButazone", 41),
+                arrayOf("pinata", 8),
+                arrayOf("", 0),
+                arrayOf("abcdefghijklmnopqrstuvwxyz", 87)
         )
     }
 
-
     @Test
     fun test() {
-        assertEquals(expectedOutput, Scrabble.scoreWord(input))
+        assertEquals(expectedOutput, ScrabbleScore.scoreWord(input))
     }
+
 }

data/tracks/kotlin/exercises/sieve/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/sieve/src/test/kotlin/SieveTest.kt

@@ -4,7 +4,14 @@ import kotlin.test.assertEquals
 
 class SieveTest {
 
+    @Test
+    fun noPrimesUnder2() {
+        val expectedOutput = emptyList<Int>()
+
+        assertEquals(expectedOutput, Sieve.primesUpTo(1))
+    }
 
+    @Ignore
     @Test
     fun findFirstPrime() {
         val expectedOutput = listOf(2)
@@ -35,4 +42,5 @@ class SieveTest {
 
         assertEquals(expectedOutput, Sieve.primesUpTo(1000))
     }
+
 }

data/tracks/kotlin/exercises/space-age/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/space-age/src/test/kotlin/SpaceAgeTest.kt

@@ -4,15 +4,6 @@ import kotlin.test.assertEquals
 
 class SpaceAgeTest {
 
-
-    @Test
-    fun ageInSeconds() {
-        val age = SpaceAge(1000000)
-
-        assertEquals(1000000, age.seconds)
-    }
-
-    @Ignore
     @Test
     fun ageOnEarth() {
         val age = SpaceAge(1000000000)
@@ -25,7 +16,6 @@ class SpaceAgeTest {
     fun ageOnMercury() {
         val age = SpaceAge(2134835688)
 
-        assertEquals(67.65, age.onEarth())
         assertEquals(280.88, age.onMercury())
     }
 
@@ -34,7 +24,6 @@ class SpaceAgeTest {
     fun ageOnVenus() {
         val age = SpaceAge(189839836)
 
-        assertEquals(6.02, age.onEarth())
         assertEquals(9.78, age.onVenus())
     }
 
@@ -43,7 +32,6 @@ class SpaceAgeTest {
     fun ageOnMars() {
         val age = SpaceAge(2329871239L)
 
-        assertEquals(73.83, age.onEarth())
         assertEquals(39.25, age.onMars())
     }
 
@@ -52,7 +40,6 @@ class SpaceAgeTest {
     fun ageOnJupiter() {
         val age = SpaceAge(901876382)
 
-        assertEquals(28.58, age.onEarth())
         assertEquals(2.41, age.onJupiter())
     }
 
@@ -61,7 +48,6 @@ class SpaceAgeTest {
     fun ageOnSaturn() {
         val age = SpaceAge(3000000000L)
 
-        assertEquals(95.06, age.onEarth())
         assertEquals(3.23, age.onSaturn())
     }
 
@@ -70,7 +56,6 @@ class SpaceAgeTest {
     fun ageOnUranus() {
         val age = SpaceAge(3210123456L)
 
-        assertEquals(101.72, age.onEarth())
         assertEquals(1.21, age.onUranus())
     }
 
@@ -79,7 +64,7 @@ class SpaceAgeTest {
     fun ageOnNeptune() {
         val age = SpaceAge(8210123456L)
 
-        assertEquals(260.16, age.onEarth())
         assertEquals(1.58, age.onNeptune())
     }
+
 }

data/tracks/kotlin/exercises/sum-of-multiples/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/kotlin/exercises/sum-of-multiples/src/test/kotlin/SumOfMultiplesTest.kt

@@ -17,14 +17,14 @@ class SumOfMultiplesTest {
 
     @Test
     @Ignore
-    fun `multiples of 3 or 5 up to 10`() {
-        assertEquals(23, SumOfMultiples.sum(setOf(3, 5), 10))
+    fun `multiples of 3 up to 7`() {
+        assertEquals(9, SumOfMultiples.sum(setOf(3), 7))
     }
 
     @Test
     @Ignore
-    fun `multiples of 3 or 5 up to 20`() {
-        assertEquals(78, SumOfMultiples.sum(setOf(3, 5), 20))
+    fun `multiples of 3 or 5 up to 10`() {
+        assertEquals(23, SumOfMultiples.sum(setOf(3, 5), 10))
     }
 
     @Test
@@ -36,7 +36,7 @@ class SumOfMultiplesTest {
     @Test
     @Ignore
     fun `multiples of 3 or 5 up to 1000`() {
-        assertEquals(233_168, SumOfMultiples.sum(setOf(3, 5), 1000))
+        assertEquals(233168, SumOfMultiples.sum(setOf(3, 5), 1000))
     }
 
     @Test
@@ -66,7 +66,7 @@ class SumOfMultiplesTest {
     @Test
     @Ignore
     fun `multiples of 43 or 47 up to 10000`() {
-        assertEquals(2_203_160, SumOfMultiples.sum(setOf(43, 47), 10_000))
+        assertEquals(2203160, SumOfMultiples.sum(setOf(43, 47), 10000))
     }
 
     @Test
@@ -78,7 +78,7 @@ class SumOfMultiplesTest {
     @Test
     @Ignore
     fun `multiples of an empty set up to 10000`() {
-        assertEquals(0, SumOfMultiples.sum(emptySet(), 10_000))
+        assertEquals(0, SumOfMultiples.sum(emptySet(), 10000))
     }
 
 }

data/tracks/kotlin/exercises/triangle/.meta/version

@@ -0,0 +1 @@
+1.0.0

data/tracks/kotlin/exercises/two-fer/.meta/version

@@ -0,0 +1 @@
+1.1.0

data/tracks/kotlin/exercises/two-fer/src/test/kotlin/TwoferTest.kt

@@ -2,7 +2,6 @@ import org.junit.Ignore
 import org.junit.Test
 import kotlin.test.assertEquals
 
-
 class TwoferTest {
 
     @Test