From a9828ad7c2b73527bcb4b28e49193e4523f21ad5 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Sat, 23 Feb 2019 16:42:19 +0100 Subject: Change storage for matrix to std::array, update matrix_example --- test/matrix_example.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/matrix_example.cpp b/test/matrix_example.cpp index 3fb7c78..4cf1863 100644 --- a/test/matrix_example.cpp +++ b/test/matrix_example.cpp @@ -5,9 +5,21 @@ int main(int argc, char *argv[]) { std::cout << "MxN dimensional (int) matrices" << std::endl; - mm::matrix m {{1, 2}, {3, 4}, {5, 6}}; + mm::matrix a {{1, 2}, {3, 4}, {5, 6}}; + mm::matrix b {{4, 3}, {9, 1}, {2, 5}}; + mm::matrix c {{1, 2, 3, 4}, {5, 6, 7, 8}}; - std::cout << m; + std::cout << "a = \n" << a; + std::cout << "b = \n" << b; + std::cout << "c = \n" << c; + + // basic operations + std::cout << "a + b = \n" << a + b; + std::cout << "a - b = \n" << a - b; + std::cout << "a * c = \n" << a * c; + std::cout << "a * 2 = \n" << a * 2; + std::cout << "2 * a = \n" << 2 * a; + std::cout << "tr(a) = \n" << a.trd(); return 0; } -- cgit v1.2.1