From 1b7691993d6ff265a5ee1733d13598df97085fd7 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Thu, 20 Feb 2014 15:34:12 -0500 Subject: [PATCH] Add initial matrix tests --- Base/include/MatrixBase.h | 153 +++++++++++++------------------------- Base/test/CMakeLists.txt | 6 +- Base/test/TestMatrix.cpp | 134 +++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 105 deletions(-) create mode 100644 Base/test/TestMatrix.cpp diff --git a/Base/include/MatrixBase.h b/Base/include/MatrixBase.h index 3182b4b..195250f 100644 --- a/Base/include/MatrixBase.h +++ b/Base/include/MatrixBase.h @@ -30,99 +30,45 @@ namespace FasTC { template - class MatrixBase { - protected: - - // Vector representation - static const int kNumElements = nRows * nCols; - T mat[kNumElements]; - + class MatrixBase : public VectorBase { + private: + typedef VectorBase Base; public: - + static const int Size = Base::Size; + // Constructors MatrixBase() { } MatrixBase(const MatrixBase &other) { - for(int i = 0; i < kNumElements; i++) { - mat[i] = other[i]; + for(int i = 0; i < Size; i++) { + (*this)[i] = other[i]; } } // Accessors - T &operator()(int idx) { return mat[idx]; } - const T &operator()(int idx) const { return mat[idx]; } - T &operator()(int r, int c) { return mat[r * nCols + c]; } - const T &operator() const (int r, int c) { return mat[r * nCols + c]; } + T &operator()(int idx) { return Base::operator()(idx); } + T &operator[](int idx) { return Base::operator[](idx); } + const T &operator()(int idx) const { return Base::operator()(idx); } + const T &operator[](int idx) const { return Base::operator[](idx); } - T &operator[](int idx) { return mat[idx]; } - const T &operator[](int idx) const { return mat[idx]; } + T &operator()(int r, int c) { return (*this)[r * nCols + c]; } + const T &operator() (int r, int c) const { return (*this)[r * nCols + c]; } - // Operators - template - MatrixBase operator+(const MatrixBase<_T, nRows, nCols> &m) { - MatrixBase a; - for(int i = 0; i < kNumElements; i++) { - a[i] = mat[i] + m[i]; - } - return a; - } - - template - MatrixBase &operator+=(const MatrixBase<_T, nRows, nCols> &m) { - for(int i = 0; i < kNumElements; i++) { - mat[i] += m[i]; - } + // Allow casts to the respective array representation... + operator const T *() const { return this->vec; } + MatrixBase &operator=(const T *v) { + for(int i = 0; i < Size; i++) + (*this)[i] = v[i]; return *this; } + // Allows casting to other vector types if the underlying type system does as well... template - MatrixBase operator-(const MatrixBase<_T, nRows, nCols> &m) { - MatrixBase a; - for(int i = 0; i < kNumElements; i++) { - a[i] = mat[i] - m[i]; + operator MatrixBase<_T, nRows, nCols>() const { + MatrixBase<_T, nRows, nCols> ret; + for(int i = 0; i < Size; i++) { + ret[i] = static_cast<_T>(this->vec[i]); } - return a; - } - - template - MatrixBase &operator-=(const MatrixBase<_T, nRows, nCols> &m) { - for(int i = 0; i < kNumElements; i++) { - mat[i] -= m[i]; - } - return *this; - } - - template - MatrixBase operator*(_T s) { - MatrixBase a; - for(int i = 0; i < kNumElements; i++) { - a[i] = mat[i] * s; - } - return a; - } - - template - MatrixBase &operator*=(_T s) { - for(int i = 0; i < kNumElements; i++) { - mat[i] *= s; - } - return *this; - } - - template - MatrixBase operator/(_T s) { - MatrixBase a; - for(int i = 0; i < kNumElements; i++) { - a[i] = mat[i] / s; - } - return a; - } - - template - MatrixBase &operator/=(_T s) { - for(int i = 0; i < kNumElements; i++) { - mat[i] /= s; - } - return *this; + return ret; } // Matrix multiplication @@ -152,40 +98,41 @@ namespace FasTC { return result; } - // Outer product... - template - friend MatrixBase<_T, N, M> operator^( - const VectorBase<_T, N> &a, - const VectorBase<_U, M> &b - ) { - MatrixBase<_T, N, M> result; - - for(int i = 0; i < N; i++) - for(int j = 0; j < M; j++) - result(i, j) = a[i] * b[j]; - - return result; - } - - template - friend MatrixBase<_T, N, M> OuterProduct( - const VectorBase<_T, N> &a, - const VectorBase<_U, M> &b - ) { - return a ^ b; - } - // Double dot product template T DDot(const MatrixBase<_T, nRows, nCols> &m) { T result = 0; - for(int i = 0; i < kNumElements; i++) { - result += mat[i] * m[i]; + for(int i = 0; i < Size; i++) { + result += (*this)[i] * m[i]; } return result; } }; + + // Outer product... + template + MatrixBase<_T, N, M> operator^( + const VectorBase<_T, N> &a, + const VectorBase<_U, M> &b + ) { + MatrixBase<_T, N, M> result; + + for(int i = 0; i < N; i++) + for(int j = 0; j < M; j++) + result(i, j) = a[i] * b[j]; + + return result; + } + + template + MatrixBase<_T, N, M> OuterProduct( + const VectorBase<_T, N> &a, + const VectorBase<_U, M> &b + ) { + return a ^ b; + } + }; #endif // BASE_INCLUDE_MATRIXBASE_H_ diff --git a/Base/test/CMakeLists.txt b/Base/test/CMakeLists.txt index 8295630..25deb87 100644 --- a/Base/test/CMakeLists.txt +++ b/Base/test/CMakeLists.txt @@ -55,7 +55,7 @@ INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include ) INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/GTest/include) SET(TESTS - Vector Pixel Image Color + Vector Matrix Pixel Image Color ) FOREACH(TEST ${TESTS}) @@ -70,7 +70,9 @@ FOREACH(TEST ${TESTS}) ADD_EXECUTABLE(${TEST_NAME} ${TEST_MODULE}) # Vector tests need to use uninitialized variables - IF(${TEST_NAME} STREQUAL "Test_Base_Vector") + IF((${TEST_NAME} STREQUAL "Test_Base_Vector") + OR + (${TEST_NAME} STREQUAL "Test_Base_Matrix")) IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) SET_TARGET_PROPERTIES( ${TEST_NAME} diff --git a/Base/test/TestMatrix.cpp b/Base/test/TestMatrix.cpp new file mode 100644 index 0000000..7345931 --- /dev/null +++ b/Base/test/TestMatrix.cpp @@ -0,0 +1,134 @@ +/* FasTC + * Copyright (c) 2014 University of North Carolina at Chapel Hill. + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for educational, research, and non-profit purposes, without + * fee, and without a written agreement is hereby granted, provided that the + * above copyright notice, this paragraph, and the following four paragraphs + * appear in all copies. + * + * Permission to incorporate this software into commercial products may be + * obtained by contacting the authors or the Office of Technology Development + * at the University of North Carolina at Chapel Hill . + * + * This software program and documentation are copyrighted by the University of + * North Carolina at Chapel Hill. The software program and documentation are + * supplied "as is," without any accompanying services from the University of + * North Carolina at Chapel Hill or the authors. The University of North + * Carolina at Chapel Hill and the authors do not warrant that the operation of + * the program will be uninterrupted or error-free. The end-user understands + * that the program was developed for research purposes and is advised not to + * rely exclusively on the program for any reason. + * + * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE + * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, + * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF + * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA + * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY + * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY + * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON + * AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND + * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, + * ENHANCEMENTS, OR MODIFICATIONS. + * + * Please send all BUG REPORTS to . + * + * The authors may be contacted via: + * + * Pavel Krajcevski + * Dept of Computer Science + * 201 S Columbia St + * Frederick P. Brooks, Jr. Computer Science Bldg + * Chapel Hill, NC 27599-3175 + * USA + * + * + */ + +#include "gtest/gtest.h" +#include "MatrixBase.h" + +static const float kEpsilon = 1e-6; + +TEST(MatrixBase, Constructors) { + FasTC::MatrixBase m3f; + FasTC::MatrixBase m1d; + FasTC::MatrixBase m7i; + FasTC::MatrixBase m16u; + +#define TEST_VECTOR_COPY_CONS(mat, t, n, m) \ + do { \ + FasTC::MatrixBase d##mat (mat); \ + for(int i = 0; i < n*m; i++) { \ + EXPECT_EQ(d##mat [i], mat[i]); \ + } \ + } while(0) \ + + TEST_VECTOR_COPY_CONS(m3f, float, 3, 4); + TEST_VECTOR_COPY_CONS(m1d, double, 1, 1); + TEST_VECTOR_COPY_CONS(m7i, int, 7, 200); + TEST_VECTOR_COPY_CONS(m16u, unsigned, 16, 16); + +#undef TEST_VECTOR_COPY_CONS +} + +TEST(MatrixBase, Accessors) { + FasTC::MatrixBase v3f; + v3f[0] = 1.0f; + v3f[1] = -2.3f; + v3f[2] = 1000; + + for(int i = 0; i < 3; i++) { + EXPECT_EQ(v3f[i], v3f(i)); + } + + v3f(0) = -1.0f; + v3f(1) = 2.3f; + v3f(2) = -1000; + + for(int i = 0; i < 3; i++) { + EXPECT_EQ(v3f(i), v3f[i]); + } +} + +TEST(MatrixBase, PointerConversion) { + FasTC::MatrixBase v3f; + v3f(0,0) = 1.0f; + v3f(0,1) = -2.3f; + v3f(0,2) = 1000.0f; + v3f(1,0) = 1.0f; + v3f(1,1) = -2.3f; + v3f(1,2) = 1000.0f; + + float cmp[6] = { 1.0f, -2.3f, 1000.0f, 1.0f, -2.3f, 1000.0f }; + const float *v3fp = v3f; + int result = memcmp(cmp, v3fp, 6 * sizeof(float)); + EXPECT_EQ(result, 0); + + cmp[0] = -1.0f; + cmp[1] = 2.3f; + cmp[2] = 1000.0f; + cmp[3] = -1.0f; + cmp[4] = 2.3f; + cmp[5] = 1000.0f; + v3f = cmp; + for(int i = 0; i < 3; i++) { + EXPECT_EQ(v3f[i], cmp[i]); + } +} + +TEST(MatrixBase, CastVector) { + FasTC::MatrixBase v3f; + FasTC::MatrixBase v3d = v3f; + FasTC::MatrixBase v3i = v3f; + for(int i = 0; i < 3*2; i++) { + EXPECT_EQ(v3d(i), static_cast(v3f(i))); + EXPECT_EQ(v3i(i), static_cast(v3f(i))); + } +} +