fix(templates): add missing vector include and add tests

STommydx · Apr 5, 2024 · b3ace84 · b3ace84
1 parent c692850
commit b3ace84
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/matrix.hpp b/matrix.hpp
@@ -7,6 +7,7 @@
 #define MATRIX_HPP
 
 #include <valarray>
+#include <vector>
 
 template <class T> class matrix;
 
@@ -68,7 +69,7 @@ template <class T> class matrix {
 	matrix(const std::vector<std::vector<T>> &v)
 	    : n(v.size()), m(v.empty() ? 0 : v[0].size()), dat(n * m) {
 		for (size_t i = 0; i < n; ++i) {
-			std::ranges::copy(v[i], dat.begin() + i * m);
+			std::ranges::copy(v[i], begin(dat) + i * m);
 		}
 	}
 

diff --git a/matrix_test.cpp b/matrix_test.cpp
@@ -113,6 +113,23 @@ TEST_CASE("matrix construction and member functions", "[matrix]") {
 		a >>= 3;
 		REQUIRE(a(0, 0) == 3);
 	}
+	SECTION("std::vector conversion") {
+		std::vector<std::vector<int>> v = a;
+		REQUIRE(v[0][0] == 1);
+		REQUIRE(v[1][0] == 1);
+		REQUIRE(v[1][1] == 1);
+		REQUIRE(v[0][1] == 1);
+		matrix<int> m = v;
+		REQUIRE(m(0, 0) == 1);
+		REQUIRE(m(1, 0) == 1);
+		REQUIRE(m(1, 1) == 1);
+		REQUIRE(m(0, 1) == 1);
+		std::vector<std::vector<int>> result = matrix<int>(v) + m;
+		REQUIRE(result[0][0] == 2);
+		REQUIRE(result[1][0] == 2);
+		REQUIRE(result[1][1] == 2);
+		REQUIRE(result[0][1] == 2);
+	}
 }
 
 TEST_CASE("matrix arithmetic operator overload", "[matrix]") {