Continuing the matrix class

1 files changed, 22 insertions, 7 deletions

diff --git a/test/matrix_test.cpp b/test/matrix_test.cpp
index e975794f..a6974c7f 100644
--- a/test/matrix_test.cpp
+++ b/test/matrix_test.cpp
@@ -4,14 +4,29 @@
 
 int main()
 {
-	yage::Matrix<4, 4> matrix;
+	yage::Matrix<4, 4, int> m1, m2;
 
-	double x=matrix[2][2];
-	matrix[2][2]=4;
+	yage::Vector<2, int> v1, v2;
 
-	std::cout<<"at: "<<x<<", "<<matrix[2][2]<<'\n';
+	yage::Vector2d v3;
 
-	if(matrix[2][2]==4 && x==0)
-		return 0;
-	return 1;
+	m1[0][1]=1;
+	m2[1][1]=2;
+
+	v1[0]=2;
+	v1[1]=3;
+	v2[0]=5;
+	v2[1]=2;
+
+	v2 += v1+v1;
+
+	v3.x() = 2;
+	v3.y() = 1;
+
+	yage::matrix::multiply(m1, m2);
+
+	std::cout<<m2<<'\n';
+	std::cout<<v3<<'\n';
+
+	return 0;
 }