Skip to content

Commit

Permalink
Sync recent problem spec changes (#355)
Browse files Browse the repository at this point in the history
* sync docs and metadata

* sync protein-translation tests

* sync zebra-puzzle and update example to match instructions
  • Loading branch information
glennj authored Jun 25, 2024
1 parent 63f7714 commit 5fdc397
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 48 deletions.
2 changes: 1 addition & 1 deletion exercises/practice/bank-account/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Your task is to implement bank accounts supporting opening/closing, withdrawals, and deposits of money.

As bank accounts can be accessed in many different ways (internet, mobile phones, automatic charges), your bank software must allow accounts to be safely accessed from multiple threads/processes (terminology depends on your programming language) in parallel.
For example, there may be many deposits and withdrawals occurring in parallel; you need to ensure there is no [race conditions][wikipedia] between when you read the account balance and set the new balance.
For example, there may be many deposits and withdrawals occurring in parallel; you need to ensure there are no [race conditions][wikipedia] between when you read the account balance and set the new balance.

It should be possible to close an account; operations against a closed account must fail.

Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/go-counting/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Empty spaces represent empty intersections.

To be more precise an empty intersection is part of a player's territory if all of its neighbors are either stones of that player or empty intersections that are part of that player's territory.

For more information see [wikipedia][go-wikipedia] or [Sensei's Library][go-sensei].
For more information see [Wikipedia][go-wikipedia] or [Sensei's Library][go-sensei].

[go-wikipedia]: https://en.wikipedia.org/wiki/Go_%28game%29
[go-sensei]: https://senseis.xmp.net/
28 changes: 25 additions & 3 deletions exercises/practice/killer-sudoku-helper/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@ In a 3-digit cage with a sum of 7, there is only one valid combination: 124.
- 1 + 2 + 4 = 7
- Any other combination that adds up to 7, e.g. 232, would violate the rule of not repeating digits within a cage.

![Sudoku grid, with three killer cages that are marked as grouped together. The first killer cage is in the 3×3 box in the top left corner of the grid. The middle column of that box forms the cage, with the followings cells from top to bottom: first cell contains a 1 and a pencil mark of 7, indicating a cage sum of 7, second cell contains a 2, third cell contains a 5. The numbers are highlighted in red to indicate a mistake. The second killer cage is in the central 3×3 box of the grid. The middle column of that box forms the cage, with the followings cells from top to bottom: first cell contains a 1 and a pencil mark of 7, indicating a cage sum of 7, second cell contains a 2, third cell contains a 4. None of the numbers in this cage are highlighted and therefore don't contain any mistakes. The third killer cage follows the outside corner of the central 3×3 box of the grid. It is made up of the following three cells: the top left cell of the cage contains a 2, highlighted in red, and a cage sum of 7. The top right cell of the cage contains a 3. The bottom right cell of the cage contains a 2, highlighted in red. All other cells are empty.][one-solution-img]
![Sudoku grid, with three killer cages that are marked as grouped together.
The first killer cage is in the 3×3 box in the top left corner of the grid.
The middle column of that box forms the cage, with the followings cells from top to bottom: first cell contains a 1 and a pencil mark of 7, indicating a cage sum of 7, second cell contains a 2, third cell contains a 5.
The numbers are highlighted in red to indicate a mistake.
The second killer cage is in the central 3×3 box of the grid.
The middle column of that box forms the cage, with the followings cells from top to bottom: first cell contains a 1 and a pencil mark of 7, indicating a cage sum of 7, second cell contains a 2, third cell contains a 4.
None of the numbers in this cage are highlighted and therefore don't contain any mistakes.
The third killer cage follows the outside corner of the central 3×3 box of the grid.
It is made up of the following three cells: the top left cell of the cage contains a 2, highlighted in red, and a cage sum of 7.
The top right cell of the cage contains a 3.
The bottom right cell of the cage contains a 2, highlighted in red. All other cells are empty.][one-solution-img]

## Example 2: Cage with several combinations

Expand All @@ -31,7 +41,13 @@ In a 2-digit cage with a sum 10, there are 4 possible combinations:
- 37
- 46

![Sudoku grid, all squares empty except for the middle column, column 5, which has 8 rows filled. Each continguous two rows form a killer cage and are marked as grouped together. From top to bottom: first group is a cell with value 1 and a pencil mark indicating a cage sum of 10, cell with value 9. Second group is a cell with value 2 and a pencil mark of 10, cell with value 8. Third group is a cell with value 3 and a pencil mark of 10, cell with value 7. Fourth group is a cell with value 4 and a pencil mark of 10, cell with value 6. The last cell in the column is empty.][four-solutions-img]
![Sudoku grid, all squares empty except for the middle column, column 5, which has 8 rows filled.
Each continguous two rows form a killer cage and are marked as grouped together.
From top to bottom: first group is a cell with value 1 and a pencil mark indicating a cage sum of 10, cell with value 9.
Second group is a cell with value 2 and a pencil mark of 10, cell with value 8.
Third group is a cell with value 3 and a pencil mark of 10, cell with value 7.
Fourth group is a cell with value 4 and a pencil mark of 10, cell with value 6.
The last cell in the column is empty.][four-solutions-img]

## Example 3: Cage with several combinations that is restricted

Expand All @@ -42,7 +58,13 @@ In a 2-digit cage with a sum 10, where the column already contains a 1 and a 4,

19 and 46 are not possible due to the 1 and 4 in the column according to standard Sudoku rules.

![Sudoku grid, all squares empty except for the middle column, column 5, which has 8 rows filled. The first row contains a 4, the second is empty, and the third contains a 1. The 1 is highlighted in red to indicate a mistake. The last 6 rows in the column form killer cages of two cells each. From top to bottom: first group is a cell with value 2 and a pencil mark indicating a cage sum of 10, cell with value 8. Second group is a cell with value 3 and a pencil mark of 10, cell with value 7. Third group is a cell with value 1, highlighted in red, and a pencil mark of 10, cell with value 9.][not-possible-img]
![Sudoku grid, all squares empty except for the middle column, column 5, which has 8 rows filled.
The first row contains a 4, the second is empty, and the third contains a 1.
The 1 is highlighted in red to indicate a mistake.
The last 6 rows in the column form killer cages of two cells each.
From top to bottom: first group is a cell with value 2 and a pencil mark indicating a cage sum of 10, cell with value 8.
Second group is a cell with value 3 and a pencil mark of 10, cell with value 7.
Third group is a cell with value 1, highlighted in red, and a pencil mark of 10, cell with value 9.][not-possible-img]

## Trying it yourself

Expand Down
27 changes: 24 additions & 3 deletions exercises/practice/pascals-triangle/.docs/instructions.md
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions exercises/practice/pascals-triangle/.docs/introduction.md
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions exercises/practice/pig-latin/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For example:

## Rule 2

If a word begins with a one or more consonants, first move those consonants to the end of the word and then add an `"ay"` sound to the end of the word.
If a word begins with one or more consonants, first move those consonants to the end of the word and then add an `"ay"` sound to the end of the word.

For example:

Expand All @@ -33,7 +33,7 @@ If a word starts with zero or more consonants followed by `"qu"`, first move tho

For example:

- `"quick"` -> `"ickqu"` -> `"ay"` (starts with `"qu"`, no preceding consonants)
- `"quick"` -> `"ickqu"` -> `"ickquay"` (starts with `"qu"`, no preceding consonants)
- `"square"` -> `"aresqu"` -> `"aresquay"` (starts with one consonant followed by `"qu`")

## Rule 4
Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/poker/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

Pick the best hand(s) from a list of poker hands.

See [wikipedia][poker-hands] for an overview of poker hands.
See [Wikipedia][poker-hands] for an overview of poker hands.

[poker-hands]: https://en.wikipedia.org/wiki/List_of_poker_hands
4 changes: 4 additions & 0 deletions exercises/practice/protein-translation/.meta/tests.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,15 @@ description = "Translation stops if STOP codon in middle of three-codon sequence
[2c2a2a60-401f-4a80-b977-e0715b23b93d]
description = "Translation stops if STOP codon in middle of six-codon sequence"

[f6f92714-769f-4187-9524-e353e8a41a80]
description = "Sequence of two non-STOP codons does not translate to a STOP codon"

[1e75ea2a-f907-4994-ae5c-118632a1cb0f]
description = "Non-existing codon can't translate"

[9eac93f3-627a-4c90-8653-6d0a0595bc6f]
description = "Unknown amino acids, not part of a codon, can't translate"
reimplements = "1e75ea2a-f907-4994-ae5c-118632a1cb0f"

[9d73899f-e68e-4291-b1e2-7bf87c00f024]
description = "Incomplete RNA sequence can't translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,10 @@ test proteins-30 "Incomplete RNA sequence can translate if valid until a STOP co
proteins UUCUUCUAAUGGU
} -returnCodes ok -result {Phenylalanine Phenylalanine}

skip proteins-31
test proteins-31 "Sequence of two non-STOP codons does not translate to a STOP codon" -body {
proteins AUGAUG
} -returnCodes ok -result {Methionine Methionine}


cleanupTests
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ The band colors are encoded as follows:
- White: 9

From the example above:
brown-green should return 15
brown-green should return 15, and
brown-green-violet should return 15 too, ignoring the third color.
2 changes: 1 addition & 1 deletion exercises/practice/yacht/.meta/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
]
},
"blurb": "Score a single throw of dice in the game Yacht.",
"source": "James Kilfiger, using wikipedia",
"source": "James Kilfiger, using Wikipedia",
"source_url": "https://en.wikipedia.org/wiki/Yacht_(dice_game)"
}
18 changes: 9 additions & 9 deletions exercises/practice/zebra-puzzle/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/zebra-puzzle/.docs/introduction.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
50 changes: 25 additions & 25 deletions exercises/practice/zebra-puzzle/.meta/example.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ proc ::tcl::mathfunc::nextTo {first second} {
# algorithm taken from Kotlin example solution

# The clues, and the method that implements them:
# 1. There are five houses.
# 2. The Englishman lives in the red house. (SolveForNationality)
# 3. The Spaniard owns the dog. (SolveForPets)
# 4. Coffee is drunk in the green house. (SolveForBeverages)
# 5. The Ukrainian drinks tea. (SolveForBeverages)
# 6. The green house is immediately to the right of the ivory house. (SolveForColour)
# 7. The Old Gold smoker owns snails. (SolveForPets)
# 8. Kools are smoked in the yellow house. (SolveForSmokes)
# 9. Milk is drunk in the middle house. (SolveForBeverages)
# 10.The Norwegian lives in the first house. (SolveForNationality)
# 11.The man who smokes Chesterfields lives in the house next to the man with the fox. (SolveForPets)
# 12.Kools are smoked in the house next to the house where the horse is kept.
# 13.The Lucky Strike smoker drinks orange juice. (SolveForSmokes)
# 14.The Japanese smokes Parliaments. (SolveForSmokes)
# 15.The Norwegian lives next to the blue house. (SolveForNationality)
# 1. There are five houses.
# 2. The Englishman lives in the red house. (SolveForNationality)
# 3. The Spaniard owns the dog. (SolveForPets)
# 4. The person in the green house drinks coffee. (SolveForBeverages)
# 5. The Ukrainian drinks tea. (SolveForBeverages)
# 6. The green house is immediately to the right of the ivory house. (SolveForColour)
# 7. The snail owner likes to go dancing. (SolveForPets)
# 8. The person in the yellow house is a painter. (SolveForHobbies)
# 9. The person in the middle house drinks milk. (SolveForBeverages)
# 10. The Norwegian lives in the first house. (SolveForNationality)
# 11. The person who enjoys reading lives in the house next to the person with the fox. (SolveForPets)
# 12. The painter's house is next to the house with the horse. (SolveForPets)
# 13. The person who plays football drinks orange juice. (SolveForHobbies)
# 14. The Japanese person plays chess. (SolveForHobbies)
# 15. The Norwegian lives next to the blue house. (SolveForNationality)

############################################################
oo::class create ZebraPuzzle {
Expand All @@ -43,7 +43,7 @@ oo::class create ZebraPuzzle {
variable red green ivory yellow blue
variable english spanish ukranian norwegian japanese
variable dog snails fox horse zebra
variable oldGold kools chesterfields luckyStrike parliaments
variable dancing painting reading football chess
variable coffee tea milk orangeJuice water

variable nationalities
Expand Down Expand Up @@ -112,19 +112,19 @@ oo::class create ZebraPuzzle {
&& $milk == $MIDDLE
} {
foreach p [permutations] {
if {[my SolveForSmokes $p]} then {return true}
if {[my SolveForHobbies $p]} then {return true}
}
}
return false
}

method SolveForSmokes {permutation} {
lassign $permutation oldGold kools chesterfields luckyStrike parliaments
method SolveForHobbies {permutation} {
lassign $permutation dancing painting reading football chess
# clues 8, 13, 14
if {
$kools == $yellow
&& $luckyStrike == $orangeJuice
&& $japanese == $parliaments
$painting == $yellow
&& $football == $orangeJuice
&& $japanese == $chess
} {
foreach p [permutations] {
if {[my SolveForPets $p]} then {return true}
Expand All @@ -138,9 +138,9 @@ oo::class create ZebraPuzzle {
# clues 3, 7, 11, 12
if {
$spanish == $dog
&& $oldGold == $snails
&& nextTo($chesterfields, $fox)
&& nextTo($kools, $horse)
&& $dancing == $snails
&& nextTo($reading, $fox)
&& nextTo($painting, $horse)
} {
set waterDrinker [dict get $nationalities $water]
set zebraOwner [dict get $nationalities $zebra]
Expand Down

0 comments on commit 5fdc397

Please sign in to comment.