diff --git a/main.cpp b/main.cpp index d76cce7..b6f53c9 100644 --- a/main.cpp +++ b/main.cpp @@ -3,9 +3,12 @@ #include // 请修复这个函数的定义:10 分 -std::ostream &operator<<(std::ostream &os, std::vector const &a) { +template +std::ostream &operator<<(std::ostream &os, std::vector const &a) +{ os << "{"; - for (size_t i = 0; i < a.size(); i++) { + for (size_t i = 0; i < a.size(); i++) + { os << a[i]; if (i != a.size() - 1) os << ", "; @@ -16,22 +19,44 @@ std::ostream &operator<<(std::ostream &os, std::vector const &a) { // 请修复这个函数的定义:10 分 template -std::vector operator+(std::vector const &a, std::vector const &b) { +decltype(auto) operator+(std::vector const &a, std::vector const &b) +{ // 请实现列表的逐元素加法!10 分 // 例如 {1, 2} + {3, 4} = {4, 6} + using T0 = decltype(a[0] + b[0]); + std::vector result; + for (size_t i = 0; i < std::min(a.size(), b.size()); i++) + { + result.push_back(a[i] + b[i]); + } + return result; } template -std::variant operator+(std::variant const &a, std::variant const &b) { +std::variant operator+(std::variant const &a, std::variant const &b) +{ // 请实现自动匹配容器中具体类型的加法!10 分 + return std::visit([&](auto const &x, auto const &y) -> std::variant + { return x + y; }, a, b); +} + +template +std::variant operator+(std::variant const &a, T3 const &b) +{ + return a + std::variant(b); } template -std::ostream &operator<<(std::ostream &os, std::variant const &a) { +std::ostream &operator<<(std::ostream &os, std::variant const &a) +{ // 请实现自动匹配容器中具体类型的打印!10 分 + std::visit([&](auto const &x) + { os << x; }, a); + return os; } -int main() { +int main() +{ std::vector a = {1, 4, 2, 8, 5, 7}; std::cout << a << std::endl; std::vector b = {3.14, 2.718, 0.618};