Skip to content

Commit 304d35f

Browse files
authored
docs: fix bad code in lasagna-master instructions (#839)
* docs: fix bad code in lasagna-master instructions * fix: align test and text * fix: correct examples to fit docs
1 parent fe16ecc commit 304d35f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

exercises/concept/lasagna-master/.docs/instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The result should be returned as an `amount` _struct_, which is already defined
3737
```cpp
3838
struct amount { int noodles; double sauce; };
3939
40-
needed = quantities({"sauce", "noodles", "sauce", "meat", "mozzarella", "noodles"});
40+
amount needed{quantities({"sauce", "noodles", "sauce", "meat", "mozzarella", "noodles"})};
4141
// needed.noodles => 100
4242
// needed.sauce => 0.4
4343
```
@@ -81,7 +81,7 @@ This means the `quantities` argument should not be modified in this function.
8181
8282
```cpp
8383
std::vector<double> quantities{1.2, 3.6, 10.5};
84-
scaledQuantities := scaleRecipe(quantities, 4);
84+
scaleRecipe(quantities, 4);
8585
// => { 2.4, 7.2, 21 }
8686
```
8787

exercises/concept/lasagna-master/.meta/exemplar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void addSecretIngredient(std::vector<std::string>& myList,
2828
myList.back() = secretIngredient;
2929
}
3030

31-
std::vector<double> scaledQuantities(const std::vector<double>& quantities,
31+
std::vector<double> scaleRecipe(const std::vector<double>& quantities,
3232
int portions) {
3333
std::vector<double> result(quantities);
3434
for (auto& quantity : result) {

exercises/concept/lasagna-master/.meta/exemplar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ int preparationTime(const std::vector<std::string>& layers, int prepTime = 2);
1111
amount quantities(const std::vector<std::string>& layers);
1212
void addSecretIngredient(std::vector<std::string>& myList, const std::vector<std::string>& friendsList);
1313
void addSecretIngredient(std::vector<std::string>& myList, const std::string& secretIngredient);
14-
std::vector<double> scaledQuantities(const std::vector<double>& quantities, int portions);
14+
std::vector<double> scaleRecipe(const std::vector<double>& quantities, int portions);
1515

1616
} // namespace lasagna_master

exercises/concept/lasagna-master/lasagna_master_test.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,35 +122,35 @@ TEST_CASE("Adds secret vector ingredient", "[task_3]") {
122122
REQUIRE(myList == expected);
123123
}
124124

125-
TEST_CASE("scaledQuantities: scales up correctly", "[task_4]") {
125+
TEST_CASE("scaleRecipe: scales up correctly", "[task_4]") {
126126
const std::vector<double> input{0.5, 250, 150, 3, 0.5};
127127
int portions{6};
128128
std::vector<double> expected{1.5, 750, 450, 9, 1.5};
129-
std::vector<double> scaled{scaledQuantities(input, portions)};
129+
std::vector<double> scaled{scaleRecipe(input, portions)};
130130
REQUIRE_VECTOR_APROX_EQUAL(expected, scaled, 0.0001)
131131
}
132132

133-
TEST_CASE("scaledQuantities: scales up correctly (2)", "[task_4]") {
133+
TEST_CASE("scaleRecipe: scales up correctly (2)", "[task_4]") {
134134
const std::vector<double> input{0.6, 300, 1, 0.5, 50, 0.1, 100};
135135
int portions{3};
136136
std::vector<double> expected{0.9, 450, 1.5, 0.75, 75, 0.15, 150};
137-
std::vector<double> scaled{scaledQuantities(input, portions)};
137+
std::vector<double> scaled{scaleRecipe(input, portions)};
138138
REQUIRE_VECTOR_APROX_EQUAL(expected, scaled, 0.0001)
139139
}
140140

141-
TEST_CASE("scaledQuantities: scales down correctly", "[task_4]") {
141+
TEST_CASE("scaleRecipe: scales down correctly", "[task_4]") {
142142
const std::vector<double> input{0.5, 250, 150, 3, 0.5};
143143
int portions{1};
144144
std::vector<double> expected{0.25, 125, 75, 1.5, 0.25};
145-
std::vector<double> scaled{scaledQuantities(input, portions)};
145+
std::vector<double> scaled{scaleRecipe(input, portions)};
146146
REQUIRE_VECTOR_APROX_EQUAL(expected, scaled, 0.0001)
147147
}
148148

149-
TEST_CASE("scaledQuantities: empty recipe", "[task_4]") {
149+
TEST_CASE("scaleRecipe: empty recipe", "[task_4]") {
150150
const std::vector<double> input{};
151151
int portions{100};
152152
std::vector<double> expected{};
153-
std::vector<double> scaled{scaledQuantities(input, portions)};
153+
std::vector<double> scaled{scaleRecipe(input, portions)};
154154
REQUIRE_VECTOR_APROX_EQUAL(expected, scaled, 0.0001)
155155
}
156156

0 commit comments

Comments
 (0)