From 9ab061034720c1c0db4e8bff5dae4191ccd2a26f Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 2 Jun 2019 14:29:25 +0300
Subject: [PATCH] Add formatted output operators for vector and matrix classes

---
 source/linal/dynamicmatrix.h | 22 ++++++++++++++++++++++
 source/linal/dynamicvector.h | 15 +++++++++++++++
 source/linal/matrix.h        | 22 ++++++++++++++++++++++
 source/linal/vector.h        | 15 +++++++++++++++
 tests/boundingbox.cpp        | 10 ----------
 tests/matrix.cpp             |  4 ++--
 6 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/source/linal/dynamicmatrix.h b/source/linal/dynamicmatrix.h
index 1bbed27..6d45657 100644
--- a/source/linal/dynamicmatrix.h
+++ b/source/linal/dynamicmatrix.h
@@ -2,6 +2,7 @@
 #define MSP_LINAL_DYNAMICMATRIX_H_
 
 #include <algorithm>
+#include <ostream>
 #include "dynamicvector.h"
 #include "matrixops.h"
 
@@ -317,6 +318,27 @@ inline DynamicMatrix<T> invert(const DynamicMatrix<T> &m)
 	return r.invert();
 }
 
+template<typename T>
+inline std::ostream &operator<<(std::ostream &s, const DynamicMatrix<T> &m)
+{
+	s << "DynamicMatrix" << m.rows() << 'x' << m.columns() << '(';
+	for(unsigned i=0; i<m.columns(); ++i)
+	{
+		if(i)
+			s << ", ";
+		s << '[';
+		for(unsigned j=0; j<m.rows(); ++j)
+		{
+			if(j)
+				s << ", ";
+			s << m(j, i);
+		}
+		s << ']';
+	}
+	s << ')';
+	return s;
+}
+
 } // namespace LinAl
 } // namespace Msp
 
diff --git a/source/linal/dynamicvector.h b/source/linal/dynamicvector.h
index 8839c33..a5379d8 100644
--- a/source/linal/dynamicvector.h
+++ b/source/linal/dynamicvector.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <ostream>
 #include <stdexcept>
 
 namespace Msp {
@@ -243,6 +244,20 @@ inline DynamicVector<T> normalize(const DynamicVector<T> &v)
 	return r.normalize();
 }
 
+template<typename T>
+inline std::ostream &operator<<(std::ostream &s, const DynamicVector<T> &v)
+{
+	s << "DynamicVector" << v.size() << '(';
+	for(unsigned i=0; i<v.size(); ++i)
+	{
+		if(i)
+			s << ", ";
+		s << v[i];
+	}
+	s << ')';
+	return s;
+}
+
 } // namespace LinAL
 } // namespace Msp
 
diff --git a/source/linal/matrix.h b/source/linal/matrix.h
index daf9cb8..2711d40 100644
--- a/source/linal/matrix.h
+++ b/source/linal/matrix.h
@@ -2,6 +2,7 @@
 #define MSP_LINAL_MATRIX_H_
 
 #include <algorithm>
+#include <ostream>
 #include "vector.h"
 
 namespace Msp {
@@ -260,6 +261,27 @@ inline Matrix<T, N, M> transpose(const Matrix<T, M, N> &m)
 	return r;
 }
 
+template<typename T, unsigned M, unsigned N>
+inline std::ostream &operator<<(std::ostream &s, const Matrix<T, M, N> &m)
+{
+	s << "Matrix" << M << 'x' << N << '(';
+	for(unsigned i=0; i<N; ++i)
+	{
+		if(i)
+			s << ", ";
+		s << '[';
+		for(unsigned j=0; j<M; ++j)
+		{
+			if(j)
+				s << ", ";
+			s << m(j, i);
+		}
+		s << ']';
+	}
+	s << ')';
+	return s;
+}
+
 } // namespace LinAl
 } // namespace Msp
 
diff --git a/source/linal/vector.h b/source/linal/vector.h
index 9a9d028..c9b2a17 100644
--- a/source/linal/vector.h
+++ b/source/linal/vector.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <ostream>
 
 namespace Msp {
 namespace LinAl {
@@ -325,6 +326,20 @@ inline Vector<T, 3> cross(const Vector<T, 3> &v1, const Vector<T, 3> &v2)
 	return Vector<T, 3>(v1.y*v2.z-v1.z*v2.y, v1.z*v2.x-v1.x*v2.z, v1.x*v2.y-v1.y*v2.x);
 }
 
+template<typename T, unsigned N>
+inline std::ostream &operator<<(std::ostream &s, const Vector<T, N> &v)
+{
+	s << "Vector" << N << '(';
+	for(unsigned i=0; i<N; ++i)
+	{
+		if(i)
+			s << ", ";
+		s << v[i];
+	}
+	s << ')';
+	return s;
+}
+
 } // namespace LinAl
 } // namespace Msp
 
diff --git a/tests/boundingbox.cpp b/tests/boundingbox.cpp
index f0cae4d..d5e011b 100644
--- a/tests/boundingbox.cpp
+++ b/tests/boundingbox.cpp
@@ -23,16 +23,6 @@ private:
 	void special_cases();
 };
 
-namespace Msp {
-namespace LinAl {
-
-void operator<<(LexicalConverter &conv, const Vector<double, 3> &vec)
-{
-	conv.result(format("[%g %g %g]", vec.x, vec.y, vec.z));
-}
-
-} }
-
 BoundingBoxTests::BoundingBoxTests()
 {
 	add(&BoundingBoxTests::simple_union, "Union");
diff --git a/tests/matrix.cpp b/tests/matrix.cpp
index 10e3ffd..5b303db 100644
--- a/tests/matrix.cpp
+++ b/tests/matrix.cpp
@@ -35,8 +35,8 @@ void MatrixTests::multiply()
 
 	LinAl::Matrix<double, 3, 2> a(data);
 	LinAl::Matrix<double, 2, 3> b(data+6);
-	EXPECT(a*b == (LinAl::Matrix<double, 3, 3>(data+12)));
-	EXPECT(b*a == (LinAl::Matrix<double, 2, 2>(data+21)));
+	EXPECT_EQUAL(a*b, (LinAl::Matrix<double, 3, 3>(data+12)));
+	EXPECT_EQUAL(b*a, (LinAl::Matrix<double, 2, 2>(data+21)));
 }
 
 template<typename T, unsigned N>
-- 
2.43.0