trackler 2.2.1.53 → 2.2.1.54

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

@@ -2,30 +2,32 @@
 
 Determine if a triangle is equilateral, isosceles, or scalene.
 
-An _equilateral_ triangle has all three sides the same length.<br/>
+An _equilateral_ triangle has all three sides the same length.
+
 An _isosceles_ triangle has at least two sides the same length. (It is sometimes
 specified as having exactly two sides the same length, but for the purposes of
-this exercise we'll say at least two.)<br/>
+this exercise we'll say at least two.)
+
 A _scalene_ triangle has all sides of different lengths.
 
 ## Note
 
-For a shape to be a triangle at all, all sides have to be of length > 0, and 
-the sum of the lengths of any two sides must be greater than or equal to the 
+For a shape to be a triangle at all, all sides have to be of length > 0, and
+the sum of the lengths of any two sides must be greater than or equal to the
 length of the third side. See [Triangle Inequality](https://en.wikipedia.org/wiki/Triangle_inequality).
 
 ## Dig Deeper
 
-The case where the sum of the lengths of two sides _equals_ that of the 
-third is known as a _degenerate_ triangle - it has zero area and looks like 
+The case where the sum of the lengths of two sides _equals_ that of the
+third is known as a _degenerate_ triangle - it has zero area and looks like
 a single line. Feel free to add your own code/tests to check for degenerate triangles.
-### Submitting Exercises
+
+## 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).
 

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

@@ -11,7 +11,7 @@ Trinary numbers contain three symbols: 0, 1, and 2.
 The last place in a trinary number is the 1's place. The second to last
 is the 3's place, the third to last is the 9's place, etc.
 
-```bash
+```shell
 # "102012"
     1       0       2       0       1       2    # the number
 1*3^5 + 0*3^4 + 2*3^3 + 0*3^2 + 1*3^1 + 2*3^0    # the value
@@ -21,13 +21,12 @@ is the 3's place, the third to last is the 9's place, etc.
 If your language provides a method in the standard library to perform the
 conversion, pretend it doesn't exist and implement it yourself.
 
-### Submitting Exercises
+## 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).
 

data/tracks/python/exercises/twelve-days/README.md

@@ -2,7 +2,7 @@
 
 Output the lyrics to 'The Twelve Days of Christmas'.
 
-```
+```text
 On the first day of Christmas my true love gave to me, a Partridge in a Pear Tree.
 
 On the second day of Christmas my true love gave to me, two Turtle Doves, and a Partridge in a Pear Tree.
@@ -28,13 +28,12 @@ On the eleventh day of Christmas my true love gave to me, eleven Pipers Piping,
 On the twelfth day of Christmas my true love gave to me, twelve Drummers Drumming, eleven Pipers Piping, ten Lords-a-Leaping, nine Ladies Dancing, eight Maids-a-Milking, seven Swans-a-Swimming, six Geese-a-Laying, five Gold Rings, four Calling Birds, three French Hens, two Turtle Doves, and a Partridge in a Pear Tree.
 ```
 
-### Submitting Exercises
+## 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).
 

data/tracks/python/exercises/two-bucket/README.md

@@ -4,7 +4,7 @@ Given two buckets of different size, demonstrate how to measure an exact number
 
 Since this mathematical problem is fairly subject to interpretation / individual approach, the tests have been written specifically to expect one overarching solution.
 
-To help, the tests provide you with which bucket to fill first. That means, when starting with the larger bucket full, you are NOT allowed at any point to have the smaller bucket full and the larger bucket empty (aka, the opposite starting point); that would defeat the purpose of comparing both approaches! 
+To help, the tests provide you with which bucket to fill first. That means, when starting with the larger bucket full, you are NOT allowed at any point to have the smaller bucket full and the larger bucket empty (aka, the opposite starting point); that would defeat the purpose of comparing both approaches!
 
 Your program will take as input:
 - the size of bucket one, passed as a numeric value
@@ -17,9 +17,9 @@ Your program should determine:
 - which bucket should end up with the desired number of liters (let's say this is bucket A) - expects a String (either 'one' or 'two')
 - how many liters are left in the other bucket (bucket B) - expects a numeric value
 
-Note: any time a change is made to either or both buckets counts as one (1) move. 
+Note: any time a change is made to either or both buckets counts as one (1) move.
 
-Example: 
+Example:
 Bucket one can hold up to 7 liters, and bucket two can hold up to 11 liters. Let's say bucket one, at a given step, is holding 7 liters, and bucket two is holding 8 liters (7,8). If you empty bucket one and make no change to bucket two, leaving you with 0 liters and 8 liters respectively (0,8), that counts as one "move". Instead, if you had poured from bucket one into bucket two until bucket two was full, leaving you with 4 liters in bucket one and 11 liters in bucket two (4,11), that would count as only one "move" as well.
 
 To conclude, the only valid moves are:
@@ -29,13 +29,12 @@ To conclude, the only valid moves are:
 
 Written with <3 at [Fullstack Academy](http://www.fullstackacademy.com/) by [Lindsay](http://lindsaylevine.com).
 
-### Submitting Exercises
+## 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).
 

data/tracks/python/exercises/two-bucket/two_bucket_test.py

@@ -8,6 +8,8 @@ import unittest
 from two_bucket import two_bucket
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
+
 class TwoBucketTest(unittest.TestCase):
     def test_bucket_one_size_3_bucket_two_size_5_start_with_bucket_one(self):
         self.assertEqual(two_bucket(3, 5, 1, "one"), (4, "one", 5))

data/tracks/python/exercises/two-fer/README.md

@@ -1,8 +1,8 @@
-# Two-fer
+# Two Fer
 
 `Two-fer` or `2-fer` is short for two for one. One for you and one for me.
 
-```
+```text
 "One for X, one for me."
 ```
 
@@ -11,13 +11,12 @@ When X is a name or "you".
 If the given name is "Alice", the result should be "One for Alice, one for me."
 If no name is given, the result should be "One for you, one for me."
 
-### Submitting Exercises
+## 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).
 
@@ -26,4 +25,4 @@ please see the [help page](http://exercism.io/languages/python).
 This is an exercise to introduce users to basic programming constructs, just after hello World. [https://en.wikipedia.org/wiki/Two-fer](https://en.wikipedia.org/wiki/Two-fer)
 
 ## Submitting Incomplete Solutions
-It's possible to submit an incomplete solution so you can see how others have completed the exercise.
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/two-fer/two_fer_test.py

@@ -2,13 +2,16 @@ import unittest
 
 import two_fer
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
+
 
 class Two_Fer_test(unittest.TestCase):
     def test_empty(self):
         self.assertEqual(two_fer.two_fer(), 'One for you, one for me.')
 
-    def test_eve(self):
-        self.assertEqual(two_fer.two_fer("Eve"), "One for Eve, one for me.")
+    def test_alice(self):
+        self.assertEqual(two_fer.two_fer("Alice"),
+                         "One for Alice, one for me.")
 
     def test_bob(self):
         self.assertEqual(two_fer.two_fer("Bob"), "One for Bob, one for me.")

data/tracks/python/exercises/variable-length-quantity/README.md

@@ -5,18 +5,17 @@ Implement variable length quantity encoding and decoding.
 The goal of this exercise is to implement [VLQ](https://en.wikipedia.org/wiki/Variable-length_quantity) encoding/decoding.
 
 In short, the goal of this encoding is to encode integer values in a way that would save bytes.
-Only the first 7 bits of each byte is significant (right-justified; sort of like an ASCII byte). 
-So, if you have a 32-bit value, you have to unpack it into a series of 7-bit bytes. 
-Of course, you will have a variable number of bytes depending upon your integer. 
+Only the first 7 bits of each byte is significant (right-justified; sort of like an ASCII byte).
+So, if you have a 32-bit value, you have to unpack it into a series of 7-bit bytes.
+Of course, you will have a variable number of bytes depending upon your integer.
 To indicate which is the last byte of the series, you leave bit #7 clear.
-In all of the preceding bytes, you set bit #7. 
+In all of the preceding bytes, you set bit #7.
 
-So, if an integer is between `0-127`, it can be represented as one byte. 
+So, if an integer is between `0-127`, it can be represented as one byte.
 Although VLQ can deal with numbers of arbitrary sizes, for this exercise we will restrict ourselves to only numbers that fit in a 32-bit unsigned integer.
 Here are examples of integers as 32-bit values, and the variable length quantities that they translate to:
 
-
-```
+```text
  NUMBER        VARIABLE QUANTITY
 00000000              00
 00000040              40
@@ -32,13 +31,12 @@ Here are examples of integers as 32-bit values, and the variable length quantiti
 0FFFFFFF          FF FF FF 7F
 ```
 
-### Submitting Exercises
+## 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).
 

data/tracks/python/exercises/word-count/README.md

@@ -4,21 +4,19 @@ Given a phrase, count the occurrences of each word in that phrase.
 
 For example for the input `"olly olly in come free"`
 
-```plain
+```text
 olly: 2
 in: 1
 come: 1
 free: 1
 ```
 
-
-### Submitting Exercises
+## 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).
 

data/tracks/python/exercises/word-search/README.md

@@ -5,7 +5,7 @@ words in them.
 
 For example:
 
-```
+```text
 jefblpepre
 camdcimgtc
 oivokprjsm
@@ -26,13 +26,12 @@ vertical and diagonal.
 Given a puzzle and a list of words return the location of the first and last
 letter of each word.
 
-### Submitting Exercises
+## 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).
 

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

@@ -2,7 +2,6 @@
 
 Parse and evaluate simple math word problems returning the answer as an integer.
 
-
 ## Iteration 1 — Addition
 
 Add two numbers together.
@@ -13,7 +12,6 @@ Evaluates to 18.
 
 Handle large numbers and negative numbers.
 
-
 ## Iteration 2 — Subtraction, Multiplication and Division
 
 Now, perform the other three operations.
@@ -30,7 +28,6 @@ Now, perform the other three operations.
 
 5
 
-
 ## Iteration 3 — Multiple Operations
 
 Handle a set of operations, in sequence.
@@ -46,7 +43,6 @@ left-to-right, _ignoring the typical order of operations._
 
 15  (i.e. not 9)
 
-
 ## Bonus — Exponentials
 
 If you'd like, handle exponentials.
@@ -55,14 +51,12 @@ If you'd like, handle exponentials.
 
 32
 
-
-### Submitting Exercises
+## 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).
 

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

@@ -14,19 +14,19 @@ VALID_OPERATIONS = {"plus": add, "minus": sub,
 def calculate(stmt):
     if not (stmt.startswith("What is ") and stmt.endswith("?")):
         raise ValueError("Ill-formed question")
-    l = stmt[8:-1].strip().lower().split()
-    if not l:
+    words = stmt[8:-1].strip().lower().split()
+    if not words:
         raise ValueError("Ill-formed question")
-    l.reverse()
+    words.reverse()
     try:
-        op1 = int(l.pop())
+        op1 = int(words.pop())
     except ValueError:
         raise ValueError("Ill-formed question")
-    while l:
-        oprt = [l.pop()]
-        while l:
+    while words:
+        oprt = [words.pop()]
+        while words:
             try:
-                next_tk = l.pop()
+                next_tk = words.pop()
                 op2 = int(next_tk)
                 break
             except ValueError:

data/tracks/python/exercises/wordy/wordy_test.py

@@ -3,54 +3,62 @@ import unittest
 from wordy import calculate
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.0.0
+
 class WordyTest(unittest.TestCase):
-    def test_simple_add_1(self):
-        self.assertEqual(calculate("What is 5 plus 13?"), 18)
+    def test_addition(self):
+        self.assertEqual(calculate("What is 1 plus 1?"), 2)
 
-    def test_simple_add_2(self):
-        self.assertEqual(calculate("What is 5 plus -13?"), -8)
+    def test_more_addition(self):
+        self.assertEqual(calculate("What is 53 plus 2?"), 55)
 
-    def test_simple_sub_1(self):
-        self.assertEqual(calculate("What is 103 minus 97?"), 6)
+    def test_addition_with_negative_numbers(self):
+        self.assertEqual(calculate("What is -1 plus -10?"), -11)
 
-    def test_simple_sub_2(self):
-        self.assertEqual(calculate("What is 97 minus 103?"), -6)
+    def test_large_addition(self):
+        self.assertEqual(calculate("What is 123 plus 45678?"), 45801)
 
-    def test_simple_mult(self):
-        self.assertEqual(calculate("What is 7 multiplied by 3?"), 21)
+    def test_subtraction(self):
+        self.assertEqual(calculate("What is 4 minus -12?"), 16)
 
-    def test_simple_div(self):
-        self.assertEqual(calculate("What is 45 divided by 5?"), 9)
+    def test_multiplication(self):
+        self.assertEqual(calculate("What is -3 multiplied by 25?"), -75)
 
-    def test_add_negative_numbers(self):
-        self.assertEqual(calculate("What is -1 plus -10?"), -11)
+    def test_division(self):
+        self.assertEqual(calculate("What is 33 divided by -3?"), -11)
 
-    def test_add_more_digits(self):
-        self.assertEqual(calculate("What is 123 plus 45678?"), 45801)
+    def test_multiple_addition(self):
+        self.assertEqual(calculate("What is 1 plus 1 plus 1?"), 3)
 
-    def test_add_twice(self):
-        self.assertEqual(calculate("What is 1 plus 2 plus 1?"), 4)
+    def test_addition_then_subtraction(self):
+        self.assertEqual(calculate("What is 1 plus 5 minus -2?"), 8)
 
-    def test_add_then_subtract(self):
-        self.assertEqual(calculate("What is 1 plus 5 minus -8?"), 14)
+    def test_multiple_subtraction(self):
+        self.assertEqual(calculate("What is 20 minus 4 minus 13?"), 3)
 
-    def test_subtract_twice(self):
-        self.assertEqual(calculate("What is 20 minus 14 minus 13?"), -7)
+    def test_subtraction_then_addition(self):
+        self.assertEqual(calculate("What is 17 minus 6 plus 3?"), 14)
 
-    def test_multiply_twice(self):
+    def test_multiple_multiplication(self):
         self.assertEqual(
             calculate("What is 2 multiplied by -2 multiplied by 3?"), -12)
 
-    def test_add_then_multiply(self):
+    def test_addition_then_multiplication(self):
         self.assertEqual(calculate("What is -3 plus 7 multiplied by -2?"), -8)
 
-    def test_divide_twice(self):
+    def test_multiple_division(self):
         self.assertEqual(
-            calculate("What is -12000 divided by 25 divided by -30?"), 16)
+            calculate("What is -12 divided by 2 divided by -3?"), 2)
 
-    def test_invalid_operation(self):
+    def test_unknown_operation(self):
         with self.assertRaises(ValueError):
-            calculate("What is 4 xor 7?")
+            calculate("What is 52 cubed?")
+
+    def test_non_math_question(self):
+        with self.assertRaises(ValueError):
+            calculate("Who is the President of the United States?")
+
+    # Additional tests for this track
 
     def test_missing_operation(self):
         with self.assertRaises(ValueError):
@@ -60,10 +68,6 @@ class WordyTest(unittest.TestCase):
         with self.assertRaises(ValueError):
             calculate("What is 7 plus multiplied by -2?")
 
-    def test_irrelevant_question(self):
-        with self.assertRaises(ValueError):
-            calculate("Which is greater, 3 or 2?")
-
 
 if __name__ == '__main__':
     unittest.main()