feat: 重构 math 目录完成

Signed-off-by: Certseeds <51754303+Certseeds@users.noreply.github.com>

Author: Certseeds

algorithm/math/CMakeLists.txt

@@ -21,9 +21,9 @@ set(dependencies ${dependencies} ${leetcode_order})
 unset(leetcode_order)
 
 foreach (elementName IN LISTS dependencies)
-    add_executable(${PROJECT_NAME}_${elementName} ${CMAKE_CURRENT_SOURCE_DIR}/${elementName}.cpp)
+    add_executable(${PROJECT_NAME}_${elementName} ${CMAKE_CURRENT_SOURCE_DIR}/${elementName}_test.cpp)
     target_link_libraries(${PROJECT_NAME}_${elementName} CS203_DSAA_template_INCLUDE)
-    MESSAGE(STATUS "${PROJECT_NAME}_${elementName} from ${CMAKE_CURRENT_SOURCE_DIR}/${elementName}.cpp")
+    MESSAGE(STATUS "${PROJECT_NAME}_${elementName} from ${CMAKE_CURRENT_SOURCE_DIR}/${elementName}_test.cpp")
     add_test(${PROJECT_NAME}_${elementName}_CTEST ${PROJECT_NAME}_${elementName})
 endforeach ()
 unset(dependencies)

algorithm/math/leetcode_1018.cpp

@@ -5,18 +5,29 @@ CS203_DSAA_template
 Copyright (C) 2020-2023 nanoseeds
 
 */
-#include "leetcode_1018_test.hpp"
+#ifdef CS203_DSAA_TEST_MACRO
+
+#include <cstdint>
+#include <cstddef>
+#include <vector>
 
 namespace leetcode_1018 {
+using std::vector;
+#endif
 
-vector<bool> leetcode_1018::prefixesDivBy5(const vector<int32_t> &nums) {
-    const auto nums_size{nums.size()};
-    vector<bool> willreturn(nums_size);
-    for (size_t i{0}, num{0}; i < nums_size; ++i) {
-        num = (2 * num + nums[i]) % 5;
-        willreturn[i] = (num == 0);
+class Solution {
+public:
+    vector<bool> prefixesDivBy5(const vector<int32_t> &nums) {
+        const auto nums_size{nums.size()};
+        vector<bool> willreturn(nums_size);
+        for (size_t i{0}, num{0}; i < nums_size; ++i) {
+            num = (2 * num + nums[i]) % 5;
+            willreturn[i] = (num == 0);
+        }
+        return willreturn;
     }
-    return willreturn;
-}
+};
 
+#ifdef CS203_DSAA_TEST_MACRO
 }
+#endif

algorithm/math/leetcode_1018_test.hpp algorithm/math/leetcode_1018_test.cppalgorithm/math/leetcode_1018_test.hpp renamed to algorithm/math/leetcode_1018_test.cpp

@@ -12,37 +12,34 @@ Copyright (C) 2020-2023 nanoseeds
 #define CS203_DSAA_TEMPLATE_ALGORITHM_LIST_LEETCODE_1018_TEST_HPP
 
 #include <catch_main.hpp>
-#include <cstdint>
-#include <cstddef>
-#include <vector>
+#include "leetcode_1018.cpp"
 
 namespace leetcode_1018 {
-using std::vector;
-
-struct leetcode_1018 {
-    static vector<bool> prefixesDivBy5(const vector<int32_t> &nums);
-};
 
 using Catch::Matchers::Equals;
 
 TEST_CASE("1 [test_1018]", "[test_1018]") {
     const vector<int32_t> input{0, 1, 1};
     const vector<bool> result{true, false, false};
-    CHECK_THAT(result, Equals(leetcode_1018::prefixesDivBy5(input)));
+    Solution solution;
+    CHECK_THAT(result, Equals(solution.prefixesDivBy5(input)));
 }
 
 TEST_CASE("2 [test_1018]", "[test_1018]") {
     const vector<int32_t> input{0, 1, 1};
     const vector<bool> result{true, false, false};
-    CHECK_THAT(result, Equals(leetcode_1018::prefixesDivBy5(input)));
+    Solution solution;
+    CHECK_THAT(result, Equals(solution.prefixesDivBy5(input)));
 }
 
 TEST_CASE("3 [test_1018]", "[test_1018]") {
     const vector<int32_t> input{0, 1, 1};
     const vector<bool> result{true, false, false};
-    CHECK_THAT(result, Equals(leetcode_1018::prefixesDivBy5(input)));
+    Solution solution;
+    CHECK_THAT(result, Equals(solution.prefixesDivBy5(input)));
 }
 
 }
+
 #endif //CS203_DSAA_TEMPLATE_ALGORITHM_LIST_LEETCODE_1018_TEST_HPP
 

algorithm/math/leetcode_1185.cpp

@@ -5,10 +5,18 @@ CS203_DSAA_template
 Copyright (C) 2020-2023 nanoseeds
 
 */
-#include "leetcode_1185_test.hpp"
+#ifdef CS203_DSAA_TEST_MACRO
+
+#include <cstdint>
+#include <string>
+#include <array>
 #include <cassert>
 
 namespace leetcode_1185 {
+using std::string;
+
+inline constexpr const std::array<const char *const, 7> weekStrs
+        {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
 
 int32_t getYearDays(int32_t year) {
     assert(1971 <= year & year <= 2100);
@@ -30,29 +38,35 @@ int32_t getMonthDays(int32_t year, int32_t month) {
     // 7*31+5*30+28=187+180+28=365
     return monthDays[month];
 }
+#endif
 
-string leetcode_1185::dayOfTheWeek(int day, int month, int year) {
-    // 1993 08 15 是sunday周日
-    // 1993 08 01 是周日
-    // 1993 01 01 间隔 31+28+31+30+31+30+31= 212天 %7 == 2天,因此是周五
-    // 1971 01 01 间隔 22年,其中有1972,1976,1980,1984,1988,1992六个闰年,所以是22*365+6=7300+730+6=8036天 % 7 = 336 % 7 = 56 % 7 = 0,所以也是周五
-    const auto yearDays{[](const auto lastYear) {
-        int32_t will_return{0};
-        for (auto begin{1971}; begin < lastYear; ++begin) {
-            will_return += getYearDays(begin);
-        }
-        return will_return;
-    }(year)};
-    const auto monthDays{[](const auto lastMonth, const auto year) {
-        int32_t will_return{0};
-        for (auto begin{1}; begin < lastMonth; ++begin) {
-            will_return += getMonthDays(year, begin);
-        }
-        return will_return;
-    }(month, year)};
-    const auto daysDiff{day - 1};
-    const auto choice{(yearDays + monthDays + daysDiff + 5) % 7};
-    return weekStrs[choice];
-}
+class Solution {
+public:
+    string dayOfTheWeek(int day, int month, int year) {
+        // 1993 08 15 是sunday周日
+        // 1993 08 01 是周日
+        // 1993 01 01 间隔 31+28+31+30+31+30+31= 212天 %7 == 2天,因此是周五
+        // 1971 01 01 间隔 22年,其中有1972,1976,1980,1984,1988,1992六个闰年,所以是22*365+6=7300+730+6=8036天 % 7 = 336 % 7 = 56 % 7 = 0,所以也是周五
+        const auto yearDays{[](const auto lastYear) {
+            int32_t will_return{0};
+            for (auto begin{1971}; begin < lastYear; ++begin) {
+                will_return += getYearDays(begin);
+            }
+            return will_return;
+        }(year)};
+        const auto monthDays{[](const auto lastMonth, const auto year) {
+            int32_t will_return{0};
+            for (auto begin{1}; begin < lastMonth; ++begin) {
+                will_return += getMonthDays(year, begin);
+            }
+            return will_return;
+        }(month, year)};
+        const auto daysDiff{day - 1};
+        const auto choice{(yearDays + monthDays + daysDiff + 5) % 7};
+        return weekStrs[choice];
+    }
+};
 
+#ifdef CS203_DSAA_TEST_MACRO
 }
+#endif

algorithm/math/leetcode_1185_test.cpp

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+/*
+CS203_DSAA_template
+
+Copyright (C) 2022 nanoseeds
+
+*/
+//@Tag 常识
+//@Tag 暴力
+//@Tag 先验知识
+#ifndef CS203_DSAA_TEMPLATE_ALGORITHM_LIST_LEETCODE_1185_TEST_HPP
+#define CS203_DSAA_TEMPLATE_ALGORITHM_LIST_LEETCODE_1185_TEST_HPP
+
+#include <catch_main.hpp>
+#include "leetcode_1185.cpp"
+
+namespace leetcode_1185 {
+
+using Catch::Matchers::Equals;
+
+TEST_CASE("1-1 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[5] == solution.dayOfTheWeek(1, 1, 1971));
+}
+
+TEST_CASE("1-2 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[5] == solution.dayOfTheWeek(15, 1, 1971));
+}
+
+TEST_CASE("1-3 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[1] == solution.dayOfTheWeek(1, 2, 1971));
+}
+
+TEST_CASE("2-1 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[6] == solution.dayOfTheWeek(31, 8, 2019));
+}
+
+TEST_CASE("2-2 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[0] == solution.dayOfTheWeek(18, 7, 1999));
+}
+
+TEST_CASE("2-3 [test_1185]", "[test_1185]") {
+    Solution solution;
+    CHECK(weekStrs[0] == solution.dayOfTheWeek(15, 8, 1993));
+}
+
+}
+#endif //CS203_DSAA_TEMPLATE_ALGORITHM_LIST_LEETCODE_1185_TEST_HPP
+

algorithm/math/leetcode_1185_test.hpp

@@ -5,9 +5,15 @@ CS203_DSAA_template
 Copyright (C) 2020-2023 nanoseeds
 
 */
-#include "leetcode_118_119_test.hpp"
+#ifdef CS203_DSAA_TEST_MACRO
+
+#include <cstdint>
+#include <cstddef>
+#include <vector>
 
 namespace leetcode_118 {
+using std::vector;
+#endif
 
 inline vector<int32_t> generate_help(vector<int32_t> vec, size_t order) {
     vector<int32_t> will_return{vec.cbegin(), vec.cend()};
@@ -18,42 +24,54 @@ inline vector<int32_t> generate_help(vector<int32_t> vec, size_t order) {
     return will_return;
 }
 
-vector<vector<int32_t>> leetcode_118::generate(int32_t numRows) {
-    vector<vector<int32_t>> will_return{};
-    vector<int32_t> temp{};
-    for (int32_t i{0}; i < numRows; i++) {
-        temp = generate_help(temp, i);
-        will_return.emplace_back(temp);
+
+class Solution {
+public:
+    vector<vector<int32_t>> generate(int32_t numRows) {
+        vector<vector<int32_t>> will_return{};
+        vector<int32_t> temp{};
+        for (int32_t i{0}; i < numRows; i++) {
+            temp = generate_help(temp, i);
+            will_return.emplace_back(temp);
+        }
+        return will_return;
     }
-    return will_return;
-}
+};
 
+#ifdef CS203_DSAA_TEST_MACRO
 }
 
 namespace leetcode_119 {
+using std::vector;
+#endif
 
-
-vector<int32_t> leetcode_119::getRow(int32_t rowIndex) {
-    vector<int32_t> will_return(rowIndex + 1, 1);
-    for (int32_t i{1}; i <= rowIndex; i++) {
-        for (int j = i - 1; j > 0; j--) {
-            will_return[j] += will_return[j - 1];
+class Solution119 {
+public:
+    vector<int32_t> getRow(int32_t rowIndex) {
+        vector<int32_t> will_return(rowIndex + 1, 1);
+        for (int32_t i{1}; i <= rowIndex; i++) {
+            for (int j = i - 1; j > 0; j--) {
+                will_return[j] += will_return[j - 1];
+            }
         }
+        return will_return;
     }
-    return will_return;
-}
 
-/**
- * C^{N}_{M} = (m!) / ((n!) * (m-n)!)  <br>
- * C^{N+1}_{M} / C^{N}_{M} = (M-N)/(N+1) <br>
- * C^{N+1}_{M} = ((M-N)/(N+1)) * C^{N}_{M}
- * */
-vector<int32_t> leetcode_119::getRowN(int32_t rowIndex) {
-    vector<int32_t> will_return(rowIndex + 1, 1);
-    for (int32_t i{1}; i <= rowIndex; i++) {
-        const int64_t temp = static_cast<int64_t>(will_return[i - 1] ) * static_cast<int64_t>(rowIndex + 1 - i) / i;
-        will_return[i] = static_cast<int32_t>(temp);
+    /**
+     * C^{N}_{M} = (m!) / ((n!) * (m-n)!)  <br>
+     * C^{N+1}_{M} / C^{N}_{M} = (M-N)/(N+1) <br>
+     * C^{N+1}_{M} = ((M-N)/(N+1)) * C^{N}_{M}
+     * */
+    vector<int32_t> getRowN(int32_t rowIndex) {
+        vector<int32_t> will_return(rowIndex + 1, 1);
+        for (int32_t i{1}; i <= rowIndex; i++) {
+            const int64_t temp = static_cast<int64_t>(will_return[i - 1] ) * static_cast<int64_t>(rowIndex + 1 - i) / i;
+            will_return[i] = static_cast<int32_t>(temp);
+        }
+        return will_return;
     }
-    return will_return;
-}
+};
+
+#ifdef CS203_DSAA_TEST_MACRO
 }
+#endif