feat: remove part 3 from making the grade (#937)

vaeng · web-flow · commit bf3e4e5616e3 · 2025-01-29T07:17:31.000+01:00
[no important files changed]
diff --git a/exercises/concept/making-the-grade/.docs/hints.md b/exercises/concept/making-the-grade/.docs/hints.md
@@ -22,24 +22,19 @@ Also being familiar with the following can help with completing the tasks:
 
 - A results counter does need to be set up and _incremented_ -- you'll want to `return` the count of non-passing students when the loop terminates.
 
-## 3. The "Best"
-
-- - Having an empty `vector` to add the "best" marks to is helpful here.
-- `<vector>.emplace_back()` can help add things to the results `vector`.
-
-## 4. Calculating Letter Grades
+## 3. Calculating Letter Grades
 
 - These are _lower thresholds_. The _lower threshold_ for a "D" is a score of **41**, since an "F" is **<= 40**.
 - `static_cast<int>` without parameters should round off increments nicely.
 - You are expected to return an array, not a vector.
 
-## 5. Matching Names to Scores
+## 4. Matching Names to Scores
 
 - If both containers are the same length and sorted the same way, could you use the `index` from one to retrieve a `value` from the other?
 - `std::to_string(int)` can be used to convert a number to string.
 - Don't forget the follow the format of the example's output.
 
-## 6. A "Perfect" Score
+## 5. A "Perfect" Score
 
 - There may be or may not be a student with a score of 100, and you can't return an empty string without checking **all** scores.
 - The `control flow` statements `continue` and `break` may be useful here to move past unwanted values.
diff --git a/exercises/concept/making-the-grade/.docs/instructions.md b/exercises/concept/making-the-grade/.docs/instructions.md
@@ -42,20 +42,7 @@ count_failed_students({90,40,55,70,30,25,80,95,38,40});
 // => 5
 ```
 
-## 3. The "Best"
-
-The teacher you're assisting wants to find the group of students who've performed "the best" on this exam.
-What qualifies as "the best" fluctuates, so you need to find the student scores that are **greater than or equal to** the current threshold.
-
-Create the function `above_threshold()` taking `student_scores` (a `vector` of grades), and `threshold` (an `int`, the "top score" threshold) as parameters.
-This function should return a `vector` of all scores that are `>=` to `threshold`.
-
-```cpp
-above_threshold({90,40,55,70,30,68,70,75,83,96}, 75);
-// => {90,75,83,96}
-```
-
-## 4. Calculating Letter Grades
+## 3. Calculating Letter Grades
 
 The teacher you're assisting likes to assign letter grades as well as numeric scores.
 Since students rarely score 100 on an exam, the "letter grade" lower thresholds are calculated based on the highest score achieved, and increment evenly between the high score and the failing threshold of **<= 40**.
@@ -96,7 +83,7 @@ The remaining score range, from 41 to the highest score, should be divided into
 - Divide this total range by 4 to get the size of each grade interval.
 - Add this interval size to 40 repeatedly to calculate the lower bounds for each letter grade.
 
-## 5. Matching Names to Scores
+## 4. Matching Names to Scores
 
 You have exam scores in descending order, and the respective student names (sorted in the order of their exam scores).
 You would like to match each student's name with their exam score and print out an overall class ranking.
@@ -114,7 +101,7 @@ student_ranking(student_scores, student_names)
 //  {"1. Joci: 100", "2. Sara: 99", "3. Kora: 90", "4. Jan: 84", "5. Indra: 66", "6. Bern: 53", "7. Fred: 47"}
 ```
 
-## 6. A "Perfect" Score
+## 5. A "Perfect" Score
 
 Although a "perfect" score of 100 is rare on an exam, it is interesting to know if at least one student has achieved it.
 
diff --git a/exercises/concept/making-the-grade/.meta/exemplar.cpp b/exercises/concept/making-the-grade/.meta/exemplar.cpp
@@ -5,60 +5,51 @@
 // Round down all provided student scores.
 std::vector<int> round_down_scores(std::vector<double> student_scores) {
     std::vector<int> rounded{};
-    for(int i{}; i < student_scores.size(); ++i)
+    for (int i{}; i < student_scores.size(); ++i)
         rounded.emplace_back(student_scores.at(i));
     return rounded;
 }
 
-
 // Count the number of failing students out of the group provided.
 int count_failed_students(std::vector<int> student_scores) {
     int counter{};
-    for(int i{}; i < student_scores.size(); ++i) {
-        if (student_scores.at(i) < 41)
-            ++counter;
+    for (int i{}; i < student_scores.size(); ++i) {
+        if (student_scores.at(i) < 41) ++counter;
     }
     return counter;
 }
 
-// Determine how many of the provided student scores were 'the best' based on the provided threshold.
-std::vector<int> above_threshold(std::vector<int> student_scores, int threshold) {
-    std::vector<int> above{};
-    for(int i{}; i < student_scores.size(); ++i) {
-        if (student_scores.at(i) >= threshold)
-            above.emplace_back(student_scores.at(i));
-        }
-       
-    return above;
-}
-
 // Create a list of grade thresholds based on the provided highest grade.
 std::array<int, 4> letter_grades(int highest_score) {
     std::array<int, 4> grades{};
-    for(int i{}, lower_threshold{41}, step_size{(highest_score - 40) / 4};
-        i < 4; ++i) {
+    for (int i{}, lower_threshold{41}, step_size{(highest_score - 40) / 4};
+         i < 4; ++i) {
         grades.at(i) = lower_threshold + step_size * i;
     }
     return grades;
 }
 
 // Organize the student's rank, name, and grade information in ascending order.
-std::vector<std::string> student_ranking(std::vector<int> student_scores, std::vector<std::string> student_names) {
+std::vector<std::string> student_ranking(
+    std::vector<int> student_scores, std::vector<std::string> student_names) {
     std::vector<std::string> ranking{};
-    for(int i{}; i < student_scores.size(); ++i) {
-        ranking.emplace_back(std::to_string(i + 1) + ". " + student_names.at(i) + ": " + std::to_string(student_scores.at(i)));
-        }
-       
+    for (int i{}; i < student_scores.size(); ++i) {
+        ranking.emplace_back(std::to_string(i + 1) + ". " +
+                             student_names.at(i) + ": " +
+                             std::to_string(student_scores.at(i)));
+    }
+
     return ranking;
 }
 
-// Create a string that contains the name of the first student to make a perfect score on the exam.
-std::string perfect_score(std::vector<int> student_scores, std::vector<std::string> student_names) {
+// Create a string that contains the name of the first student to make a perfect
+// score on the exam.
+std::string perfect_score(std::vector<int> student_scores,
+                          std::vector<std::string> student_names) {
     std::vector<std::string> ranking{};
-    for(int i{}; i < student_scores.size(); ++i) {
-        if (student_scores.at(i) == 100)
-            return student_names.at(i);
-        }
-       
+    for (int i{}; i < student_scores.size(); ++i) {
+        if (student_scores.at(i) == 100) return student_names.at(i);
+    }
+
     return "";
 }
diff --git a/exercises/concept/making-the-grade/making_the_grade.cpp b/exercises/concept/making-the-grade/making_the_grade.cpp
@@ -8,33 +8,29 @@ std::vector<int> round_down_scores(std::vector<double> student_scores) {
     return {};
 }
 
-
 // Count the number of failing students out of the group provided.
 int count_failed_students(std::vector<int> student_scores) {
     // TODO: Implement count_failed_students
     return 0;
 }
 
-// Determine how many of the provided student scores were 'the best' based on the provided threshold.
-std::vector<int> above_threshold(std::vector<int> student_scores, int threshold) {
-    // TODO: Implement above_threshold
-    return {};
-}
-
 // Create a list of grade thresholds based on the provided highest grade.
 std::array<int, 4> letter_grades(int highest_score) {
     // TODO: Implement letter_grades
     return {};
 }
 
 // Organize the student's rank, name, and grade information in ascending order.
-std::vector<std::string> student_ranking(std::vector<int> student_scores, std::vector<std::string> student_names) {
+std::vector<std::string> student_ranking(
+    std::vector<int> student_scores, std::vector<std::string> student_names) {
     // TODO: Implement student_ranking
     return {};
 }
 
-// Create a string that contains the name of the first student to make a perfect score on the exam.
-std::string perfect_score(std::vector<int> student_scores, std::vector<std::string> student_names) {
+// Create a string that contains the name of the first student to make a perfect
+// score on the exam.
+std::string perfect_score(std::vector<int> student_scores,
+                          std::vector<std::string> student_names) {
     // TODO: Implement perfect_score
     return "";
 }
diff --git a/exercises/concept/making-the-grade/making_the_grade_test.cpp b/exercises/concept/making-the-grade/making_the_grade_test.cpp
@@ -49,65 +49,29 @@ TEST_CASE("Count failed students (some failed)", "[task_2]") {
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("Test threshold (empty)", "[task_3]") {
-    vector<int> input{};
-    int threshold{98};
-    vector<int> expected{};
-    vector<int> actual = above_threshold(input, threshold);
-
-    REQUIRE(expected == actual);
-}
-
-TEST_CASE("Test threshold (some above threshold)", "[task_3]") {
-    vector<int> input{88, 29, 91, 64, 78, 43, 41, 77, 36, 50};
-    int threshold{80};
-    vector<int> expected{88, 91};
-    vector<int> actual = above_threshold(input, threshold);
-
-    REQUIRE(expected == actual);
-}
-
-TEST_CASE("Test threshold (none above threshold)", "[task_3]") {
-    vector<int> input{88, 29, 91, 64, 78, 43, 41, 77, 36, 50};
-    int threshold{99};
-    vector<int> expected{};
-    vector<int> actual = above_threshold(input, threshold);
-
-    REQUIRE(expected == actual);
-}
-
-TEST_CASE("Test threshold (some on threshold)", "[task_3]") {
-    vector<int> input{88, 29, 91, 64, 78, 43, 41, 77, 80, 80};
-    int threshold{80};
-    vector<int> expected{88, 91, 80, 80};
-    vector<int> actual = above_threshold(input, threshold);
-
-    REQUIRE(expected == actual);
-}
-
-TEST_CASE("Test letter grades: 100", "[task_4]") {
+TEST_CASE("Test letter grades: 100", "[task_3]") {
     int input{100};
     array<int, 4> expected{41, 56, 71, 86};
     array<int, 4> actual = letter_grades(input);
 
     REQUIRE(expected == actual);
 }
-TEST_CASE("Test letter grades: 97", "[task_4]") {
+TEST_CASE("Test letter grades: 97", "[task_3]") {
     int input{97};
     array<int, 4> expected{41, 55, 69, 83};
     array<int, 4> actual = letter_grades(input);
 
     REQUIRE(expected == actual);
 }
-TEST_CASE("Test letter grades: 81", "[task_4]") {
+TEST_CASE("Test letter grades: 81", "[task_3]") {
     int input{81};
     array<int, 4> expected{41, 51, 61, 71};
     array<int, 4> actual = letter_grades(input);
 
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("Rank one student", "[task_5]") {
+TEST_CASE("Rank one student", "[task_4]") {
     vector<int> grades{82};
     vector<string> names{"Betty"};
     vector<string> expected{"1. Betty: 82"};
@@ -116,37 +80,42 @@ TEST_CASE("Rank one student", "[task_5]") {
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("Rank several student", "[task_5]") {
+TEST_CASE("Rank several student", "[task_4]") {
     vector<int> grades{100, 98, 92, 86, 70, 68, 67, 60};
-    vector<string> names{"Rui", "Betty", "Joci", "Yoshi", "Kora", "Bern", "Jan", "Rose"};
-    vector<string> expected{"1. Rui: 100", "2. Betty: 98", "3. Joci: 92", "4. Yoshi: 86",
-                 "5. Kora: 70", "6. Bern: 68", "7. Jan: 67", "8. Rose: 60"};
+    vector<string> names{"Rui",  "Betty", "Joci", "Yoshi",
+                         "Kora", "Bern",  "Jan",  "Rose"};
+    vector<string> expected{"1. Rui: 100",  "2. Betty: 98", "3. Joci: 92",
+                            "4. Yoshi: 86", "5. Kora: 70",  "6. Bern: 68",
+                            "7. Jan: 67",   "8. Rose: 60"};
     vector<string> actual = student_ranking(grades, names);
 
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("No perfect score", "[task_6]") {
+TEST_CASE("No perfect score", "[task_5]") {
     vector<int> grades{11, 34, 92, 23, 70, 76, 67, 60};
-    vector<string> names{"Rui", "Betty", "Joci", "Yoshi", "Kora", "Bern", "Jan", "Rose"};
+    vector<string> names{"Rui",  "Betty", "Joci", "Yoshi",
+                         "Kora", "Bern",  "Jan",  "Rose"};
     string expected{""};
     string actual = perfect_score(grades, names);
 
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("One perfect score", "[task_6]") {
+TEST_CASE("One perfect score", "[task_5]") {
     vector<int> grades{11, 34, 92, 23, 70, 76, 67, 100};
-    vector<string> names{"Rui", "Betty", "Joci", "Yoshi", "Kora", "Bern", "Jan", "Rose"};
+    vector<string> names{"Rui",  "Betty", "Joci", "Yoshi",
+                         "Kora", "Bern",  "Jan",  "Rose"};
     string expected{"Rose"};
     string actual = perfect_score(grades, names);
 
     REQUIRE(expected == actual);
 }
 
-TEST_CASE("Several perfect scores", "[task_6]") {
+TEST_CASE("Several perfect scores", "[task_5]") {
     vector<int> grades{11, 100, 92, 23, 70, 100, 67, 100};
-    vector<string> names{"Rui", "Betty", "Joci", "Yoshi", "Kora", "Bern", "Jan", "Rose"};
+    vector<string> names{"Rui",  "Betty", "Joci", "Yoshi",
+                         "Kora", "Bern",  "Jan",  "Rose"};
     string expected{"Betty"};
     string actual = perfect_score(grades, names);
 
