Sync exercise docs (exercism#429)

zebra-puzzle example solution updated with hobbies

[no important files changed]

Author: keiravillekode

exercises/practice/affine-cipher/.docs/instructions.md

@@ -18,10 +18,10 @@ E(x) = (ai + b) mod m
 
 Where:
 
-- `i` is the letter's index from `0` to the length of the alphabet - 1
+- `i` is the letter's index from `0` to the length of the alphabet - 1.
 - `m` is the length of the alphabet.
   For the Roman alphabet `m` is `26`.
-- `a` and `b` are integers which make the encryption key
+- `a` and `b` are integers which make up the encryption key.
 
 Values `a` and `m` must be _coprime_ (or, _relatively prime_) for automatic decryption to succeed, i.e., they have number `1` as their only common factor (more information can be found in the [Wikipedia article about coprime integers][coprime-integers]).
 In case `a` is not coprime to `m`, your program should indicate that this is an error.

exercises/practice/pascals-triangle/.docs/instructions.md

@@ -1,14 +1,35 @@
 # Instructions
 
-Compute Pascal's triangle up to a given number of rows.
+Your task is to output the first N rows of Pascal's triangle.
 
-In Pascal's Triangle each number is computed by adding the numbers to the right and left of the current position in the previous row.
+[Pascal's triangle][wikipedia] is a triangular array of positive integers.
+
+In Pascal's triangle, the number of values in a row is equal to its row number (which starts at one).
+Therefore, the first row has one value, the second row has two values, and so on.
+
+The first (topmost) row has a single value: `1`.
+Subsequent rows' values are computed by adding the numbers directly to the right and left of the current position in the previous row.
+
+If the previous row does _not_ have a value to the left or right of the current position (which only happens for the leftmost and rightmost positions), treat that position's value as zero (effectively "ignoring" it in the summation).
+
+## Example
+
+Let's look at the first 5 rows of Pascal's Triangle:
 
 ```text
     1
    1 1
   1 2 1
  1 3 3 1
 1 4 6 4 1
-# ... etc
 ```
+
+The topmost row has one value, which is `1`.
+
+The leftmost and rightmost values have only one preceding position to consider, which is the position to its right respectively to its left.
+With the topmost value being `1`, it follows from this that all the leftmost and rightmost values are also `1`.
+
+The other values all have two positions to consider.
+For example, the fifth row's (`1 4 6 4 1`) middle value is `6`, as the values to its left and right in the preceding row are `3` and `3`:
+
+[wikipedia]: https://en.wikipedia.org/wiki/Pascal%27s_triangle

exercises/practice/pascals-triangle/.docs/introduction.md

@@ -0,0 +1,22 @@
+# Introduction
+
+With the weather being great, you're not looking forward to spending an hour in a classroom.
+Annoyed, you enter the class room, where you notice a strangely satisfying triangle shape on the blackboard.
+Whilst waiting for your math teacher to arrive, you can't help but notice some patterns in the triangle: the outer values are all ones, each subsequent row has one more value than its previous row and the triangle is symmetrical.
+Weird!
+
+Not long after you sit down, your teacher enters the room and explains that this triangle is the famous [Pascal's triangle][wikipedia].
+
+Over the next hour, your teacher reveals some amazing things hidden in this triangle:
+
+- It can be used to compute how many ways you can pick K elements from N values.
+- It contains the Fibonacci sequence.
+- If you color odd and even numbers differently, you get a beautiful pattern called the [Sierpiński triangle][wikipedia-sierpinski-triangle].
+
+The teacher implores you and your classmates to lookup other uses, and assures you that there are lots more!
+At that moment, the school bell rings.
+You realize that for the past hour, you were completely absorbed in learning about Pascal's triangle.
+You quickly grab your laptop from your bag and go outside, ready to enjoy both the sunshine _and_ the wonders of Pascal's triangle.
+
+[wikipedia]: https://en.wikipedia.org/wiki/Pascal%27s_triangle
+[wikipedia-sierpinski-triangle]: https://en.wikipedia.org/wiki/Sierpi%C5%84ski_triangle

exercises/practice/zebra-puzzle/.docs/instructions.md

@@ -12,20 +12,20 @@ The following 15 statements are all known to be true:
 1. There are five houses.
 2. The Englishman lives in the red house.
 3. The Spaniard owns the dog.
-4. Coffee is drunk in the green house.
+4. The person in the green house drinks coffee.
 5. The Ukrainian drinks tea.
 6. The green house is immediately to the right of the ivory house.
-7. The Old Gold smoker owns snails.
-8. Kools are smoked in the yellow house.
-9. Milk is drunk in the middle house.
+7. The snail owner likes to go dancing.
+8. The person in the yellow house is a painter.
+9. The person in the middle house drinks milk.
 10. The Norwegian lives in the first house.
-11. The man who smokes Chesterfields lives in the house next to the man with the fox.
-12. Kools are smoked in the house next to the house where the horse is kept.
-13. The Lucky Strike smoker drinks orange juice.
-14. The Japanese smokes Parliaments.
+11. The person who enjoys reading lives in the house next to the person with the fox.
+12. The painter's house is next to the house with the horse.
+13. The person who plays football drinks orange juice.
+14. The Japanese person plays chess.
 15. The Norwegian lives next to the blue house.
 
-Additionally, each of the five houses is painted a different color, and their inhabitants are of different national extractions, own different pets, drink different beverages and smoke different brands of cigarettes.
+Additionally, each of the five houses is painted a different color, and their inhabitants are of different national extractions, own different pets, drink different beverages and engage in different hobbies.
 
 ~~~~exercism/note
 There are 24 billion (5!⁵ = 24,883,200,000) possible solutions, so try ruling out as many solutions as possible.

exercises/practice/zebra-puzzle/.docs/introduction.md

@@ -1,7 +1,7 @@
 # Introduction
 
 The Zebra Puzzle is a famous logic puzzle in which there are five houses, each painted a different color.
-The houses have different inhabitants, who have different nationalities, own different pets, drink different beverages and smoke different brands of cigarettes.
+The houses have different inhabitants, who have different nationalities, own different pets, drink different beverages and enjoy different hobbies.
 
 To help you solve the puzzle, you're given 15 statements describing the solution.
 However, only by combining the information in _all_ statements will you be able to find the solution to the puzzle.

exercises/practice/zebra-puzzle/.meta/example.el

@@ -23,16 +23,16 @@
 (defvar houses-by-number nil)
 
 (cl-defstruct house
-  number color owner pet drink smokes)
+  number color owner pet drink hobby)
 
 (setq all-houses
       (cl-loop for n in '(1 2 3 4 5)
                append (cl-loop for c in '(red green ivory yellow blue)
                                append (cl-loop for o in '(Englishman Spaniard Ukrainian Norwegian Japanese)
                                                append (cl-loop for p in '(dog snails fox horse zebra)
                                                                append (cl-loop for d in '(coffee tea milk orange-juice water)
-                                                                               append (cl-loop for s in '(Old-Gold Kools Chesterfields Lucky-Strike Parliaments)
-                                                                                               collect (make-house :number n :color c :owner o :pet p :drink d :smokes s))))))))
+                                                                               append (cl-loop for e in '(dancing painting reading football chess)
+                                                                                               collect (make-house :number n :color c :owner o :pet p :drink d :hobby e))))))))
 
 (setq house-constraints
       (list
@@ -44,18 +44,18 @@
 		     (equal (house-color h) 'green)))
        (lambda (h) (equal (equal (house-owner h) 'Ukrainian)
 		     (equal (house-drink h) 'tea)))
-       (lambda (h) (equal (equal (house-smokes h) 'Old-Gold)
+       (lambda (h) (equal (equal (house-hobby h) 'dancing)
 		     (equal (house-pet h) 'snails)))
-       (lambda (h) (equal (equal (house-smokes h) 'Kools)
+       (lambda (h) (equal (equal (house-hobby h) 'painting)
 		     (equal (house-color h) 'yellow)))
        (lambda (h) (equal (equal (house-drink h) 'milk)
 		     (= (house-number h) 3)))
        (lambda (h) (equal (equal (house-owner h) 'Norwegian)
 		     (= (house-number h) 1)))
-       (lambda (h) (equal (equal (house-smokes h) 'Lucky-Strike)
+       (lambda (h) (equal (equal (house-hobby h) 'football)
 		     (equal (house-drink h) 'orange-juice)))
        (lambda (h) (equal (equal (house-owner h) 'Japanese)
-		     (equal (house-smokes h) 'Parliaments)))
+		     (equal (house-hobby h) 'chess)))
        (lambda (h) (equal (= (house-number h) 2)
 		     (equal (house-color h) 'blue)))
        (lambda (h) (if (equal (house-color h) 'green)
@@ -86,12 +86,12 @@
              (= (house-number h1) (1+ (house-number h2)))
            t))
        (lambda (h1 h2)
-         (if (and (equal (house-smokes h1) 'Chesterfields)
+         (if (and (equal (house-hobby h1) 'reading)
                   (equal (house-pet h2) 'fox))
              (next-door? h1 h2)
            t))
        (lambda (h1 h2)
-         (if (and (equal (house-smokes h1) 'Kools)
+         (if (and (equal (house-hobby h1) 'painting)
                   (equal (house-pet h2) 'horse))
              (next-door? h1 h2)
            t))))
@@ -117,7 +117,7 @@
            (equal (house-owner h1) (house-owner h2))
            (equal (house-pet h1) (house-pet h2))
            (equal (house-drink h1) (house-drink h2))
-           (equal (house-smokes h1) (house-smokes h2)))))
+           (equal (house-hobby h1) (house-hobby h2)))))
 
 (defun extends? (street h)
   "Check if a house, H, can be added to a STREET."