trackler 2.2.1.68 → 2.2.1.69

data/tracks/fsharp/generators/Generators.fs

@@ -449,19 +449,35 @@ type OcrNumbers() =
 
 type Pangram() =
     inherit Exercise()
-    
-type PerfectNumbers() =
+
+type PalindromeProducts() =
     inherit Exercise()
 
-    let toClassification value = string value |> String.humanize
+    let toFactors (value: obj) = 
+        let jArray = value :?> JArray
+        let factors = jArray.ToObject<int list>()
+        sprintf "(%A, %A)" factors.[0] factors.[1]
+
+    let toPalindromeProducts (value: obj) =
+        let jObject = value :?> JObject
+        let palindromeValue = jObject.Value<int>("value")
+        let factors = 
+            jObject.Value<JArray>("factors") 
+            |> normalizeJArray
+            |> Seq.map toFactors
+            |> formatList
+
+        sprintf "(%d, %s)" palindromeValue factors
 
     override this.RenderExpected (canonicalDataCase, key, value) = 
         value 
-        |> Option.ofNonError  
-        |> Option.map toClassification 
+        |> Option.ofNonError
+        |> Option.map toPalindromeProducts 
         |> formatOption 
         |> parenthesizeOption
 
+    override this.PropertiesUsedAsSutParameter canonicalDataCase = ["input_min"; "input_max"]
+
 type PascalsTriangle() =
     inherit Exercise()
 
@@ -491,6 +507,18 @@ type PascalsTriangle() =
         | _ -> base.IdentifierTypeAnnotation (canonicalDataCase, key, value)       
 
     override this.ToTestMethodBodyAssertTemplate canonicalDataCase = "AssertEqual"
+    
+type PerfectNumbers() =
+    inherit Exercise()
+
+    let toClassification value = string value |> String.humanize
+
+    override this.RenderExpected (canonicalDataCase, key, value) = 
+        value 
+        |> Option.ofNonError  
+        |> Option.map toClassification 
+        |> formatOption 
+        |> parenthesizeOption
 
 type PhoneNumber() =
     inherit Exercise()
@@ -717,6 +745,15 @@ type RomanNumerals() =
 type ScrabbleScore() =
     inherit Exercise()
 
+type SpiralMatrix() =
+    inherit Exercise()
+
+    override this.RenderExpected (canonicalDataCase, key, value) =
+        (value :?> JArray)
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type TwelveDays() =
     inherit Exercise()
 

data/tracks/fsharp/generators/Properties/launchSettings.json

@@ -1,8 +1,7 @@
 {
   "profiles": {
     "Generators": {
-      "commandName": "Project",
-      "commandLineArgs": "-e allergies"
+      "commandName": "Project"
     }
   }
 }

data/tracks/java/config.json

@@ -721,7 +721,12 @@
       "core": true,
       "difficulty": 6,
       "slug": "binary-search",
-      "topics": null,
+      "topics": [
+        "recursion",
+        "arrays",
+        "searching",
+        "generics"
+      ],
       "unlocked_by": null,
       "uuid": "50136dc3-caf7-4fa1-b7bd-0cba1bea9176"
     },
@@ -1150,4 +1155,4 @@
   ],
   "language": "Java",
   "solution_pattern": "reference"
-}
+}

data/tracks/java/exercises/binary-search-tree/src/test/java/BinarySearchTreeTest.java

@@ -6,7 +6,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.Before;
 
 public class BinarySearchTreeTest {
 

data/tracks/javascript/.eslintignore

@@ -36,5 +36,4 @@ exercises/secret-handshake
 exercises/simple-cipher
 exercises/simple-linked-list
 exercises/triangle
-exercises/trinary
-exercises/wordy
+exercises/trinary

data/tracks/javascript/exercises/wordy/example.js

@@ -47,11 +47,11 @@ WordProblem.prototype.evaluate = function () {
   var out = 0;
   var m   = this.matches;
 
-  if (m[1] !== undefined && m[2] !== undefined && m[3] !== undefined) {
+  if ( (typeof m[1]) === 'string'  && (typeof m[2]) === 'string'  && (typeof m[3]) === 'string') {
     out = this.operate(m[2], m[1], m[3]);
   }
 
-  if (m[4] !== undefined && m[5] !== undefined) {
+  if ( (typeof m[4]) === 'string' && (typeof m[5]) === 'string') {
     out = this.operate(m[4], out, m[5]);
   }
 

data/tracks/perl6/exercises/atbash-cipher/AtbashCipher.pm6

@@ -1 +1,7 @@
 unit module AtbashCipher:ver<1>;
+
+sub encode ($phrase) is export {
+}
+
+sub decode ($phrase) is export {
+}

data/tracks/perl6/exercises/atbash-cipher/atbash-cipher.t

@@ -7,7 +7,7 @@ use JSON::Fast;
 my Str:D $exercise := 'AtbashCipher';
 my Version:D $version = v1;
 my Str $module //= $exercise;
-plan 4;
+plan 14;
 
 use-ok $module or bail-out;
 require ::($module);
@@ -22,14 +22,7 @@ if ::($exercise).^ver !~~ $version {
 require ::($module) <&encode &decode>;
 
 my $c-data = from-json $=pod.pop.contents;
-for @($c-data<cases>) {
-  my $test = .<description> ~~ 'encode' ?? 'encode' !! 'decode';
-  subtest $test => {
-    my @cases = |.<cases>;
-    plan +@cases;
-    is &::($test)(.<phrase>), |.<expected description> for @cases;
-  }
-}
+is .<phrase>.&::(.<property>), |.<expected description> for $c-data<cases>»<cases>».Array.flat;
 
 =head2 Canonical Data
 =begin code

data/tracks/perl6/exercises/atbash-cipher/example.yaml

@@ -1,16 +1,9 @@
 exercise: AtbashCipher
 version: 1
-plan: 4
+plan: 14
 imports: '&encode &decode'
 tests: |-
-  for @($c-data<cases>) {
-    my $test = .<description> ~~ 'encode' ?? 'encode' !! 'decode';
-    subtest $test => {
-      my @cases = |.<cases>;
-      plan +@cases;
-      is &::($test)(.<phrase>), |.<expected description> for @cases;
-    }
-  }
+  is .<phrase>.&::(.<property>), |.<expected description> for $c-data<cases>»<cases>».Array.flat;
 
 unit: module
 example: |-
@@ -26,3 +19,9 @@ example: |-
               .subst( /\W/, '', :g )
               .trans( [ 'a'..'z' ] =>  ['a'..'z'].reverse );
   }
+stub: |-
+  sub encode ($phrase) is export {
+  }
+
+  sub decode ($phrase) is export {
+  }

data/tracks/perl6/exercises/grade-school/Example.pm6

@@ -1,4 +1,4 @@
-unit module GradeSchool:ver<1>;
+unit module GradeSchool:ver<2>;
 
 class Roster is export {
   has %!roster;

data/tracks/perl6/exercises/grade-school/GradeSchool.pm6

@@ -1,4 +1,4 @@
-unit module GradeSchool:ver<1>;
+unit module GradeSchool:ver<2>;
 
 class Roster is export {
 }

data/tracks/perl6/exercises/grade-school/example.yaml

@@ -1,26 +1,33 @@
 exercise: GradeSchool
-version: 1
-plan: 10
+version: 2
+plan: 19
 imports: Roster
 tests: |-
   subtest "Roster class methods", {
     plan 3;
     ok ::('Roster').can($_), $_ for <add-student list-grade list-all>;
   }
+
   my $roster = ::('Roster').new;
+
   ok $roster.?add-student(:name('Jim'), :2grade), 'Add Jim to grade 2';
-  is $roster.?list-grade(2), <Jim>, 'List grade 2';
+  cmp-ok $roster.?list-grade(2), '~~', <Jim>, 'List grade 2';
+
   ok $roster.?add-student(:name('Zoe'), :2grade), 'Add Zoe to grade 2';
   ok $roster.?add-student(:name('Barb'), :1grade), 'Add Barb to grade 1';
-  is $roster.?list-grade(2), <Jim Zoe>, 'List grade 2';
-  is $roster.?list-grade(1), <Barb>, 'List grade 1';
-  subtest 'Additional students', {
-    plan 6;
-    ok $roster.?add-student(:name($_), :1grade), "Add $_ to grade 1" for <Charlie Anna>;
-    ok $roster.?add-student(:name('Alex'), :2grade), 'Add Alex to grade 2';
-    ok $roster.?add-student(:name($_), :3grade), "Add $_ to grade 3" for <Tom Dick Harry>;
-  }
-  is $roster.?list-all, ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';
+  cmp-ok $roster.?list-grade(2), '~~', <Jim Zoe>, 'List grade 2';
+  cmp-ok $roster.?list-grade(1), '~~', <Barb>, 'List grade 1';
+
+  cmp-ok $roster.?list-all, '~~', ('Grade 1', <Barb>, 'Grade 2', <Jim Zoe>), 'List all';
+
+  ok $roster.?add-student(:name($_), :1grade), "Add $_ to grade 1" for <Charlie Anna>;
+  ok $roster.?add-student(:name('Alex'), :2grade), 'Add Alex to grade 2';
+  ok $roster.?add-student(:name($_), :3grade), "Add $_ to grade 3" for <Tom Dick Harry>;
+
+  cmp-ok $roster.?list-grade(1), '~~', <Anna Barb Charlie>, 'List grade 1';
+  cmp-ok $roster.?list-grade(2), '~~', <Alex Jim Zoe>, 'List grade 2';
+  cmp-ok $roster.?list-grade(3), '~~', <Dick Harry Tom>, 'List grade 3';
+  cmp-ok $roster.?list-all, '~~', ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';
 
 unit: module
 example: |-

data/tracks/perl6/exercises/grade-school/grade-school.t

@@ -4,9 +4,9 @@ use Test;
 use lib $?FILE.IO.dirname;
 
 my Str:D $exercise := 'GradeSchool';
-my Version:D $version = v1;
+my Version:D $version = v2;
 my Str $module //= $exercise;
-plan 10;
+plan 19;
 
 use-ok $module or bail-out;
 require ::($module);
@@ -24,19 +24,26 @@ subtest "Roster class methods", {
   plan 3;
   ok ::('Roster').can($_), $_ for <add-student list-grade list-all>;
 }
+
 my $roster = ::('Roster').new;
+
 ok $roster.?add-student(:name('Jim'), :2grade), 'Add Jim to grade 2';
-is $roster.?list-grade(2), <Jim>, 'List grade 2';
+cmp-ok $roster.?list-grade(2), '~~', <Jim>, 'List grade 2';
+
 ok $roster.?add-student(:name('Zoe'), :2grade), 'Add Zoe to grade 2';
 ok $roster.?add-student(:name('Barb'), :1grade), 'Add Barb to grade 1';
-is $roster.?list-grade(2), <Jim Zoe>, 'List grade 2';
-is $roster.?list-grade(1), <Barb>, 'List grade 1';
-subtest 'Additional students', {
-  plan 6;
-  ok $roster.?add-student(:name($_), :1grade), "Add $_ to grade 1" for <Charlie Anna>;
-  ok $roster.?add-student(:name('Alex'), :2grade), 'Add Alex to grade 2';
-  ok $roster.?add-student(:name($_), :3grade), "Add $_ to grade 3" for <Tom Dick Harry>;
-}
-is $roster.?list-all, ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';
+cmp-ok $roster.?list-grade(2), '~~', <Jim Zoe>, 'List grade 2';
+cmp-ok $roster.?list-grade(1), '~~', <Barb>, 'List grade 1';
+
+cmp-ok $roster.?list-all, '~~', ('Grade 1', <Barb>, 'Grade 2', <Jim Zoe>), 'List all';
+
+ok $roster.?add-student(:name($_), :1grade), "Add $_ to grade 1" for <Charlie Anna>;
+ok $roster.?add-student(:name('Alex'), :2grade), 'Add Alex to grade 2';
+ok $roster.?add-student(:name($_), :3grade), "Add $_ to grade 3" for <Tom Dick Harry>;
+
+cmp-ok $roster.?list-grade(1), '~~', <Anna Barb Charlie>, 'List grade 1';
+cmp-ok $roster.?list-grade(2), '~~', <Alex Jim Zoe>, 'List grade 2';
+cmp-ok $roster.?list-grade(3), '~~', <Dick Harry Tom>, 'List grade 3';
+cmp-ok $roster.?list-all, '~~', ('Grade 1', <Anna Barb Charlie>, 'Grade 2', <Alex Jim Zoe>, 'Grade 3', <Dick Harry Tom>), 'List all';
 
 INIT { $module = 'Example' if %*ENV<EXERCISM> }

data/tracks/python/.github/stale.yml

@@ -1,16 +1,19 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 21
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
   - discussion
   - pinned
+  - epic
+  - enhancement
+  - beginner friendly
 # Label to use when marking an issue as stale
-staleLabel: on hiatus
+staleLabel: abandoned
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  This issue has been automatically marked as `on hiatus` because it has not had
+  This issue has been automatically marked as `abandoned` because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable

data/tracks/python/config.json

@@ -763,6 +763,23 @@
 		"object_oriented_programming"
       ]
     },
+    {
+      "uuid": "a9c2fbda-a1e4-42dd-842f-4de5bb361b91",
+      "slug": "dot-dsl",
+      "core": false,
+      "unlocked_by": null,
+      "difficulty": 5,
+      "topics": [
+        "equality",
+        "classes",
+        "lists",
+        "domain_specific_languages",
+        "graphs",
+        "object_oriented_programming",
+        "test_driven_development",
+        "transforming"
+      ]
+    },
     {
       "uuid": "dc6e61a2-e9b9-4406-ba5c-188252afbba1",
       "slug": "transpose",

data/tracks/python/exercises/dot-dsl/.meta/hints.md

@@ -0,0 +1,14 @@
+## Description of DSL
+
+A graph, in this DSL, is an object of type `Graph`, taking a list of one 
+or more
+
++ attributes
++ nodes
++ edges
+
+described as tuples.
+
+The implementations of `Node` and `Edge` provided in `dot_dsl.py`.
+
+Observe the test cases in `dot_dsl_test.py` to understand the DSL's design.

data/tracks/python/exercises/dot-dsl/README.md

@@ -0,0 +1,52 @@
+# Dot Dsl
+
+Write a Domain Specific Language similar to the Graphviz dot language.
+
+A [Domain Specific Language
+(DSL)](https://en.wikipedia.org/wiki/Domain-specific_language) is a
+small language optimized for a specific domain.
+
+For example the dot language of [Graphviz](http://graphviz.org) allows
+you to write a textual description of a graph which is then transformed
+into a picture by one of the graphviz tools (such as `dot`). A simple
+graph looks like this:
+
+    graph {
+        graph [bgcolor="yellow"]
+        a [color="red"]
+        b [color="blue"]
+        a -- b [color="green"]
+    }
+
+Putting this in a file `example.dot` and running `dot example.dot -T png
+-o example.png` creates an image `example.png` with red and blue circle
+connected by a green line on a yellow background.
+
+Create a DSL similar to the dot language.
+
+## Description of DSL
+
+A graph, in this DSL, is an object of type `Graph`, taking a list of one 
+or more
+
++ attributes
++ nodes
++ edges
+
+described as tuples.
+
+The implementations of `Node` and `Edge` provided in `dot_dsl.py`.
+
+Observe the test cases in `dot_dsl_test.py` to understand the DSL's design.
+
+## Submitting Exercises
+
+Note that, when trying to submit an exercise, make sure the solution is in the `exercism/python/<exerciseName>` directory.
+
+For example, if you're submitting `bob.py` for the Bob exercise, the submit command would be something like `exercism submit <path_to_exercism_dir>/python/bob/bob.py`.
+
+For more detailed information about running tests, code style and linting, please see the [help page](http://exercism.io/languages/python).
+
+## Submitting Incomplete Solutions
+
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/dot-dsl/dot_dsl.py

@@ -0,0 +1,27 @@
+NODE, EDGE, ATTR = range(3)
+
+
+class Node(object):
+    def __init__(self, name, attrs={}):
+        self.name = name
+        self.attrs = attrs
+
+    def __eq__(self, other):
+        return self.name == other.name and self.attrs == other.attrs
+
+
+class Edge(object):
+    def __init__(self, src, dst, attrs={}):
+        self.src = src
+        self.dst = dst
+        self.attrs = attrs
+
+    def __eq__(self, other):
+        return (self.src == other.src and
+                self.dst == other.dst and
+                self.attrs == other.attrs)
+
+
+class Graph(object):
+    def __init__(self, data=[]):
+        pass

data/tracks/python/exercises/dot-dsl/dot_dsl_test.py

@@ -0,0 +1,117 @@
+import unittest
+
+from dot_dsl import Graph, Node, Edge, NODE, EDGE, ATTR
+
+
+class DotDslTest(unittest.TestCase):
+    def test_empty_graph(self):
+        g = Graph()
+
+        self.assertEqual(g.nodes, [])
+        self.assertEqual(g.edges, [])
+        self.assertEqual(g.attrs, {})
+
+    def test_graph_with_one_node(self):
+        g = Graph([
+            (NODE, "a", {})
+        ])
+
+        self.assertEqual(g.nodes, [Node("a")])
+        self.assertEqual(g.edges, [])
+        self.assertEqual(g.attrs, {})
+
+    def test_graph_with_one_node_with_keywords(self):
+        g = Graph([
+            (NODE, "a", {"color": "green"})
+        ])
+
+        self.assertEqual(g.nodes, [Node("a", {"color": "green"})])
+        self.assertEqual(g.edges, [])
+        self.assertEqual(g.attrs, {})
+
+    def test_graph_with_one_edge(self):
+        g = Graph([
+            (EDGE, "a", "b", {})
+        ])
+
+        self.assertEqual(g.nodes, [])
+        self.assertEqual(g.edges, [Edge("a", "b", {})])
+        self.assertEqual(g.attrs, {})
+
+    def test_graph_with_one_attribute(self):
+        g = Graph([
+            (ATTR, "foo", "1")
+        ])
+
+        self.assertEqual(g.nodes, [])
+        self.assertEqual(g.edges, [])
+        self.assertEqual(g.attrs, {"foo": "1"})
+
+    def test_graph_with_attributes(self):
+        g = Graph([
+            (ATTR, "foo", "1"),
+            (ATTR, "title", "Testing Attrs"),
+            (NODE, "a", {"color": "green"}),
+            (NODE, "c", {}),
+            (NODE, "b", {"label", "Beta!"}),
+            (EDGE, "b", "c", {}),
+            (EDGE, "a", "b", {"color": "blue"}),
+            (ATTR, "bar", "true")
+        ])
+
+        self.assertEqual(g.nodes, [Node("a", {"color": "green"}),
+                                   Node("c", {}),
+                                   Node("b", {"label", "Beta!"})])
+        self.assertEqual(g.edges, [Edge("b", "c", {}),
+                                   Edge("a", "b", {"color": "blue"})])
+        self.assertEqual(g.attrs, {
+            "foo": "1",
+            "title": "Testing Attrs",
+            "bar": "true"
+        })
+
+    def test_malformed_graph(self):
+        with self.assertRaises(TypeError):
+            Graph(1)
+
+        with self.assertRaises(TypeError):
+            Graph("problematic")
+
+    def test_malformed_graph_item(self):
+        with self.assertRaises(TypeError):
+            Graph([
+                ()
+            ])
+
+        with self.assertRaises(TypeError):
+            Graph([
+                (ATTR, )
+            ])
+
+    def test_malformed_attr(self):
+        with self.assertRaises(ValueError):
+            Graph([
+                (ATTR, 1, 2, 3)
+            ])
+
+    def test_malformed_node(self):
+        with self.assertRaises(ValueError):
+            Graph([
+                (NODE, 1, 2, 3)
+            ])
+
+    def test_malformed_EDGE(self):
+        with self.assertRaises(ValueError):
+            Graph([
+                (EDGE, 1, 2)
+            ])
+
+    def test_unknown_item(self):
+        with self.assertRaises(ValueError):
+            Graph([
+                (99, 1, 2)
+            ])
+
+
+if __name__ == '__main__':
+    unittest.main()

data/tracks/python/exercises/dot-dsl/example.py

@@ -0,0 +1,52 @@
+NODE, EDGE, ATTR = range(3)
+
+
+class Node(object):
+    def __init__(self, name, attrs={}):
+        self.name = name
+        self.attrs = attrs
+
+    def __eq__(self, other):
+        return self.name == other.name and self.attrs == other.attrs
+
+
+class Edge(object):
+    def __init__(self, src, dst, attrs={}):
+        self.src = src
+        self.dst = dst
+        self.attrs = attrs
+
+    def __eq__(self, other):
+        return (self.src == other.src and
+                self.dst == other.dst and
+                self.attrs == other.attrs)
+
+
+class Graph(object):
+    def __init__(self, data=[]):
+        self.nodes = []
+        self.edges = []
+        self.attrs = {}
+
+        if not isinstance(data, list):
+            raise TypeError("Graph data malformed")
+
+        for item in data:
+            if len(item) < 3:
+                raise TypeError("Graph item incomplete")
+
+            type_ = item[0]
+            if type_ == ATTR:
+                if len(item) != 3:
+                    raise ValueError("ATTR malformed")
+                self.attrs[item[1]] = item[2]
+            elif type_ == NODE:
+                if len(item) != 3:
+                    raise ValueError("NODE malformed")
+                self.nodes.append(Node(item[1], item[2]))
+            elif type_ == EDGE:
+                if len(item) != 4:
+                    raise ValueError("EDGE malformed")
+                self.edges.append(Edge(item[1], item[2], item[3]))
+            else:
+                raise ValueError("Unknown item {}".format(item[0]))

data/tracks/python/exercises/proverb/README.md

@@ -2,7 +2,7 @@
 
 For want of a horseshoe nail, a kingdom was lost, or so the saying goes.
 
-Output the full text of this proverbial rhyme:
+Given a list of inputs, generate the relevant proverb. For example, given the list `["nail", "shoe", "horse", "rider", "message", "battle", "kingdom"]`, you will output the full text of this proverbial rhyme:
 
 ```text
 For want of a nail the shoe was lost.
@@ -11,8 +11,11 @@ For want of a horse the rider was lost.
 For want of a rider the message was lost.
 For want of a message the battle was lost.
 For want of a battle the kingdom was lost.
-And all for the want of a horseshoe nail.
+And all for the want of a nail.
 ```
+
+Note that the list of inputs may vary; your solution should be able to handle lists of arbitrary length and content. No line of the output text should be a static, unchanging string; all should vary according to the input given.
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `exercism/python/<exerciseName>` directory.

data/tracks/python/exercises/proverb/example.py

@@ -1,7 +1,7 @@
-def proverb(itens, qualifier=''):
+def proverb(rhyme_items):
+    if not rhyme_items:
+        return ""
     phrases = ['For want of a {0} the {1} was lost.'.format(el1, el2)
-               for el1, el2 in zip(itens, itens[1:])]
-    qualifier += ' ' if qualifier else ''
-    phrases.append('And all for the want of a {0}{1}.'.format(qualifier,
-                   itens[0]))
+               for el1, el2 in zip(rhyme_items, rhyme_items[1:])]
+    phrases.append('And all for the want of a {0}.'.format(rhyme_items[0]))
     return '\n'.join(phrases)

data/tracks/python/exercises/proverb/proverb.py

@@ -1,2 +1,2 @@
-def proverb(rhyme_text):
+def proverb(rhyme_items):
     pass