aboutsummaryrefslogtreecommitdiffstats
path: root/test/matrixtest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/matrixtest.cpp')
-rw-r--r--test/matrixtest.cpp84
1 files changed, 38 insertions, 46 deletions
diff --git a/test/matrixtest.cpp b/test/matrixtest.cpp
index ee568067..1b27b544 100644
--- a/test/matrixtest.cpp
+++ b/test/matrixtest.cpp
@@ -15,70 +15,62 @@
#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;
+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];
+ return m[j][i];
}
-template<int Size> int matrixAddition(int num1, int num2)
-{
- yage::Matrix<Size, Size, int> m1, m2;
- m1[1][1]=num1;
- m2[1][1]=num2;
+template <int Size>
+int matrixAddition(int num1, int num2) {
+ yage::Matrix<Size, Size, int> m1, m2;
+ m1[1][1] = num1;
+ m2[1][1] = num2;
- yage::Matrix<Size, Size, int> m3 = m1+m2;
+ yage::Matrix<Size, Size, int> m3 = m1 + m2;
- return m3[1][1];
+ return m3[1][1];
}
-int vectorDotProduct(const std::vector<int> &vec_contents_f, const std::vector<int> &vec_contents_s)
-{
- yage::Vector<3, int> v1(vec_contents_f);
- yage::Vector<3, int> v2(vec_contents_s);
+int vectorDotProduct(const std::vector<int>& vec_contents_f,
+ const std::vector<int>& vec_contents_s) {
+ yage::Vector<3, int> v1(vec_contents_f);
+ yage::Vector<3, int> v2(vec_contents_s);
- int x = yage::matrix::dot(v1, v2);
+ int x = yage::matrix::dot(v1, v2);
- return x;
+ return x;
}
-bool matrixMultiplication()
-{
- return false;
-}
+bool matrixMultiplication() { return false; }
// TESTS
-TEST(Matrix, Assign)
-{
- int rand_num = rand();
- ASSERT_EQ(rand_num, matrixAssign<10>(rand_num, 4, 2));
+TEST(Matrix, Assign) {
+ int rand_num = rand();
+ ASSERT_EQ(rand_num, matrixAssign<10>(rand_num, 4, 2));
}
-TEST(Matrix, Addition)
-{
- int rand_x = rand();
- int rand_y = rand();
- ASSERT_EQ(rand_x+rand_y, matrixAddition<10>(rand_x, rand_y));
+TEST(Matrix, Addition) {
+ int rand_x = rand();
+ int rand_y = rand();
+ ASSERT_EQ(rand_x + rand_y, matrixAddition<10>(rand_x, rand_y));
}
-TEST(Vector, DotProduct)
-{
- std::vector<int> contents_i = { rand()%100, rand()%100, rand()%100 };
- std::vector<int> contents_j = { rand()%100, rand()%100, rand()%100 };
- int sum = 0;
- for(std::size_t i = 0; i < contents_i.size(); ++i)
- {
- sum += contents_i[i]*contents_j[i];
- }
- ASSERT_EQ(sum, vectorDotProduct(contents_i, contents_j));
+TEST(Vector, DotProduct) {
+ std::vector<int> contents_i = {rand() % 100, rand() % 100, rand() % 100};
+ std::vector<int> contents_j = {rand() % 100, rand() % 100, rand() % 100};
+ int sum = 0;
+ for(std::size_t i = 0; i < contents_i.size(); ++i) {
+ sum += contents_i[i] * contents_j[i];
+ }
+ ASSERT_EQ(sum, vectorDotProduct(contents_i, contents_j));
}
-int main(int argc, char **argv)
-{
- srand(static_cast<unsigned>(time(nullptr)));
- testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
+int main(int argc, char** argv) {
+ srand(static_cast<unsigned>(time(nullptr)));
+ testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
}