aboutsummaryrefslogtreecommitdiffstats
path: root/test/matrixtest.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-08-28 20:59:20 +0100
committerYann Herklotz <ymherklotz@gmail.com>2017-08-28 20:59:20 +0100
commit0b1004135890380d2594b4aff3bb2fb17d64b6c4 (patch)
tree2f75aa321be525f99801f698a9a66a6667f4cced /test/matrixtest.cpp
parent05685988739382343031b1fb2c94b74699f4ff7e (diff)
downloadYAGE-0b1004135890380d2594b4aff3bb2fb17d64b6c4.tar.gz
YAGE-0b1004135890380d2594b4aff3bb2fb17d64b6c4.zip
Adding more documentation and improving tests.
Diffstat (limited to 'test/matrixtest.cpp')
-rw-r--r--test/matrixtest.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/test/matrixtest.cpp b/test/matrixtest.cpp
index bbcbb440..c969f39f 100644
--- a/test/matrixtest.cpp
+++ b/test/matrixtest.cpp
@@ -16,15 +16,6 @@
#include "gtest/gtest.h"
template <int Size>
-int matrixAssign(int number, int i, int j)
-{
- yage::Matrix<Size, Size, int> m;
- m[j][i] = number;
-
- return m[j][i];
-}
-
-template <int Size>
int matrixAddition(int num1, int num2)
{
yage::Matrix<Size, Size, int> m1, m2;
@@ -56,8 +47,12 @@ bool matrixMultiplication()
TEST(Matrix, Assign)
{
- int rand_num = rand();
- ASSERT_EQ(rand_num, matrixAssign<10>(rand_num, 4, 2));
+ double rand_num = rand();
+ yage::Matrix<5, 5, double> mat1;
+ mat1[3][2] = rand_num;
+ ASSERT_EQ(rand_num, mat1[3][2]);
+ yage::Matrix<2, 2, double> mat2 {{rand_num, rand_num, rand_num, rand_num}};
+ ASSERT_EQ(rand_num, mat2[1][0]);
}
TEST(Matrix, Addition)