Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync pascals-triangle with problem-specifications #1743

Merged
merged 1 commit into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions exercises/practice/pascals-triangle/.docs/instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

Compute Pascal's triangle up to a given number of rows.

In Pascal's Triangle each number is computed by adding the numbers to
the right and left of the current position in the previous row.
In Pascal's Triangle each number is computed by adding the numbers to the right and left of the current position in the previous row.

```text
1
Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/pascals-triangle/.meta/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
},
"blurb": "Compute Pascal's triangle up to a given number of rows.",
"source": "Pascal's Triangle at Wolfram Math World",
"source_url": "http://mathworld.wolfram.com/PascalsTriangle.html"
"source_url": "https://www.wolframalpha.com/input/?i=Pascal%27s+triangle"
}
14 changes: 14 additions & 0 deletions exercises/practice/pascals-triangle/.meta/test_template.tera
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
use pascals_triangle::PascalsTriangle;
{% for test in cases %}
#[test]
{% if loop.index != 1 -%}
#[ignore]
{% endif -%}
fn {{ test.description | slugify | replace(from="-", to="_") }}() {
let pt = PascalsTriangle::new({{ test.input.count }});
let expected: Vec<Vec<u32>> = vec![{% for row in test.expected -%}
vec!{{ row | json_encode() }},
{%- endfor %}];
assert_eq!(pt.rows(), expected);
}
{% endfor -%}
22 changes: 19 additions & 3 deletions exercises/practice/pascals-triangle/.meta/tests.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
# This is an auto-generated file. Regular comments will be removed when this
# file is regenerated. Regenerating will not touch any manually added keys,
# so comments can be added in a "comment" key.
# 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.

[9920ce55-9629-46d5-85d6-4201f4a4234d]
description = "zero rows"

[70d643ce-a46d-4e93-af58-12d88dd01f21]
description = "single row"

[a6e5a2a2-fc9a-4b47-9f4f-ed9ad9fbe4bd]
description = "two rows"

[97206a99-79ba-4b04-b1c5-3c0fa1e16925]
description = "three rows"

[565a0431-c797-417c-a2c8-2935e01ce306]
description = "four rows"

[06f9ea50-9f51-4eb2-b9a9-c00975686c27]
description = "five rows"

Expand Down
44 changes: 14 additions & 30 deletions exercises/practice/pascals-triangle/tests/pascals-triangle.rs
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
use pascals_triangle::*;
use pascals_triangle::PascalsTriangle;

#[test]
fn no_rows() {
fn zero_rows() {
let pt = PascalsTriangle::new(0);
let expected: Vec<Vec<u32>> = Vec::new();
assert_eq!(expected, pt.rows());
let expected: Vec<Vec<u32>> = vec![];
assert_eq!(pt.rows(), expected);
}

#[test]
#[ignore]
fn one_row() {
fn single_row() {
let pt = PascalsTriangle::new(1);
let expected: Vec<Vec<u32>> = vec![vec![1]];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}

#[test]
#[ignore]
fn two_rows() {
let pt = PascalsTriangle::new(2);
let expected: Vec<Vec<u32>> = vec![vec![1], vec![1, 1]];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}

#[test]
#[ignore]
fn three_rows() {
let pt = PascalsTriangle::new(3);
let expected: Vec<Vec<u32>> = vec![vec![1], vec![1, 1], vec![1, 2, 1]];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}

#[test]
#[ignore]
fn last_of_four_rows() {
fn four_rows() {
let pt = PascalsTriangle::new(4);
let expected: Vec<u32> = vec![1, 3, 3, 1];
assert_eq!(Some(expected), pt.rows().pop());
let expected: Vec<Vec<u32>> = vec![vec![1], vec![1, 1], vec![1, 2, 1], vec![1, 3, 3, 1]];
assert_eq!(pt.rows(), expected);
}

#[test]
Expand All @@ -50,7 +50,7 @@ fn five_rows() {
vec![1, 3, 3, 1],
vec![1, 4, 6, 4, 1],
];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}

#[test]
Expand All @@ -65,23 +65,7 @@ fn six_rows() {
vec![1, 4, 6, 4, 1],
vec![1, 5, 10, 10, 5, 1],
];
assert_eq!(expected, pt.rows());
}

#[test]
#[ignore]
fn seven_rows() {
let pt = PascalsTriangle::new(7);
let expected: Vec<Vec<u32>> = vec![
vec![1],
vec![1, 1],
vec![1, 2, 1],
vec![1, 3, 3, 1],
vec![1, 4, 6, 4, 1],
vec![1, 5, 10, 10, 5, 1],
vec![1, 6, 15, 20, 15, 6, 1],
];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}

#[test]
Expand All @@ -100,5 +84,5 @@ fn ten_rows() {
vec![1, 8, 28, 56, 70, 56, 28, 8, 1],
vec![1, 9, 36, 84, 126, 126, 84, 36, 9, 1],
];
assert_eq!(expected, pt.rows());
assert_eq!(pt.rows(), expected);
}