diff --git a/main.cpp b/main.cpp index d76cce7..17cd318 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,7 @@ #include // 请修复这个函数的定义:10 分 +template std::ostream &operator<<(std::ostream &os, std::vector const &a) { os << "{"; for (size_t i = 0; i < a.size(); i++) { @@ -16,19 +17,58 @@ std::ostream &operator<<(std::ostream &os, std::vector const &a) { // 请修复这个函数的定义:10 分 template -std::vector operator+(std::vector const &a, std::vector const &b) { +auto operator+(std::vector const &a, std::vector const &b) { // 请实现列表的逐元素加法!10 分 // 例如 {1, 2} + {3, 4} = {4, 6} + using T0 = decltype(T1()+T2()); + const size_t s = std::min(a.size(), b.size()); + std::vector v(s); + for(int i=0; i +std::variant +operator+(std::variant const &a, T2 const& b){ + std::variant v; + if(a.index()==0) + v = std::get<0>(a) + b; + else + v = std::get<1>(a) + b; + return v; +} + +template +std::variant +operator+(std::variant const &a, T1 const& b){ + std::variant v; + if(a.index()==0) + v = std::get<0>(a) + b; + else + v = std::get<1>(a) + b; + return v; } template std::variant operator+(std::variant const &a, std::variant const &b) { // 请实现自动匹配容器中具体类型的加法!10 分 + std::variant v; + if(b.index()==0) + v = a + std::get<0>(b); + else + v = a + std::get<1>(b); + return v; } -template -std::ostream &operator<<(std::ostream &os, std::variant const &a) { +template +std::ostream &operator<<(std::ostream &os, std::variant const &a) { // 请实现自动匹配容器中具体类型的打印!10 分 + std::visit([&](const auto& t){ + os << t; + }, a); + return os; } int main() {