Move mini::Repeat into own file

Q-Minh · Q-Minh · commit 57516f148777 · 2024-11-01T11:43:18.000-04:00
diff --git a/source/pbat/math/linalg/mini/Api.h b/source/pbat/math/linalg/mini/Api.h
@@ -6,7 +6,7 @@
 #include "SubMatrix.h"
 #include "Transpose.h"
 
-#define PBAT_MINI_READ_API(SelfType)             \
+#define PBAT_MINI_READ_API(SelfType)        \
     PBAT_MINI_DIMENSIONS_API                \
     PBAT_MINI_CONST_SUBMATRIX_API(SelfType) \
     PBAT_MINI_CONST_TRANSPOSE_API(SelfType)
diff --git a/source/pbat/math/linalg/mini/BinaryOperations.cpp b/source/pbat/math/linalg/mini/BinaryOperations.cpp
@@ -1,7 +1,7 @@
 #include "BinaryOperations.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/CMakeLists.txt b/source/pbat/math/linalg/mini/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(PhysicsBasedAnimationToolkit_PhysicsBasedAnimationToolkit
     "Norm.h"
     "Product.h"
     "Reductions.h"
+    "Repeat.h"
     "Scale.h"
     "SubMatrix.h"
     "Transpose.h"
@@ -32,6 +33,7 @@ target_sources(PhysicsBasedAnimationToolkit_PhysicsBasedAnimationToolkit
     "Norm.cpp"
     "Product.cpp"
     "Reductions.cpp"
+    "Repeat.cpp"
     "Scale.cpp"
     "SubMatrix.cpp"
     "Transpose.cpp"
diff --git a/source/pbat/math/linalg/mini/Determinant.cpp b/source/pbat/math/linalg/mini/Determinant.cpp
@@ -1,7 +1,7 @@
 #include "Determinant.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <cmath>
 #include <doctest/doctest.h>
diff --git a/source/pbat/math/linalg/mini/Eigen.cpp b/source/pbat/math/linalg/mini/Eigen.cpp
@@ -1,7 +1,7 @@
 #include "Eigen.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Geometry.cpp b/source/pbat/math/linalg/mini/Geometry.cpp
@@ -1,7 +1,7 @@
 #include "Geometry.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Inverse.cpp b/source/pbat/math/linalg/mini/Inverse.cpp
@@ -1,8 +1,8 @@
 #include "Inverse.h"
 
+#include "Matrix.h"
+#include "Scale.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
-#include "pbat/math/linalg/mini/Scale.h"
 
 #include <Eigen/LU>
 #include <cmath>
diff --git a/source/pbat/math/linalg/mini/Matrix.h b/source/pbat/math/linalg/mini/Matrix.h
@@ -227,42 +227,6 @@ class SMatrixView
 template <class TScalar, int M>
 using SVectorView = SMatrixView<TScalar, M, 1>;
 
-template <CMatrix TMatrix, int RepeatRows, int RepeatCols>
-class TiledView
-{
-  public:
-    using NestedType = TMatrix;
-    using ScalarType = typename NestedType::ScalarType;
-    using SelfType   = TiledView<NestedType, RepeatRows, RepeatCols>;
-
-    static auto constexpr kRows     = RepeatRows * NestedType::kRows;
-    static auto constexpr kCols     = RepeatCols * NestedType::kCols;
-    static bool constexpr bRowMajor = NestedType::bRowMajor;
-
-    PBAT_HOST_DEVICE TiledView(NestedType const& A) : A(A) {}
-
-    PBAT_HOST_DEVICE ScalarType operator()(auto i, auto j) const
-    {
-        return A(i % NestedType::kRows, j % NestedType::kCols);
-    }
-
-    // Vector(ized) access
-    PBAT_HOST_DEVICE ScalarType operator()(auto i) const { return (*this)(i % kRows, i / kRows); }
-    PBAT_HOST_DEVICE ScalarType operator[](auto i) const { return (*this)(i); }
-
-    PBAT_MINI_READ_API(SelfType)
-
-  private:
-    NestedType const& A;
-};
-
-template <auto RepeatRows, auto RepeatCols, class /*CMatrix*/ TMatrix>
-PBAT_HOST_DEVICE auto Repeat(TMatrix&& A)
-{
-    using MatrixType = std::remove_cvref_t<TMatrix>;
-    return TiledView<MatrixType, RepeatRows, RepeatCols>(std::forward<TMatrix>(A));
-}
-
 template <class TScalar, int M>
 PBAT_HOST_DEVICE auto Unit(auto i)
 {
diff --git a/source/pbat/math/linalg/mini/Mini.h b/source/pbat/math/linalg/mini/Mini.h
@@ -12,6 +12,7 @@
 #include "Norm.h"
 #include "Product.h"
 #include "Reductions.h"
+#include "Repeat.h"
 #include "SubMatrix.h"
 #include "Transpose.h"
 #include "UnaryOperations.h"
diff --git a/source/pbat/math/linalg/mini/Norm.cpp b/source/pbat/math/linalg/mini/Norm.cpp
@@ -1,8 +1,8 @@
 #include "Norm.h"
 
+#include "Matrix.h"
+#include "Scale.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
-#include "pbat/math/linalg/mini/Scale.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Product.cpp b/source/pbat/math/linalg/mini/Product.cpp
@@ -1,7 +1,7 @@
 #include "Product.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Reductions.cpp b/source/pbat/math/linalg/mini/Reductions.cpp
@@ -1,7 +1,7 @@
 #include "Reductions.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Repeat.cpp b/source/pbat/math/linalg/mini/Repeat.cpp
@@ -0,0 +1,27 @@
+#include "Repeat.h"
+
+#include "BinaryOperations.h"
+#include "Matrix.h"
+#include "Norm.h"
+#include "pbat/Aliases.h"
+
+#include <doctest/doctest.h>
+
+TEST_CASE("[math][linalg][mini] Repeat")
+{
+    using namespace pbat::math::linalg::mini;
+    auto constexpr kRows = 3;
+    auto constexpr kCols = 3;
+    using ScalarType     = pbat::Scalar;
+    using MatrixType     = SMatrix<ScalarType, kRows, kCols>;
+    MatrixType A         = Ones<ScalarType, kRows, kCols>();
+    auto AR              = Repeat<2, 3>(A);
+    using RepeatType     = decltype(AR);
+    PBAT_MINI_CHECK_READABLE_CONCEPTS(RepeatType);
+
+    CHECK_EQ(AR.Rows(), A.Rows() * 2);
+    CHECK_EQ(AR.Cols(), A.Cols() * 3);
+    for (auto br =0; br < 2; ++br)
+        for (auto bc = 0; bc < 3; ++bc)
+            CHECK_LT(SquaredNorm(AR.Slice<kRows, kCols>(br*kRows, bc*kCols) - A), 1e-10);
+}
diff --git a/source/pbat/math/linalg/mini/Repeat.h b/source/pbat/math/linalg/mini/Repeat.h
@@ -0,0 +1,57 @@
+#ifndef PBAT_MATH_LINALG_MINI_REPEAT_H
+#define PBAT_MATH_LINALG_MINI_REPEAT_H
+
+#include "Api.h"
+#include "Concepts.h"
+#include "pbat/HostDevice.h"
+
+#include <type_traits>
+
+namespace pbat {
+namespace math {
+namespace linalg {
+namespace mini {
+
+
+template <CMatrix TMatrix, int RepeatRows, int RepeatCols>
+class TiledView
+{
+  public:
+    using NestedType = TMatrix;
+    using ScalarType = typename NestedType::ScalarType;
+    using SelfType   = TiledView<NestedType, RepeatRows, RepeatCols>;
+
+    static auto constexpr kRows     = RepeatRows * NestedType::kRows;
+    static auto constexpr kCols     = RepeatCols * NestedType::kCols;
+    static bool constexpr bRowMajor = NestedType::bRowMajor;
+
+    PBAT_HOST_DEVICE TiledView(NestedType const& A) : A(A) {}
+
+    PBAT_HOST_DEVICE ScalarType operator()(auto i, auto j) const
+    {
+        return A(i % NestedType::kRows, j % NestedType::kCols);
+    }
+
+    // Vector(ized) access
+    PBAT_HOST_DEVICE ScalarType operator()(auto i) const { return (*this)(i % kRows, i / kRows); }
+    PBAT_HOST_DEVICE ScalarType operator[](auto i) const { return (*this)(i); }
+
+    PBAT_MINI_READ_API(SelfType)
+
+  private:
+    NestedType const& A;
+};
+
+template <auto RepeatRows, auto RepeatCols, class /*CMatrix*/ TMatrix>
+PBAT_HOST_DEVICE auto Repeat(TMatrix&& A)
+{
+    using MatrixType = std::remove_cvref_t<TMatrix>;
+    return TiledView<MatrixType, RepeatRows, RepeatCols>(std::forward<TMatrix>(A));
+}
+
+} // namespace mini
+} // namespace linalg
+} // namespace math
+} // namespace pbat
+
+#endif // PBAT_MATH_LINALG_MINI_REPEAT_H
diff --git a/source/pbat/math/linalg/mini/Scale.cpp b/source/pbat/math/linalg/mini/Scale.cpp
@@ -1,7 +1,7 @@
 #include "Scale.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/SubMatrix.cpp b/source/pbat/math/linalg/mini/SubMatrix.cpp
@@ -1,7 +1,7 @@
 #include "SubMatrix.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/Transpose.cpp b/source/pbat/math/linalg/mini/Transpose.cpp
@@ -1,7 +1,7 @@
 #include "Transpose.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <doctest/doctest.h>
 
diff --git a/source/pbat/math/linalg/mini/UnaryOperations.cpp b/source/pbat/math/linalg/mini/UnaryOperations.cpp
@@ -1,7 +1,7 @@
 #include "UnaryOperations.h"
 
+#include "Matrix.h"
 #include "pbat/Aliases.h"
-#include "pbat/math/linalg/mini/Matrix.h"
 
 #include <cmath>
 #include <doctest/doctest.h>
