trackler 2.2.1.51 → 2.2.1.52

data/tracks/ocaml/config/maintainers.json

@@ -1,25 +1,25 @@
 {
+  "docs_url": "https://github.com/exercism/docs/blob/master/maintaining-a-track/maintainer-configuration.md",
   "maintainers": [
     {
-      "github_username": "dvberkel",
-      "show_on_website": false,
       "alumnus": false,
-      "name": null,
+      "avatar_url": null,
       "bio": null,
+      "github_username": "dvberkel",
       "link_text": null,
       "link_url": null,
-      "avatar_url": null
+      "name": null,
+      "show_on_website": false
     },
     {
-      "github_username": "stevejb71",
-      "show_on_website": false,
       "alumnus": false,
-      "name": null,
+      "avatar_url": null,
       "bio": null,
+      "github_username": "stevejb71",
       "link_text": null,
       "link_url": null,
-      "avatar_url": null
+      "name": null,
+      "show_on_website": false
     }
-  ],
-  "docs_url": "https://github.com/exercism/docs/blob/master/maintaining-a-track/maintainer-configuration.md"
-}
+  ]
+}

data/tracks/php/config.json

@@ -589,6 +589,14 @@
       ],
       "unlocked_by": "null"
     },
+    {
+      "uuid": "C5D81BB4-7041-4EA9-B0ED-C3A17CF3E071",
+      "core" :  false,
+      "difficulty" : 1,
+      "slug" : "series",
+      "topics": [ ],
+      "unlocked_by": "null"
+    },
     {
       "uuid": "cb413881-99b6-493f-bea2-89563dc173a6",
       "core" :  false,
@@ -603,6 +611,14 @@
         "text_formatting"
       ],
       "unlocked_by": "null"
+    },
+    {
+      "uuid": "94AA4B63-66BA-4EF4-8E27-36C146682F05",
+      "core" :  false,
+      "difficulty" : 1,
+      "slug" : "all-your-base",
+      "topics": [ ],
+      "unlocked_by": "null"
     }
   ]
 }

data/tracks/php/exercises/all-your-base/README.md

@@ -0,0 +1,31 @@
+Convert a number, represented as a sequence of digits in one base, to any other base.
+
+Implement general base conversion. Given a number in base **a**,
+represented as a sequence of digits, convert it to base **b**.
+
+## Note
+
+- Try to implement the conversion yourself.
+  Do not use something else to perform the conversion for you.
+
+  ## About [Positional Notation](https://en.wikipedia.org/wiki/Positional_notation)
+
+  In positional notation, a number in base **b** can be understood as a linear
+  combination of powers of **b**.
+
+  The number 42, *in base 10*, means:
+
+  (4 * 10^1) + (2 * 10^0)
+
+  The number 101010, *in base 2*, means:
+
+  (1 * 2^5) + (0 * 2^4) + (1 * 2^3) + (0 * 2^2) + (1 * 2^1) + (0 * 2^0)
+
+  The number 1120, *in base 3*, means:
+
+  (1 * 3^3) + (1 * 3^2) + (2 * 3^1) + (0 * 3^0)
+
+  I think you got the idea!
+
+  *Yes. Those three numbers above are exactly the same. Congratulations!*
+

data/tracks/php/exercises/all-your-base/all-your-base_test.php

@@ -0,0 +1,135 @@
+<?php
+
+require "all-your-base.php";
+
+/**
+ * These tests are adapted from the canonical data in the
+ * `problem-specifications` repository.
+ */
+class AllYourBaseTest extends PHPUnit\Framework\TestCase
+{
+    public function testSingleBitOneToDecimal()
+    {
+        $this->assertEquals(rebase(2, [1], 10), [1]);
+    }
+
+    public function testBinaryToSingleDecimal()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 0, 1], 10), [5]);
+    }
+
+    public function testSingleDecimalToBinary()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [5], 2), [1, 0, 1]);
+    }
+
+    public function testBinaryToMultipleDecimal()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 0, 1, 0, 1, 0], 10), [4, 2]);
+    }
+
+    public function testDecimalToBinary()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [4, 2], 2), [1, 0, 1, 0, 1, 0]);
+    }
+
+    public function testTrinaryToHexadecimal()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(3, [1, 1, 2, 0], 16), [2, 10]);
+    }
+
+    public function testHexadecimalToTrinary()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(16, [2, 10], 3), [1, 1, 2, 0]);
+    }
+
+    public function test15BitIntegers()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(97, [3, 46, 60], 73), [6, 10, 45]);
+    }
+
+    public function testEmptyListReturnsNull()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [], 10), null);
+    }
+
+    public function testSingleZeroReturnsNull()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [0], 2), null);
+    }
+
+    public function testMultipleZerosReturnsNull()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [0, 0, 0], 2), null);
+    }
+
+    public function testLeadingZerosReturnsNull()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [0, 6, 0], 2), null);
+    }
+
+    public function testFirstBaseIsOne()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(1, [6, 0], 2), null);
+    }
+
+    public function testFirstBaseIsZero()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(0, [6, 0], 2), null);
+    }
+
+    public function testFirstBaseIsNegative()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(-1, [6, 0], 2), null);
+    }
+
+    public function testNegativeDigit()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(10, [1, -1, 0], 2), null);
+    }
+
+    public function testInvalidPositiveDigit()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 2, 0], 10), null);
+    }
+
+    public function testSecondBaseIsOne()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 1, 0], 1), null);
+    }
+
+    public function testSecondBaseIsZero()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 1, 0], 0), null);
+    }
+
+    public function testSecondBaseIsNegative()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(2, [1, 1, 0], -1), null);
+    }
+
+    public function testBothBasesIsNegative()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(rebase(-3, [1, 1, 0], -1), null);
+    }
+}

data/tracks/php/exercises/all-your-base/example.php

@@ -0,0 +1,27 @@
+<?php
+
+function rebase(int $fromBase, array $digits, int $toBase)
+{
+    if (empty($digits) || $digits[0] == 0 || $fromBase <= 1 || $toBase <= 1) {
+        return null;
+    }
+
+    $decTotal = 0;
+    $ordered = array_reverse($digits);
+    for ($i = 0; $i < count($digits); $i++) {
+        $decTotal += $ordered[$i] * pow($fromBase, $i);
+        if ($ordered[$i] >= $fromBase || $ordered[$i] < 0) {
+            return null;
+        }
+    }
+
+    $newArr = [];
+    while ($decTotal >= $toBase) {
+        $remainder = $decTotal % $toBase;
+        $newArr[] = $remainder;
+        $decTotal = floor($decTotal / $toBase);
+    }
+    $newArr[] = $decTotal;
+
+    return array_reverse($newArr);
+}

data/tracks/php/exercises/series/README.md

@@ -0,0 +1,21 @@
+# Series
+
+Given a string of digits, output all the contiguous substrings of length `n` in
+that string.
+
+For example, the string "49142" has the following 3-digit series:
+
+- 491
+- 914
+- 142
+
+And the following 4-digit series:
+
+- 4914
+- 9142
+
+And if you ask for a 6-digit series from a 5-digit string, you deserve
+whatever you get.
+
+Note that these series are only required to occupy *adjacent positions*
+in the input; the digits need not be *numerically consecutive*.

data/tracks/php/exercises/series/example.php

@@ -0,0 +1,15 @@
+<?php
+
+use Exception;
+
+function slices($series, $size)
+{
+    if ($size > strlen($series) || $size < 1) {
+        throw new Exception();
+    }
+    $arr = [];
+    for ($i = 0; $i <= strlen($series) - $size; $i++) {
+        $arr[] = substr($series, $i, $size);
+    }
+    return $arr;
+}

data/tracks/php/exercises/series/series_test.php

@@ -0,0 +1,64 @@
+<?php
+require "series.php";
+use Exception;
+
+class SieveTest extends PHPUnit\Framework\TestCase
+{
+    public function testSlicesOfOne()
+    {
+        $this->assertEquals(
+            slices("01234", 1),
+            ["0", "1", "2", "3", "4"]
+        );
+    }
+
+    public function testSlicesOfTwo()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(
+            slices("97867564", 2),
+            ["97", "78", "86", "67", "75", "56", "64"]
+        );
+    }
+
+    public function testSlicesOfThree()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(
+            slices("97867564", 3),
+            ["978", "786", "867", "675", "756", "564"]
+        );
+    }
+
+    public function testSlicesOfFour()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(
+            slices("01234", 4),
+            ["0123", "1234"]
+        );
+    }
+
+    public function testSlicesOfFive()
+    {
+        $this->markTestSkipped();
+        $this->assertEquals(
+            slices("01234", 5),
+            ["01234"]
+        );
+    }
+
+    public function testOverlyLongSlice()
+    {
+        $this->markTestSkipped();
+        $this->expectException(Exception::class);
+        slices("012", 4);
+    }
+
+    public function testOverlyShortSlice()
+    {
+        $this->markTestSkipped();
+        $this->expectException(Exception::class);
+        slices("01234", 0);
+    }
+}

data/tracks/python/README.md

@@ -67,7 +67,7 @@ Please try to follow the [The seven rules of a great Git commit message](https:/
 
 If you're interested, Tim Pope even has an [entire blog post](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) on good commit messages.
 
-If you're new to Git take a look at [this short guide](https://github.com/exercism/docs/blob/master/contributing-to-language-tracks/README.md#git-basics).
+If you're new to Git, take a look at [this short guide](https://github.com/exercism/docs/blob/master/contributing-to-language-tracks/README.md#git-basics).
 
 
 ## Python icon

data/tracks/python/config.json

@@ -373,7 +373,10 @@
       "unlocked_by": null,
       "difficulty": 1,
       "topics": [
-
+        "bitwise_operations",
+        "integers",
+        "mathematics",
+        "type_conversion"
       ]
     },
     {

data/tracks/python/exercises/forth/forth.py

@@ -1,2 +1,6 @@
+class StackUnderflowError(Exception):
+    pass
+
+
 def evaluate(input_data):
     pass

data/tracks/python/exercises/forth/forth_test.py

@@ -1,6 +1,6 @@
 import unittest
 
-from example import evaluate, StackUnderflowError
+from forth import evaluate, StackUnderflowError
 
 
 # test cases adapted from `x-common//canonical-data.json` @ version: 1.2.0

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

@@ -66,7 +66,7 @@ def parse_line(line, in_list):
     if not re.match('<h|<ul|<li', res):
         res = wrap(res, 'p')
 
-    if not re.match('(<ul>)?<li>_(.*)', res):
+    if list_match is None:
         res = re.sub('(.*)(<li>)(.*)(</li>)(.*)', r'\1\2<p>\3</p>\4\5', res)
 
     while check_bold(res):

data/tracks/python/exercises/markdown/markdown_test.py

@@ -2,7 +2,7 @@ import unittest
 from markdown import parse_markdown
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
 
 
 class TestMarkdown(unittest.TestCase):
@@ -37,8 +37,8 @@ class TestMarkdown(unittest.TestCase):
 
     def test_unordered_lists(self):
         self.assertEqual(parse_markdown('* Item 1\n* Item 2'),
-                         '<ul><li><p>Item 1</p></li>'
-                         '<li><p>Item 2</p></li></ul>')
+                         '<ul><li>Item 1</li>'
+                         '<li>Item 2</li></ul>')
 
     def test_little_bit_of_everything(self):
         self.assertEqual(parse_markdown(

data/tracks/ruby/exercises/two-bucket/.meta/.version

@@ -1 +1 @@
-3
+4