diff --git a/.gitignore b/.gitignore index 9ed92a0..5fa30d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build GNUmakefile +.vscode/ \ No newline at end of file diff --git a/main.cpp b/main.cpp index d76cce7..d254db1 100644 --- a/main.cpp +++ b/main.cpp @@ -3,53 +3,86 @@ #include // 请修复这个函数的定义:10 分 -std::ostream &operator<<(std::ostream &os, std::vector const &a) { - os << "{"; - for (size_t i = 0; i < a.size(); i++) { - os << a[i]; - if (i != a.size() - 1) - os << ", "; - } - os << "}"; - return os; +template +std::ostream& operator<<(std::ostream& os, std::vector const& a) +{ + os << "{"; + for (size_t i = 0; i < a.size(); i++) + { + os << a[i]; + if (i != a.size() - 1) + os << ", "; + } + os << "}"; + return os; } // 请修复这个函数的定义:10 分 template -std::vector operator+(std::vector const &a, std::vector const &b) { - // 请实现列表的逐元素加法!10 分 - // 例如 {1, 2} + {3, 4} = {4, 6} +auto operator+(std::vector const& a, std::vector const& b) +{ + // 请实现列表的逐元素加法!10 分 + // 例如 {1, 2} + {3, 4} = {4, 6} + using T0 = decltype(std::declval() + std::declval()); + std::vector ans; + for (size_t i = 0; i < std::min(a.size(), b.size()); ++i) + { + ans.push_back(a[i] + b[i]); + } + return ans; } template -std::variant operator+(std::variant const &a, std::variant const &b) { - // 请实现自动匹配容器中具体类型的加法!10 分 +std::variant operator+(std::variant const& a, std::variant const& b) +{ + // 请实现自动匹配容器中具体类型的加法!10 分 + + return std::visit([&](auto const& a1, auto const& a2) + { + return std::variant{a1 + a2}; + }, a, b); + } -template -std::ostream &operator<<(std::ostream &os, std::variant const &a) { - // 请实现自动匹配容器中具体类型的打印!10 分 +template +std::ostream& operator<<(std::ostream& os, std::variant const& a) +{ + // 请实现自动匹配容器中具体类型的打印!10 分 + + std::visit([&](auto const& b) { + os << b; + }, a); + return os; +} + +template +auto operator+(std::variant const& a, T3 const& b) { + return std::visit([&](auto const& c) + { + return std::variant{b + c}; + }, a); } -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}; - std::cout << b << std::endl; - auto c = a + b; +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 }; + std::cout << b << std::endl; + auto c = a + b; - // 应该输出 1 - std::cout << std::is_same_v> << std::endl; + // 应该输出 1 + std::cout << std::is_same_v> << std::endl; - // 应该输出 {4.14, 6.718, 2.618} - std::cout << c << std::endl; + // 应该输出 {4.14, 6.718, 2.618} + std::cout << c << std::endl; - std::variant, std::vector> d = c; - std::variant, std::vector> e = a; - d = d + c + e; + std::variant, std::vector> d = c; + std::variant, std::vector> e = a; + d = d + c + e; - // 应该输出 {9.28, 17.436, 7.236} - std::cout << d << std::endl; + // 应该输出 {9.28, 17.436, 7.236} + std::cout << d << std::endl; - return 0; + return 0; }