From acfce29307fdef64c30e37ffe78c8821302d749a Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Tue, 3 Dec 2024 05:26:14 +0000 Subject: [PATCH 1/9] Update Diamond --- exercises/diamond/description.md | 67 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index e739327818..a08a8efc38 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -1,25 +1,9 @@ # Description -The diamond kata takes as its input a letter, and outputs it in a diamond shape. -Given a letter, it prints a diamond starting with 'A', with the supplied letter at the widest point. +Your objective is to draw out a diamond using letters and spaces. -## Requirements - -- The first row contains one 'A'. -- The last row contains one 'A'. -- All rows, except the first and last, have exactly two identical letters. -- All rows have as many trailing spaces as leading spaces. (This might be 0). -- The diamond is horizontally symmetric. -- The diamond is vertically symmetric. -- The diamond has a square shape (width equals height). -- The letters form a diamond shape. -- The top half has the letters in ascending order. -- The bottom half has the letters in descending order. -- The four corners (containing the spaces) are triangles. - -## Examples - -In the following examples, spaces are indicated by `·` characters. +You're given a letter which signifies the widest point of the diamond. +Let's look at some examples. Diamond for letter 'A': @@ -30,23 +14,40 @@ A Diamond for letter 'C': ```text -··A·· -·B·B· -C···C -·B·B· -··A·· + A + B B +C C + B B + A ``` Diamond for letter 'E': ```text -····A···· -···B·B··· -··C···C·· -·D·····D· -E·······E -·D·····D· -··C···C·· -···B·B··· -····A···· + A + B B + C C + D D +E E + D D + C C + B B + A ``` + + +## Requirements + +These are the full requirements: + +- The first row contains one 'A'. +- The last row contains one 'A'. +- All rows, except the first and last, have exactly two identical letters. +- All rows have as many trailing spaces as leading spaces. (This might be 0). +- The diamond is horizontally symmetric. +- The diamond is vertically symmetric. +- The diamond has a square shape (width equals height). +- The letters form a diamond shape. +- The top half has the letters in ascending order. +- The bottom half has the letters in descending order. +- The four corners (containing the spaces) are triangles. From 44cea9bc85df8262c8bf17a7b523a6c0aac628f2 Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Tue, 3 Dec 2024 11:20:08 +0000 Subject: [PATCH 2/9] Update exercises/diamond/description.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: András B Nagy <20251272+BNAndras@users.noreply.github.com> --- exercises/diamond/description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index a08a8efc38..e6ec78e350 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -43,7 +43,7 @@ These are the full requirements: - The first row contains one 'A'. - The last row contains one 'A'. - All rows, except the first and last, have exactly two identical letters. -- All rows have as many trailing spaces as leading spaces. (This might be 0). +- All rows have as many trailing spaces as leading spaces (this might be 0). - The diamond is horizontally symmetric. - The diamond is vertically symmetric. - The diamond has a square shape (width equals height). From d9173b8ea41681ebb9a86e105450db94e09f4c38 Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Tue, 3 Dec 2024 11:24:19 +0000 Subject: [PATCH 3/9] Update description.md --- exercises/diamond/description.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index e6ec78e350..953a6d75c3 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -1,8 +1,9 @@ # Description -Your objective is to draw out a diamond using letters and spaces. +Your goal is to create a diamond shape using letters and spaces. + +You're given a letter, which represents the widest point of the diamond. -You're given a letter which signifies the widest point of the diamond. Let's look at some examples. Diamond for letter 'A': @@ -39,15 +40,14 @@ E E ## Requirements These are the full requirements: - -- The first row contains one 'A'. -- The last row contains one 'A'. -- All rows, except the first and last, have exactly two identical letters. -- All rows have as many trailing spaces as leading spaces (this might be 0). -- The diamond is horizontally symmetric. -- The diamond is vertically symmetric. - The diamond has a square shape (width equals height). - The letters form a diamond shape. - The top half has the letters in ascending order. - The bottom half has the letters in descending order. +- All rows, except the first and last, have exactly two identical letters. +- The first row contains one 'A'. +- The last row contains one 'A'. +- All rows have as many trailing spaces as leading spaces (this might be 0 spaces). +- The diamond is horizontally symmetric. +- The diamond is vertically symmetric. - The four corners (containing the spaces) are triangles. From 07979f0765aaeb98a6a08077506fdb8fb43a1d5e Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Tue, 3 Dec 2024 11:26:56 +0000 Subject: [PATCH 4/9] Update exercises/diamond/description.md --- exercises/diamond/description.md | 1 - 1 file changed, 1 deletion(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 953a6d75c3..61ee58d620 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -36,7 +36,6 @@ E E A ``` - ## Requirements These are the full requirements: From 2ff06f51345e8434d80daea6626cee9a24aca100 Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Tue, 3 Dec 2024 11:29:01 +0000 Subject: [PATCH 5/9] Update exercises/diamond/description.md --- exercises/diamond/description.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 61ee58d620..1d72104f3b 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -50,3 +50,4 @@ These are the full requirements: - The diamond is horizontally symmetric. - The diamond is vertically symmetric. - The four corners (containing the spaces) are triangles. + From 79639321ad5eb1806a210ce41f5dce96af98aa75 Mon Sep 17 00:00:00 2001 From: Cool-Katt Date: Wed, 4 Dec 2024 22:34:54 +0200 Subject: [PATCH 6/9] Hopefully making the CI pass --- exercises/diamond/description.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 1d72104f3b..3f065c60ae 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -39,6 +39,7 @@ E E ## Requirements These are the full requirements: + - The diamond has a square shape (width equals height). - The letters form a diamond shape. - The top half has the letters in ascending order. From cba7b164632a3434b6a2f148f9ffae304e888a16 Mon Sep 17 00:00:00 2001 From: Cool-Katt Date: Wed, 4 Dec 2024 22:50:00 +0200 Subject: [PATCH 7/9] Hopefully making the CI pass, part 2 --- exercises/diamond/description.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 3f065c60ae..93a72af42f 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -39,7 +39,7 @@ E E ## Requirements These are the full requirements: - +- - The diamond has a square shape (width equals height). - The letters form a diamond shape. - The top half has the letters in ascending order. @@ -51,4 +51,4 @@ These are the full requirements: - The diamond is horizontally symmetric. - The diamond is vertically symmetric. - The four corners (containing the spaces) are triangles. - +- From 672f5ad2eb85c83197c085445098e2c6f4c9ab1d Mon Sep 17 00:00:00 2001 From: Cool-Katt Date: Wed, 4 Dec 2024 22:59:33 +0200 Subject: [PATCH 8/9] Please let the CI pass... --- exercises/diamond/description.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 93a72af42f..5fa9931f8c 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -36,10 +36,8 @@ E E A ``` -## Requirements +## These are the full requirements: -These are the full requirements: -- - The diamond has a square shape (width equals height). - The letters form a diamond shape. - The top half has the letters in ascending order. @@ -51,4 +49,3 @@ These are the full requirements: - The diamond is horizontally symmetric. - The diamond is vertically symmetric. - The four corners (containing the spaces) are triangles. -- From bc1bac3c1f8bb6d2f60ae5ac83e8665f1a1bec19 Mon Sep 17 00:00:00 2001 From: Cool-Katt Date: Wed, 4 Dec 2024 23:00:41 +0200 Subject: [PATCH 9/9] I dislike CI --- exercises/diamond/description.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/diamond/description.md b/exercises/diamond/description.md index 5fa9931f8c..6011c5be6f 100644 --- a/exercises/diamond/description.md +++ b/exercises/diamond/description.md @@ -36,7 +36,7 @@ E E A ``` -## These are the full requirements: +## These are the full requirements - The diamond has a square shape (width equals height). - The letters form a diamond shape.