From b323112ff4b886a5f301bddfa675903e540806f3 Mon Sep 17 00:00:00 2001 From: meatball Date: Fri, 11 Oct 2024 21:28:34 +0200 Subject: [PATCH] Add exercise to config Fixes in about text --- concepts/numbers/.meta/config.json | 3 ++- concepts/numbers/about.md | 5 +++-- concepts/numbers/introduction.md | 10 +++++----- config.json | 18 +++++++++++++++--- .../freelancer-rates/.docs/instructions.md | 2 +- .../freelancer-rates/.docs/introduction.md | 10 +++++----- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/concepts/numbers/.meta/config.json b/concepts/numbers/.meta/config.json index 8988f3def..1198ff6c3 100644 --- a/concepts/numbers/.meta/config.json +++ b/concepts/numbers/.meta/config.json @@ -1,6 +1,7 @@ { "authors": [ - "pwadsworth" + "pwadsworth", + "meatball133" ], "blurb": "Basics of Haskell numeric types" } diff --git a/concepts/numbers/about.md b/concepts/numbers/about.md index c1ab22320..46955b9ae 100644 --- a/concepts/numbers/about.md +++ b/concepts/numbers/about.md @@ -39,7 +39,7 @@ fromIntegral 1 -- -> 1.0 ``` -To convert a `Float` to an `Int`, you can use the `round`, `floor`, or `ceiling` functions. +To convert a `Float` to an `Int`, you can use the [`round`][round], [`floor`][floor], or [`ceiling`][ceiling] functions. The `round` function rounds to the nearest integer, `floor` rounds down, and `ceiling` rounds up. ```haskell @@ -139,7 +139,7 @@ This is different from normal division. ```haskell 1 `mod` 0 -# Exception: divide by zero +-- Exception: divide by zero ``` ~~~~ @@ -181,3 +181,4 @@ It follows the order of parentheses(`()`), exponents(`**`), multiplication(`*`) [pemdas]: https://en.wikipedia.org/wiki/Order_of_operations [floor]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:floor [ceiling]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:ceiling +[round]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:round diff --git a/concepts/numbers/introduction.md b/concepts/numbers/introduction.md index 2132a9af7..46955b9ae 100644 --- a/concepts/numbers/introduction.md +++ b/concepts/numbers/introduction.md @@ -39,7 +39,7 @@ fromIntegral 1 -- -> 1.0 ``` -To convert a `Float` to an `Int`, you can use the `round`, `floor`, or `ceiling` functions. +To convert a `Float` to an `Int`, you can use the [`round`][round], [`floor`][floor], or [`ceiling`][ceiling] functions. The `round` function rounds to the nearest integer, `floor` rounds down, and `ceiling` rounds up. ```haskell @@ -139,7 +139,7 @@ This is different from normal division. ```haskell 1 `mod` 0 -# Exception: divide by zero +-- Exception: divide by zero ``` ~~~~ @@ -179,6 +179,6 @@ It follows the order of parentheses(`()`), exponents(`**`), multiplication(`*`) ``` [pemdas]: https://en.wikipedia.org/wiki/Order_of_operations -[math]: https://crystal-lang.org/reference/latest/tutorials/basics/30_math.html -[int]: https://crystal-lang.org/reference/latest/syntax_and_semantics/literals/integers.html -[float]: https://crystal-lang.org/reference/latest/syntax_and_semantics/literals/floats.html +[floor]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:floor +[ceiling]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:ceiling +[round]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:round diff --git a/config.json b/config.json index 145ade90f..47fb029c0 100644 --- a/config.json +++ b/config.json @@ -49,9 +49,9 @@ ] }, { - "slug": "temperature", - "name": "Temperature", - "uuid": "6ed15adb-f022-4bbd-bbb3-22845deabc91", + "slug": "freelancer-rates", + "name": "Freelancer Rates", + "uuid": "85e17e39-9506-4dc8-bed6-ecc44c840cc1", "prerequisites": [ "basics" ], @@ -96,6 +96,18 @@ "concepts": [ "algebraic-data-types" ] + }, + { + "slug": "temperature", + "name": "Temperature", + "uuid": "6ed15adb-f022-4bbd-bbb3-22845deabc91", + "prerequisites": [ + "basics" + ], + "status": "deprecated", + "concepts": [ + "numbers" + ] } ], "practice": [ diff --git a/exercises/concept/freelancer-rates/.docs/instructions.md b/exercises/concept/freelancer-rates/.docs/instructions.md index 0ead523eb..6bd3ed73d 100644 --- a/exercises/concept/freelancer-rates/.docs/instructions.md +++ b/exercises/concept/freelancer-rates/.docs/instructions.md @@ -40,7 +40,7 @@ Implement a function to calculate the monthly rate, and apply a discount: ```haskell monthlyRate 77 10.5 -# => 12130 +-- -> 12130 ``` The returned monthly rate should be rounded up (take the ceiling) to the nearest integer. diff --git a/exercises/concept/freelancer-rates/.docs/introduction.md b/exercises/concept/freelancer-rates/.docs/introduction.md index 2132a9af7..46955b9ae 100644 --- a/exercises/concept/freelancer-rates/.docs/introduction.md +++ b/exercises/concept/freelancer-rates/.docs/introduction.md @@ -39,7 +39,7 @@ fromIntegral 1 -- -> 1.0 ``` -To convert a `Float` to an `Int`, you can use the `round`, `floor`, or `ceiling` functions. +To convert a `Float` to an `Int`, you can use the [`round`][round], [`floor`][floor], or [`ceiling`][ceiling] functions. The `round` function rounds to the nearest integer, `floor` rounds down, and `ceiling` rounds up. ```haskell @@ -139,7 +139,7 @@ This is different from normal division. ```haskell 1 `mod` 0 -# Exception: divide by zero +-- Exception: divide by zero ``` ~~~~ @@ -179,6 +179,6 @@ It follows the order of parentheses(`()`), exponents(`**`), multiplication(`*`) ``` [pemdas]: https://en.wikipedia.org/wiki/Order_of_operations -[math]: https://crystal-lang.org/reference/latest/tutorials/basics/30_math.html -[int]: https://crystal-lang.org/reference/latest/syntax_and_semantics/literals/integers.html -[float]: https://crystal-lang.org/reference/latest/syntax_and_semantics/literals/floats.html +[floor]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:floor +[ceiling]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:ceiling +[round]: https://hackage.haskell.org/package/base/docs/Prelude.html#v:round