Skip to content

Commit

Permalink
Sync recent problem spec changes (exercism#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 committed Aug 10, 2024
1 parent 81e30a0 commit 00e2c3c
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 35 deletions.
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
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 00e2c3c

Please sign in to comment.