Skip to content

Commit da1e096

Browse files
sync triangle (#566)
[no important files changed]
1 parent 5a6518b commit da1e096

File tree

4 files changed

+49
-31
lines changed

4 files changed

+49
-31
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Instructions append
2+
3+
### Error handling & Assertion
4+
5+
Use error handling or assertion to check if the shape is a triangle at all:
6+
7+
- [Error Keyword][error-keyword]
8+
- [Assertion][assertion]
9+
10+
[error-keyword]: https://www.lua.org/manual/5.4/manual.html#pdf-error
11+
[assertion]: https://www.lua.org/manual/5.4/manual.html#pdf-assert

exercises/practice/triangle/.docs/instructions.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,4 @@ a + c ≥ b
2626

2727
See [Triangle Inequality][triangle-inequality]
2828

29-
### Error handling & Assertion
30-
31-
Use error handling or assertion to check if the shape is a triangle at all:
32-
33-
- [Error Keyword][error-keyword]
34-
- [Assertion][assertion]
35-
3629
[triangle-inequality]: https://en.wikipedia.org/wiki/Triangle_inequality
37-
[error-keyword]: https://www.lua.org/manual/5.4/manual.html#pdf-error
38-
[assertion]: https://www.lua.org/manual/5.4/manual.html#pdf-assert
Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,73 @@
1-
# This is an auto-generated file. Regular comments will be removed when this
2-
# file is regenerated. Regenerating will not touch any manually added keys,
3-
# so comments can be added in a "comment" key.
1+
# This is an auto-generated file.
2+
#
3+
# Regenerating this file via `configlet sync` will:
4+
# - Recreate every `description` key/value pair
5+
# - Recreate every `reimplements` key/value pair, where they exist in problem-specifications
6+
# - Remove any `include = true` key/value pair (an omitted `include` key implies inclusion)
7+
# - Preserve any other key/value pair
8+
#
9+
# As user-added comments (using the # character) will be removed when this file
10+
# is regenerated, comments can be added via a `comment` key.
411

512
[8b2c43ac-7257-43f9-b552-7631a91988af]
6-
description = "all sides are equal"
13+
description = "equilateral triangle -> all sides are equal"
714

815
[33eb6f87-0498-4ccf-9573-7f8c3ce92b7b]
9-
description = "any side is unequal"
16+
description = "equilateral triangle -> any side is unequal"
1017

1118
[c6585b7d-a8c0-4ad8-8a34-e21d36f7ad87]
12-
description = "no sides are equal"
19+
description = "equilateral triangle -> no sides are equal"
1320

1421
[16e8ceb0-eadb-46d1-b892-c50327479251]
15-
description = "all zero sides is not a triangle"
22+
description = "equilateral triangle -> all zero sides is not a triangle"
1623

1724
[3022f537-b8e5-4cc1-8f12-fd775827a00c]
18-
description = "sides may be floats"
25+
description = "equilateral triangle -> sides may be floats"
1926

2027
[cbc612dc-d75a-4c1c-87fc-e2d5edd70b71]
21-
description = "last two sides are equal"
28+
description = "isosceles triangle -> last two sides are equal"
2229

2330
[e388ce93-f25e-4daf-b977-4b7ede992217]
24-
description = "first two sides are equal"
31+
description = "isosceles triangle -> first two sides are equal"
2532

2633
[d2080b79-4523-4c3f-9d42-2da6e81ab30f]
27-
description = "first and last sides are equal"
34+
description = "isosceles triangle -> first and last sides are equal"
2835

2936
[8d71e185-2bd7-4841-b7e1-71689a5491d8]
30-
description = "equilateral triangles are also isosceles"
37+
description = "isosceles triangle -> equilateral triangles are also isosceles"
3138

3239
[840ed5f8-366f-43c5-ac69-8f05e6f10bbb]
33-
description = "no sides are equal"
40+
description = "isosceles triangle -> no sides are equal"
3441

3542
[2eba0cfb-6c65-4c40-8146-30b608905eae]
36-
description = "first triangle inequality violation"
43+
description = "isosceles triangle -> first triangle inequality violation"
3744

3845
[278469cb-ac6b-41f0-81d4-66d9b828f8ac]
39-
description = "second triangle inequality violation"
46+
description = "isosceles triangle -> second triangle inequality violation"
4047

4148
[90efb0c7-72bb-4514-b320-3a3892e278ff]
42-
description = "third triangle inequality violation"
49+
description = "isosceles triangle -> third triangle inequality violation"
4350

4451
[adb4ee20-532f-43dc-8d31-e9271b7ef2bc]
45-
description = "sides may be floats"
52+
description = "isosceles triangle -> sides may be floats"
4653

4754
[e8b5f09c-ec2e-47c1-abec-f35095733afb]
48-
description = "no sides are equal"
55+
description = "scalene triangle -> no sides are equal"
4956

5057
[2510001f-b44d-4d18-9872-2303e7977dc1]
51-
description = "all sides are equal"
58+
description = "scalene triangle -> all sides are equal"
5259

5360
[c6e15a92-90d9-4fb3-90a2-eef64f8d3e1e]
54-
description = "two sides are equal"
61+
description = "scalene triangle -> first and second sides are equal"
62+
63+
[3da23a91-a166-419a-9abf-baf4868fd985]
64+
description = "scalene triangle -> first and third sides are equal"
65+
66+
[b6a75d98-1fef-4c42-8e9a-9db854ba0a4d]
67+
description = "scalene triangle -> second and third sides are equal"
5568

5669
[70ad5154-0033-48b7-af2c-b8d739cd9fdc]
57-
description = "may not violate triangle inequality"
70+
description = "scalene triangle -> may not violate triangle inequality"
5871

5972
[26d9d59d-f8f1-40d3-ad58-ae4d54123d7d]
60-
description = "sides may be floats"
73+
description = "scalene triangle -> sides may be floats"

exercises/practice/triangle/triangle_spec.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ describe('triangle', function()
1111

1212
it('isosceles triangles have last two sides equal', function()
1313
assert.are.equals('isosceles', triangle.kind(3, 4, 4))
14+
assert.are.equals('isosceles', triangle.kind(4, 3, 3))
1415
end)
1516

1617
it('isosceles trianges have first and last sides equal', function()
18+
assert.are.equals('isosceles', triangle.kind(3, 4, 3))
1719
assert.are.equals('isosceles', triangle.kind(4, 3, 4))
1820
end)
1921

2022
it('isosceles triangles have two first sides equal', function()
23+
assert.are.equals('isosceles', triangle.kind(3, 3, 4))
2124
assert.are.equals('isosceles', triangle.kind(4, 4, 3))
2225
end)
2326

0 commit comments

Comments
 (0)