From 3556b2566f88f9588dde6fb528e9a15154913e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20B=20Nagy?= <20251272+BNAndras@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:39:50 -0700 Subject: [PATCH 1/3] Add yacht --- .../practice/yacht/.docs/instructions.md | 30 +++++ .../practice/yacht/.docs/introduction.md | 11 ++ exercises/practice/yacht/.meta/config.json | 19 +++ exercises/practice/yacht/.meta/example.jl | 35 +++++ exercises/practice/yacht/.meta/tests.toml | 97 ++++++++++++++ exercises/practice/yacht/runtests.jl | 122 ++++++++++++++++++ exercises/practice/yacht/yacht.jl | 4 + 7 files changed, 318 insertions(+) create mode 100644 exercises/practice/yacht/.docs/instructions.md create mode 100644 exercises/practice/yacht/.docs/introduction.md create mode 100644 exercises/practice/yacht/.meta/config.json create mode 100644 exercises/practice/yacht/.meta/example.jl create mode 100644 exercises/practice/yacht/.meta/tests.toml create mode 100644 exercises/practice/yacht/runtests.jl create mode 100644 exercises/practice/yacht/yacht.jl diff --git a/exercises/practice/yacht/.docs/instructions.md b/exercises/practice/yacht/.docs/instructions.md new file mode 100644 index 00000000..519b7a68 --- /dev/null +++ b/exercises/practice/yacht/.docs/instructions.md @@ -0,0 +1,30 @@ +# Instructions + +Given five dice and a category, calculate the score of the dice for that category. + +~~~~exercism/note +You'll always be presented with five dice. +Each dice's value will be between one and six inclusively. +The dice may be unordered. +~~~~ + +## Scores in Yacht + +| Category | Score | Description | Example | +| --------------- | ---------------------- | ---------------------------------------- | ------------------- | +| Ones | 1 × number of ones | Any combination | 1 1 1 4 5 scores 3 | +| Twos | 2 × number of twos | Any combination | 2 2 3 4 5 scores 4 | +| Threes | 3 × number of threes | Any combination | 3 3 3 3 3 scores 15 | +| Fours | 4 × number of fours | Any combination | 1 2 3 3 5 scores 0 | +| Fives | 5 × number of fives | Any combination | 5 1 5 2 5 scores 15 | +| Sixes | 6 × number of sixes | Any combination | 2 3 4 5 6 scores 6 | +| Full House | Total of the dice | Three of one number and two of another | 3 3 3 5 5 scores 19 | +| Four of a Kind | Total of the four dice | At least four dice showing the same face | 4 4 4 4 6 scores 16 | +| Little Straight | 30 points | 1-2-3-4-5 | 1 2 3 4 5 scores 30 | +| Big Straight | 30 points | 2-3-4-5-6 | 2 3 4 5 6 scores 30 | +| Choice | Sum of the dice | Any combination | 2 3 3 4 6 scores 18 | +| Yacht | 50 points | All five dice showing the same face | 4 4 4 4 4 scores 50 | + +If the dice do **not** satisfy the requirements of a category, the score is zero. +If, for example, _Four Of A Kind_ is entered in the _Yacht_ category, zero points are scored. +A _Yacht_ scores zero if entered in the _Full House_ category. diff --git a/exercises/practice/yacht/.docs/introduction.md b/exercises/practice/yacht/.docs/introduction.md new file mode 100644 index 00000000..5b541f56 --- /dev/null +++ b/exercises/practice/yacht/.docs/introduction.md @@ -0,0 +1,11 @@ +# Introduction + +Each year, something new is "all the rage" in your high school. +This year it is a dice game: [Yacht][yacht]. + +The game of Yacht is from the same family as Poker Dice, Generala and particularly Yahtzee, of which it is a precursor. +The game consists of twelve rounds. +In each, five dice are rolled and the player chooses one of twelve categories. +The chosen category is then used to score the throw of the dice. + +[yacht]: https://en.wikipedia.org/wiki/Yacht_(dice_game) diff --git a/exercises/practice/yacht/.meta/config.json b/exercises/practice/yacht/.meta/config.json new file mode 100644 index 00000000..9c432a11 --- /dev/null +++ b/exercises/practice/yacht/.meta/config.json @@ -0,0 +1,19 @@ +{ + "authors": [ + "BNAndras" + ], + "files": { + "solution": [ + "yacht.jl" + ], + "test": [ + "runtests.jl" + ], + "example": [ + ".meta/example.jl" + ] + }, + "blurb": "Score a single throw of dice in the game Yacht.", + "source": "James Kilfiger, using Wikipedia", + "source_url": "https://en.wikipedia.org/wiki/Yacht_(dice_game)" +} diff --git a/exercises/practice/yacht/.meta/example.jl b/exercises/practice/yacht/.meta/example.jl new file mode 100644 index 00000000..1113399c --- /dev/null +++ b/exercises/practice/yacht/.meta/example.jl @@ -0,0 +1,35 @@ +function score(dice, category) + score_side = f(s) = count(die -> die == s, dice) * s + if category == "yacht" + length(unique(dice)) == 1 ? 50 : 0 + elseif category == "ones" + score_side(1) + elseif category == "twos" + score_side(2) + elseif category == "threes" + score_side(3) + elseif category == "fours" + score_side(4) + elseif category == "fives" + score_side(5) + elseif category == "sixes" + score_side(6) + elseif category == "full house" + counts = Dict(die => count(==(die), dice) for die in unique(dice)) + vals = values(counts) + 2 in vals && 3 in vals ? sum(dice) : 0 + elseif category == "four of a kind" + counts = Dict(die => count(==(die), dice) for die in unique(dice)) + match = findfirst(v -> v >= 4, counts) + !isnothing(match) ? match * 4 : 0 + elseif category == "little straight" + sort(dice) == [1, 2, 3, 4, 5] ? 30 : 0 + elseif category == "big straight" + sort(dice) == [2, 3, 4, 5, 6] ? 30 : 0 + elseif category == "choice" + sum(dice) + else + 0 + end +end + diff --git a/exercises/practice/yacht/.meta/tests.toml b/exercises/practice/yacht/.meta/tests.toml new file mode 100644 index 00000000..b9d92037 --- /dev/null +++ b/exercises/practice/yacht/.meta/tests.toml @@ -0,0 +1,97 @@ +# This is an auto-generated file. +# +# Regenerating this file via `configlet sync` will: +# - Recreate every `description` key/value pair +# - Recreate every `reimplements` key/value pair, where they exist in problem-specifications +# - Remove any `include = true` key/value pair (an omitted `include` key implies inclusion) +# - Preserve any other key/value pair +# +# As user-added comments (using the # character) will be removed when this file +# is regenerated, comments can be added via a `comment` key. + +[3060e4a5-4063-4deb-a380-a630b43a84b6] +description = "Yacht" + +[15026df2-f567-482f-b4d5-5297d57769d9] +description = "Not Yacht" + +[36b6af0c-ca06-4666-97de-5d31213957a4] +description = "Ones" + +[023a07c8-6c6e-44d0-bc17-efc5e1b8205a] +description = "Ones, out of order" + +[7189afac-cccd-4a74-8182-1cb1f374e496] +description = "No ones" + +[793c4292-dd14-49c4-9707-6d9c56cee725] +description = "Twos" + +[dc41bceb-d0c5-4634-a734-c01b4233a0c6] +description = "Fours" + +[f6125417-5c8a-4bca-bc5b-b4b76d0d28c8] +description = "Yacht counted as threes" + +[464fc809-96ed-46e4-acb8-d44e302e9726] +description = "Yacht of 3s counted as fives" + +[d054227f-3a71-4565-a684-5c7e621ec1e9] +description = "Fives" + +[e8a036e0-9d21-443a-8b5f-e15a9e19a761] +description = "Sixes" + +[51cb26db-6b24-49af-a9ff-12f53b252eea] +description = "Full house two small, three big" + +[1822ca9d-f235-4447-b430-2e8cfc448f0c] +description = "Full house three small, two big" + +[b208a3fc-db2e-4363-a936-9e9a71e69c07] +description = "Two pair is not a full house" + +[b90209c3-5956-445b-8a0b-0ac8b906b1c2] +description = "Four of a kind is not a full house" + +[32a3f4ee-9142-4edf-ba70-6c0f96eb4b0c] +description = "Yacht is not a full house" + +[b286084d-0568-4460-844a-ba79d71d79c6] +description = "Four of a Kind" + +[f25c0c90-5397-4732-9779-b1e9b5f612ca] +description = "Yacht can be scored as Four of a Kind" + +[9f8ef4f0-72bb-401a-a871-cbad39c9cb08] +description = "Full house is not Four of a Kind" + +[b4743c82-1eb8-4a65-98f7-33ad126905cd] +description = "Little Straight" + +[7ac08422-41bf-459c-8187-a38a12d080bc] +description = "Little Straight as Big Straight" + +[97bde8f7-9058-43ea-9de7-0bc3ed6d3002] +description = "Four in order but not a little straight" + +[cef35ff9-9c5e-4fd2-ae95-6e4af5e95a99] +description = "No pairs but not a little straight" + +[fd785ad2-c060-4e45-81c6-ea2bbb781b9d] +description = "Minimum is 1, maximum is 5, but not a little straight" + +[35bd74a6-5cf6-431a-97a3-4f713663f467] +description = "Big Straight" + +[87c67e1e-3e87-4f3a-a9b1-62927822b250] +description = "Big Straight as little straight" + +[c1fa0a3a-40ba-4153-a42d-32bc34d2521e] +description = "No pairs but not a big straight" + +[207e7300-5d10-43e5-afdd-213e3ac8827d] +description = "Choice" + +[b524c0cf-32d2-4b40-8fb3-be3500f3f135] +description = "Yacht as choice" diff --git a/exercises/practice/yacht/runtests.jl b/exercises/practice/yacht/runtests.jl new file mode 100644 index 00000000..540a98fa --- /dev/null +++ b/exercises/practice/yacht/runtests.jl @@ -0,0 +1,122 @@ +using Test + +include("yacht.jl") + +@testset verbose = true "tests" begin + @testset "Yacht" begin + @test score([5, 5, 5, 5, 5], "yacht") == 50 + end + + @testset "Not Yacht" begin + @test score([1, 3, 3, 2, 5], "yacht") == 0 + end + + @testset "Ones" begin + @test score([1, 1, 1, 3, 5], "ones") == 3 + end + + @testset "Ones, out of order" begin + @test score([3, 1, 1, 5, 1], "ones") == 3 + end + + @testset "No ones" begin + @test score([4, 3, 6, 5, 5], "ones") == 0 + end + + @testset "Twos" begin + @test score([2, 3, 4, 5, 6], "twos") == 2 + end + + @testset "Fours" begin + @test score([1, 4, 1, 4, 1], "fours") == 8 + end + + @testset "Yacht counted as threes" begin + @test score([3, 3, 3, 3, 3], "threes") == 15 + end + + @testset "Yacht of 3s counted as fives" begin + @test score([3, 3, 3, 3, 3], "fives") == 0 + end + + @testset "Fives" begin + @test score([1, 5, 3, 5, 3], "fives") == 10 + end + + @testset "Sixes" begin + @test score([2, 3, 4, 5, 6], "sixes") == 6 + end + + @testset "Full house two small, three big" begin + @test score([2, 2, 4, 4, 4], "full house") == 16 + end + + @testset "Full house three small, two big" begin + @test score([5, 3, 3, 5, 3], "full house") == 19 + end + + @testset "Two pair is not a full house" begin + @test score([2, 2, 4, 4, 5], "full house") == 0 + end + + @testset "Four of a kind is not a full house" begin + @test score([1, 4, 4, 4, 4], "full house") == 0 + end + + @testset "Yacht is not a full house" begin + @test score([2, 2, 2, 2, 2], "full house") == 0 + end + + @testset "Four of a Kind" begin + @test score([6, 6, 4, 6, 6], "four of a kind") == 24 + end + + @testset "Yacht can be scored as Four of a Kind" begin + @test score([3, 3, 3, 3, 3], "four of a kind") == 12 + end + + @testset "Full house is not Four of a Kind" begin + @test score([3, 3, 3, 5, 5], "four of a kind") == 0 + end + + @testset "Little Straight" begin + @test score([3, 5, 4, 1, 2], "little straight") == 30 + end + + @testset "Little Straight as Big Straight" begin + @test score([1, 2, 3, 4, 5], "big straight") == 0 + end + + @testset "Four in order but not a little straight" begin + @test score([1, 1, 2, 3, 4], "little straight") == 0 + end + + @testset "No pairs but not a little straight" begin + @test score([1, 2, 3, 4, 6], "little straight") == 0 + end + + @testset "Minimum is 1, maximum is 5, but not a little straight" begin + @test score([1, 1, 3, 4, 5], "little straight") == 0 + end + + @testset "Big Straight" begin + @test score([4, 6, 2, 5, 3], "big straight") == 30 + end + + @testset "Big Straight as little straight" begin + @test score([6, 5, 4, 3, 2], "little straight") == 0 + end + + @testset "No pairs but not a big straight" begin + @test score([6, 5, 4, 3, 1], "big straight") == 0 + end + + @testset "Choice" begin + @test score([3, 3, 5, 6, 6], "choice") == 23 + end + + @testset "Yacht as choice" begin + @test score([2, 2, 2, 2, 2], "choice") == 10 + end +end + diff --git a/exercises/practice/yacht/yacht.jl b/exercises/practice/yacht/yacht.jl new file mode 100644 index 00000000..961aeb34 --- /dev/null +++ b/exercises/practice/yacht/yacht.jl @@ -0,0 +1,4 @@ +function score(dice, category) + +end + From c424d1dcfd62de9a6c6f8392da03bc59e7b9dc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20B=20Nagy?= <20251272+BNAndras@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:42:30 -0700 Subject: [PATCH 2/3] Add exercise entry to config --- config.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.json b/config.json index 0dc63f04..d4fb135f 100644 --- a/config.json +++ b/config.json @@ -721,6 +721,14 @@ "strings" ] }, + { + "slug": "yacht", + "name": "Yacht", + "uuid": "32341692-02df-48a0-b696-1cfe93dc6862", + "practices": [], + "prerequisites": [], + "difficulty": 2 + }, { "slug": "transpose", "name": "Transpose", From 133b388a884ca50dc26c9f46caf75bc13670b160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20B=20Nagy?= <20251272+BNAndras@users.noreply.github.com> Date: Tue, 9 Jul 2024 17:42:05 -0700 Subject: [PATCH 3/3] Bump up the difficulty --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index d4fb135f..f7ab2672 100644 --- a/config.json +++ b/config.json @@ -727,7 +727,7 @@ "uuid": "32341692-02df-48a0-b696-1cfe93dc6862", "practices": [], "prerequisites": [], - "difficulty": 2 + "difficulty": 3 }, { "slug": "transpose",