From b22ab9a435dceb362cb9eab8ec195d908fd8d5e9 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Sat, 2 Mar 2019 11:22:17 +0100 Subject: Update matrix test, add square matrix trace and fix comments --- test/matrix_example.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/matrix_example.cpp b/test/matrix_example.cpp index 26aeede..469cbff 100644 --- a/test/matrix_example.cpp +++ b/test/matrix_example.cpp @@ -12,18 +12,43 @@ int main(int argc, char *argv[]) { std::cout << "a = \n" << a; std::cout << "b = \n" << b; std::cout << "c = \n" << c; + std::cout << std::endl; // access elements + std::cout << "Access elements" << std::endl; std::cout << "a.at(2,0) = " << a.at(2, 0) << std::endl; std::cout << "a[2][0] = " << a[2][0] << std::endl;; + std::cout << std::endl; // basic operations + std::cout << "Basic operations" << std::endl; 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(); + std::cout << "a.td() = \n" << a.td(); // or a.trasposed(); + std::cout << std::endl; + + // special matrices + mm::square_matrix, 2> f {{{2, 3}, {1, 4}}, {{6, 1}, {-3, 4}}}; + + std::cout << "Square matrix" << std::endl; + std::cout << "f = \n" << f; + + std::cout << "tr(f) = " << f.tr() /* or f.trace() */ << std::endl; + + f.t(); + std::cout << "after in place transpose f.t(), f = \n" << f; + std::cout << std::endl; + + + auto identity = mm::square_matrix::identity(); + + std::cout << "Identity matrix" << std::endl; + std::cout << "I = \n" << identity; + std::cout << std::endl; + return 0; } -- cgit v1.2.1