trackler 2.2.1.110 → 2.2.1.111

data/tracks/scala/testgen/src/main/scala/OcrNumbersTestGenerator.scala

@@ -15,10 +15,10 @@ object OcrNumbersTestGenerator {
       }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val property = labeledTest.property
           val sutCall =
             s"""$sut.$property($args)"""
@@ -26,7 +26,7 @@ object OcrNumbersTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("rows"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/PalindromeProductsTestGenerator.scala

@@ -19,10 +19,10 @@ object PalindromeProductsTestGenerator {
       }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val property = labeledTest.property
           val sutCall = s"""$sut($args).$property"""
           val expected = toString(labeledTest.expected)
@@ -30,7 +30,7 @@ object PalindromeProductsTestGenerator {
       }
 
     val code =
-      TestSuiteBuilder.build(file, fromLabeledTest("input_min", "input_max"),
+      TestSuiteBuilder.build(file, fromLabeledTestFromInput("min", "max"),
         Seq(),
         Seq("// PalindromeProducts largest call is expecting a return type of",
             "// Option[(Int, Set[(Int, Int)])] - None is expected for error cases.",

data/tracks/scala/testgen/src/main/scala/PangramsTestGenerator.scala

@@ -5,10 +5,10 @@ import java.io.File
 object PangramsTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/pangram.json")
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val isPangram = labeledTest.property.mkString
           val sutCall =
             s"""Pangrams.$isPangram($args)"""
@@ -17,7 +17,7 @@ object PangramsTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("sentence"))
     println(s"‐‐‐‐‐‐‐‐‐‐‐‐‐")
     println(code)
     println(s"‐‐‐‐‐‐‐‐‐‐‐‐‐")

data/tracks/scala/testgen/src/main/scala/PascalsTriangleTestGenerator.scala

@@ -34,7 +34,7 @@ object PascalsTriangleTestGenerator {
           if (labeledTest.result.valuesIterator.contains(null)) {
             None
           } else {
-            val args = sutArgs(labeledTest.result, argNames: _*)
+            val args = sutArgsFromInput(labeledTest.result, argNames: _*)
             val property = labeledTest.property
             val sutCall =
               s"""$sut.$property($args)"""

data/tracks/scala/testgen/src/main/scala/PerfectNumbersTestGenerator.scala

@@ -23,10 +23,10 @@ object PerfectNumbersTestGenerator {
         }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val property = labeledTest.property
           val sutCall =
             s"""PerfectNumbers.$property($args)"""
@@ -34,7 +34,7 @@ object PerfectNumbersTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("number"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/PhoneNumberTestGenerator.scala

@@ -7,7 +7,7 @@ object PhoneNumberTestGenerator {
   def fromLabeledTest(argNames: String*): ToTestCaseData =
     withLabeledTest { sut =>
       labeledTest =>
-        val args = sutArgs(labeledTest.result, argNames: _*)
+        val args = sutArgsFromInput(labeledTest.result, argNames: _*)
         val property = labeledTest.property
         val sutCall =
           s"""PhoneNumber.$property($args)"""

data/tracks/scala/testgen/src/main/scala/PigLatinTestGenerator.scala

@@ -8,7 +8,7 @@ object PigLatinTestGenerator {
     val file = new File("src/main/resources/pig-latin.json")
 
     val code =
-      TestSuiteBuilder.build(file, fromLabeledTest("input"))
+      TestSuiteBuilder.build(file, fromLabeledTestFromInput("phrase"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/PrimeFactorsTestGenerator.scala

@@ -7,29 +7,29 @@ object PrimeFactorsTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/prime-factors.json")
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("value"))
     println(s"-------------")
     println(code)
     println(s"-------------")
   }
 
-  private def fromLabeledTest(argNames: String*): ToTestCaseData =
+  private def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
     withLabeledTest { sut =>
       labeledTest =>
         val sutFunction = labeledTest.property
-        val args = sutArgs(labeledTest.result, argNames: _*)
+        val args = sutArgsFromInput(labeledTest.result, argNames: _*)
         val sutCall = s"$sut.$sutFunction($args)"
         val expected = toString(labeledTest.expected)
 
         TestCaseData(labeledTest.description, sutCall, expected)
     }
 
-  def sutArgs(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
-    argNames map (name => toString(parseResult(name))) mkString ", "
+  def sutArgsFromInput(parseResult: CanonicalDataParser.ParseResult, argNames: String*): String =
+    argNames map (name => toString(parseResult("input").asInstanceOf[Map[String, Any]](name))) mkString ", "
 
   def toString(expected: CanonicalDataParser.Expected): String = {
     expected match {
-      case Left(error) => throw new IllegalStateException("Unexpected Left")
+      case Left(_) => throw new IllegalStateException("Unexpected Left")
       case Right(exp) => s"${toString(exp)}"
     }
   }
@@ -38,8 +38,6 @@ object PrimeFactorsTestGenerator {
     def quote(str: String): String =
       if ("\"\n" exists (str.contains(_:Char))) "\"\"\"" else "\""
 
-    System.out.println(any.getClass)
-
     any match {
       case list: List[_] =>
         val vals = list.map(s => toString(s)).mkString(", ")

data/tracks/scala/testgen/src/main/scala/QueenAttackTestGenerator.scala

@@ -7,27 +7,30 @@ object QueenAttackTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/queen-attack.json")
 
-    def getPositionArgs(queenMap: Map[String, String]): String =
-      queenMap("position").stripPrefix("(").stripSuffix(")")
+    def getPosition(labeledTest: LabeledTest,
+                    queenType: String): (Int, Int) = {
+      val inputMap = labeledTest.result("input").asInstanceOf[Map[String, Any]]
+      val queenMap = inputMap(queenType).asInstanceOf[Map[String, Any]]
+      val positionMap = queenMap("position").asInstanceOf[Map[String, Int]]
 
-    def getQueen(labeledTest: LabeledTest): Map[String, String] = {
-      labeledTest.result("queen").
-        asInstanceOf[Map[String, String]]
+      (positionMap("row"), positionMap("column"))
     }
 
-    def getWhiteQueen(labeledTest: LabeledTest): Map[String, String] = {
-      labeledTest.result("white_queen").
-        asInstanceOf[Map[String, String]]
-    }
+    def getQueenPosition(labeledTest: LabeledTest): (Int, Int) =
+      getPosition(labeledTest, "queen")
 
-    def getBlackQueen(labeledTest: LabeledTest): Map[String, String] = {
-      labeledTest.result("black_queen").
-        asInstanceOf[Map[String, String]]
-    }
+    def getWhiteQueenPosition(labeledTest: LabeledTest): (Int, Int) =
+      getPosition(labeledTest, "white_queen")
+
+    def getBlackQueenPosition(labeledTest: LabeledTest): (Int, Int) =
+      getPosition(labeledTest, "black_queen")
 
-    def getCanAttackArgs(labeledTest: LabeledTest): String = {
-      val whiteQueenArgs = getPositionArgs(getWhiteQueen(labeledTest))
-      val blackQueenArgs = getPositionArgs(getBlackQueen(labeledTest))
+    def toPositionArgs(position: (Int, Int)) =
+      s"${position._1}, ${position._2}"
+
+    def toCanAttackArgs(labeledTest: LabeledTest): String = {
+      val whiteQueenArgs = toPositionArgs(getWhiteQueenPosition(labeledTest))
+      val blackQueenArgs = toPositionArgs(getBlackQueenPosition(labeledTest))
       s"create($whiteQueenArgs), create($blackQueenArgs)"
     }
 
@@ -36,25 +39,24 @@ object QueenAttackTestGenerator {
       expected match {
         case Right(-1) => s"None"
         case Right(0) =>
-          val args = getPositionArgs(getQueen(labeledTest))
+          val args = toPositionArgs(getQueenPosition(labeledTest))
           s"Some(Queen($args))"
         case _ => throw new IllegalStateException
       }
     }
 
-
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput: ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
           val property = labeledTest.property
           val (clazz, args, expected) = property match {
             case "create" =>
               ("Queen",
-                getPositionArgs(getQueen(labeledTest)),
+                toPositionArgs(getQueenPosition(labeledTest)),
                 toCreateExpected(labeledTest))
             case "canAttack" =>
               ("QueenAttack",
-                getCanAttackArgs(labeledTest),
+                toCanAttackArgs(labeledTest),
                 labeledTest.expected.fold(_ => "false", _.toString))
             case _ => throw new IllegalStateException()
           }
@@ -63,7 +65,7 @@ object QueenAttackTestGenerator {
       }
 
     val code =
-      TestSuiteBuilder.build(file, fromLabeledTest(),
+      TestSuiteBuilder.build(file, fromLabeledTestFromInput,
         Seq(),
         Seq(" private def create(x: Int, y: Int): Queen = {",
           "    Queen.create(x, y) match {",

data/tracks/scala/testgen/src/main/scala/RailFenceCipherTestGenerator.scala

@@ -7,7 +7,7 @@ object RailFenceCipherTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/rail-fence-cipher.json")
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("msg", "rails"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("msg", "rails"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/RaindropsTestGenerator.scala

@@ -1,13 +1,13 @@
 import java.io.File
 
 import testgen.TestSuiteBuilder
-import testgen.TestSuiteBuilder.fromLabeledTest
+import testgen.TestSuiteBuilder.fromLabeledTestFromInput
 
 object RaindropsTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/raindrops.json")
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("number"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("number"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/RnaTranscriptionTestGenerator.scala

@@ -15,10 +15,10 @@ object RnaTranscriptionTestGenerator {
       }
     }
 
-    def fromLabeledTest(argNames: String*): ToTestCaseData =
+    def fromLabeledTestFromInput(argNames: String*): ToTestCaseData =
       withLabeledTest { sut =>
         labeledTest =>
-          val args = sutArgs(labeledTest.result, argNames: _*)
+          val args = sutArgsFromInput(labeledTest.result, argNames: _*)
           val property = labeledTest.property
           val sutCall =
             s"""RnaTranscription.$property($args)"""
@@ -26,7 +26,7 @@ object RnaTranscriptionTestGenerator {
           TestCaseData(labeledTest.description, sutCall, expected)
       }
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("dna"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("dna"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/RomanNumeralsTestGenerator.scala

@@ -1,13 +1,13 @@
 import java.io.File
 
 import testgen.TestSuiteBuilder
-import testgen.TestSuiteBuilder.fromLabeledTest
+import testgen.TestSuiteBuilder.fromLabeledTestFromInput
 
 object RomanNumeralsTestGenerator {
   def main(args: Array[String]): Unit = {
     val file = new File("src/main/resources/roman-numerals.json")
 
-    val code = TestSuiteBuilder.build(file, fromLabeledTest("number"))
+    val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("number"))
     println(s"-------------")
     println(code)
     println(s"-------------")

data/tracks/scala/testgen/src/main/scala/testgen/TestSuiteBuilder.scala

@@ -163,6 +163,11 @@ object TestSuiteBuilder {
   def quote(str: String): String =
     if ("\"\n" exists (str.contains(_:Char))) "\"\"\"" else "\""
 
+  def escape(raw: String): String = {
+    import scala.reflect.runtime.universe._
+    Literal(Constant(raw)).toString
+  }
+
   def toString(any: Any): String = {
     any match {
       case list: List[_] =>

data/tracks/scheme/docs/RESOURCES.md

@@ -2,6 +2,7 @@
 
 * [Structure and Interpretation of Computer Programs](http://mitpress.mit.edu/sicp/), by Abelson, Sussman, and Sussman
 * [The Little Schemer](http://mitpress.mit.edu/books/little-schemer)
+* [Berkeley CS61A Lectures](https://archive.org/details/ucberkeley-webcast-PL3E89002AA9B9879E?sort=titleSorter), by Brian Harvey, based on the SICP book
 
 ## Tools
 

data/tracks/swift/.travis.yml

@@ -16,5 +16,10 @@ matrix:
       env: JOB=Linux41x
       sudo: required
       services: docker
+    - script: 
+        - ./xswift-test-spm
+      env: JOB=SPM
+      os: osx
+      osx_image: xcode9.3beta 
 
 

data/tracks/typescript/config.json

@@ -14,6 +14,17 @@
       ],
       "uuid": "755f6f85-9ab3-4af6-9e35-dbb9d64be9c5"
     },
+    {
+      "core": false,
+      "difficulty": 1,
+      "slug": "two-fer",
+      "topics": [
+        "strings",
+        "control_flow_conditionals"
+      ],
+      "unlocked_by": "hello-world",
+      "uuid": "f66508fe-4ddc-4bbd-b8e6-542d400e57e9"
+    },
     {
       "core": true,
       "difficulty": 1,
@@ -25,6 +36,18 @@
       ],
       "uuid": "fb80f76c-42da-4f62-9f0f-8c85d984908b"
     },
+    {
+      "core": false,
+      "difficulty": 2,
+      "slug": "reverse-string",
+      "topics": [
+        "loops",
+        "for",
+        "strings"
+      ],
+      "unlocked_by": "leap",
+      "uuid": "86d5a60a-fc44-443d-bc00-5c6265e736c4"
+    },
     {
       "core": true,
       "difficulty": 2,
@@ -49,6 +72,19 @@
       ],
       "uuid": "3977d4e5-82ca-4801-ae20-6682dda23506"
     },
+    {
+      "core": false,
+      "difficulty": 2,
+      "slug": "protein-translation",
+      "topics": [
+        "arrays",
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "strings"
+      ],
+      "unlocked_by": "rna-transcription",
+      "uuid": "e18a436f-5d7b-4372-9f74-15e8e9a52d63"
+    },
     {
       "core": true,
       "difficulty": 3,
@@ -64,6 +100,21 @@
       ],
       "uuid": "a2c7abe7-b487-4cc2-a86a-d97cdd61709d"
     },
+    {
+      "core": false,
+      "difficulty": 3,
+      "slug": "isogram",
+      "topics": [
+        "ascii",
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "filtering",
+        "searching",
+        "strings"
+      ],
+      "unlocked_by": "pangram",
+      "uuid": "505eadfc-40df-476f-82d7-fe3b78b1f713"
+    },
     {
       "core": true,
       "difficulty": 3,
@@ -75,6 +126,20 @@
       ],
       "uuid": "8fe1e0ef-068e-4a53-a576-35be59f8152f"
     },
+    {
+      "core": false,
+      "difficulty": 3,
+      "slug": "roman-numerals",
+      "topics": [
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "mathematics",
+        "pattern_recognition",
+        "transforming"
+      ],
+      "unlocked_by": "pangram",
+      "uuid": "a4ea1a4d-d010-4039-a2b5-e3e748df7f8a"
+    },
     {
       "core": false,
       "difficulty": 4,
@@ -90,6 +155,20 @@
       ],
       "uuid": "e16c3064-b2ef-11e7-abc4-cec278b6b50a"
     },
+    {
+      "core": false,
+      "difficulty": 4,
+      "slug": "twelve-days",
+      "topics": [
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "polymorphism",
+        "strings",
+        "pattern_recognition"
+      ],
+      "unlocked_by": "bob",
+      "uuid": "cb04ab17-9611-44a1-8406-ed385da0044d"
+    },
     {
       "core": true,
       "difficulty": 4,
@@ -101,8 +180,55 @@
         "integers",
         "mathematics"
       ],
+      "unlocked_by": "bob",
       "uuid": "4ecf9470-a959-11e7-abc4-cec278b6b50a"
     },
+    {
+      "core": true,
+      "difficulty": 4,
+      "slug": "matrix",
+      "topics": [
+        "arrays",
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "data_structures",
+        "matrices",
+        "text_formatting"
+      ],
+      "unlocked_by": "prime-factors",
+      "uuid": "167ec8f2-a206-4a7e-999d-7dbfc136a9fe"
+    },
+    {
+      "core": false,
+      "difficulty": 4,
+      "slug": "saddle-points",
+      "topics": [
+        "arrays",
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "integers",
+        "lists",
+        "mathematics",
+        "matrices",
+        "sets"
+      ],
+      "unlocked_by": "matrix",
+      "uuid": "d35da73a-5124-4911-a2c3-07c68d4b79c2"
+    },
+    {
+      "core": false,
+      "difficulty": 4,
+      "slug": "nucleotide-count",
+      "topics": [
+        "control_flow_conditionals",
+        "control_flow_loops",
+        "strings",
+        "arrays",
+        "text_formatting"
+      ],
+      "unlocked_by": "rna-transcription",
+      "uuid": "ef16d487-524e-4c5a-8311-9162babba181"
+    },
     {
       "core": false,
       "difficulty": 5,
@@ -146,6 +272,19 @@
       ],
       "uuid": "7d42dd76-a6cf-11e7-abc4-cec278b6b50a"
     },
+    {
+      "core": false,
+      "difficulty": 6,
+      "slug": "allergies",
+      "topics": [
+        "arrays",
+        "bitwise-operations",
+        "control_flow_conditionals",
+        "control_flow_loops"
+      ],
+      "unlocked_by": "rna-transcription",
+      "uuid": "9389fcb2-841a-42b6-8ece-f5a63f750273"
+    },
     {
       "core": false,
       "difficulty": 6,
@@ -415,6 +554,20 @@
       "unlocked_by": "leap",
       "uuid": "0eb37e93-d191-4451-bd77-cd3681c91d94"
     },
+    {
+      "core": false,
+      "difficulty": 4,
+      "slug": "collatz-conjecture",
+      "topics": [
+        "conditionals",
+        "exception_handling",
+        "integers",
+        "mathematics",
+        "recursion"
+      ],
+      "unlocked_by": "leap",
+      "uuid": "a701b4ca-55ea-4aa9-a607-2fe8a9828d9c"
+    },
     {
       "core": true,
       "difficulty": 5,
@@ -552,7 +705,7 @@
         "arrays",
         "control-flow-(conditionals)",
         "control-flow-(loops)",
-        "text-formatting" 
+        "text-formatting"
       ]
     }
   ],