diff --git a/SoftwareDesign/Code/1-2/main.cpp b/SoftwareDesign/Code/1-2/main.cpp index 7139ad6..7ff7b23 100644 --- a/SoftwareDesign/Code/1-2/main.cpp +++ b/SoftwareDesign/Code/1-2/main.cpp @@ -2,8 +2,8 @@ * @Author: iR * @Date: 2022-03-12 14:46:07 * @LastEditors: iR - * @LastEditTime: 2022-03-12 17:13:51 - * @FilePath: \Code\1-2a\main.cpp + * @LastEditTime: 2022-03-15 07:17:38 + * @FilePath: \Code\1-2\main.cpp * @Description: * @custom_string_iR_Mail: Mail: i@iridium.cyou * @custom_string_iR_copyright: Copyright (c) ${now_year} by iR, All Rights Reserved. @@ -17,27 +17,27 @@ int main() double data[] = {1, 2, 3, 4, 5, 6}; Matrix a(3, 2, data); std::cout << "a" << std::endl - << a.at(0, 0) << " " << a.at(1, 0) << a.at(2, 0) << std::endl - << a.at(0, 1) << " " << a.at(1, 1) << a.at(2, 2) << std::endl; + << a.at(0, 0) << " " << a.at(1, 0) << " " << a.at(2, 0) << std::endl + << a.at(0, 1) << " " << a.at(1, 1) << " " << a.at(2, 1) << std::endl; std::cout << "+=" << std::endl; Matrix b(3, 2, data); std::cout << "b" << std::endl - << b.at(0, 0) << " " << b.at(1, 0) << b.at(2, 0) << std::endl - << b.at(0, 1) << " " << b.at(1, 1) << b.at(2, 2) << std::endl; + << b.at(0, 0) << " " << b.at(1, 0) << " " << b.at(2, 0) << std::endl + << b.at(0, 1) << " " << b.at(1, 1) << " " << b.at(2, 1) << std::endl; std::cout << "Answer" << std::endl; a += b; std::cout << "a" << std::endl - << a.at(0, 0) << " " << a.at(1, 0) << a.at(2, 0) << std::endl - << a.at(0, 1) << " " << a.at(1, 1) << a.at(2, 2) << std::endl; + << a.at(0, 0) << " " << a.at(1, 0) << " " << a.at(2, 0) << std::endl + << a.at(0, 1) << " " << a.at(1, 1) << " " << a.at(2, 1) << std::endl; std::cout << "c=a+b" << std::endl; Matrix c = a + b; std::cout << "Answer" << std::endl; std::cout << "c" << std::endl - << c.at(0, 0) << " " << c.at(1, 0) << a.at(2, 0) << std::endl - << c.at(0, 1) << " " << c.at(1, 1) << a.at(2, 0) << std::endl; + << c.at(0, 0) << " " << c.at(1, 0) << " " << c.at(2, 0) << std::endl + << c.at(0, 1) << " " << c.at(1, 1) << " " << c.at(2, 1) << std::endl; return 0; } \ No newline at end of file diff --git a/SoftwareDesign/Code/inc/matrix.hpp b/SoftwareDesign/Code/inc/matrix.hpp index 603469a..4243d8a 100644 --- a/SoftwareDesign/Code/inc/matrix.hpp +++ b/SoftwareDesign/Code/inc/matrix.hpp @@ -175,7 +175,7 @@ Matrix::Matrix(int w, int h, const T elements[]) _width = w; _height = h; - _mat = new Vector; + _mat = new Vector(w * h); for (int i = 0; i < size; i++) _mat->put(i, elements[i]); }