trmm is now fully working and available via TriangularView::operator*

4 files changed, 76 insertions, 5 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 462032453..99224ff60 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -98,10 +98,6 @@ ei_add_test(redux)
 ei_add_test(product_small)
 ei_add_test(product_large ${EI_OFLAG})
 ei_add_test(product_extra ${EI_OFLAG})
-ei_add_test(product_selfadjoint ${EI_OFLAG})
-ei_add_test(product_symm ${EI_OFLAG})
-ei_add_test(product_syrk ${EI_OFLAG})
-ei_add_test(product_trsm ${EI_OFLAG})
 ei_add_test(diagonalmatrices)
 ei_add_test(adjoint)
 ei_add_test(submatrices)
@@ -113,7 +109,12 @@ ei_add_test(array)
 ei_add_test(array_replicate)
 ei_add_test(array_reverse)
 ei_add_test(triangular)
-ei_add_test(product_triangular)
+ei_add_test(product_selfadjoint ${EI_OFLAG})
+ei_add_test(product_symm ${EI_OFLAG})
+ei_add_test(product_syrk ${EI_OFLAG})
+ei_add_test(product_trmv ${EI_OFLAG})
+ei_add_test(product_trmm ${EI_OFLAG})
+ei_add_test(product_trsm ${EI_OFLAG})
 ei_add_test(bandmatrix)
 ei_add_test(cholesky " " "${GSL_LIBRARIES}")
 ei_add_test(lu ${EI_OFLAG})
diff --git a/test/product_trmm.cpp b/test/product_trmm.cpp
new file mode 100644
index 000000000..47ffb4af3
--- /dev/null
+++ b/test/product_trmm.cpp
@@ -0,0 +1,69 @@
+// This file is part of Eigen, a lightweight C++ template library
+// for linear algebra.
+//
+// Copyright (C) 2008-2009 Gael Guennebaud <gael.guennebaud@gmail.com>
+//
+// Eigen is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 3 of the License, or (at your option) any later version.
+//
+// Alternatively, you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License and a copy of the GNU General Public License along with
+// Eigen. If not, see <http://www.gnu.org/licenses/>.
+
+#include "main.h"
+
+template<typename Scalar> void trmm(int size,int othersize)
+{
+  typedef typename NumTraits<Scalar>::Real RealScalar;
+
+  Matrix<Scalar,Dynamic,Dynamic,ColMajor> tri(size,size), upTri(size,size), loTri(size,size);
+  Matrix<Scalar,Dynamic,Dynamic,ColMajor> ge1(size,othersize), ge2(10,size), ge3;
+  Matrix<Scalar,Dynamic,Dynamic,RowMajor> rge3;
+
+  Scalar s1 = ei_random<Scalar>(),
+         s2 = ei_random<Scalar>();
+
+  tri.setRandom();
+  loTri = tri.template triangularView<LowerTriangular>();
+  upTri = tri.template triangularView<UpperTriangular>();
+  ge1.setRandom();
+  ge2.setRandom();
+
+  VERIFY_IS_APPROX( ge3 = tri.template triangularView<LowerTriangular>() * ge1, loTri * ge1);
+  VERIFY_IS_APPROX(rge3 = tri.template triangularView<LowerTriangular>() * ge1, loTri * ge1);
+  VERIFY_IS_APPROX( ge3 = tri.template triangularView<UpperTriangular>() * ge1, upTri * ge1);
+  VERIFY_IS_APPROX(rge3 = tri.template triangularView<UpperTriangular>() * ge1, upTri * ge1);
+  VERIFY_IS_APPROX( ge3 = (s1*tri.adjoint()).template triangularView<UpperTriangular>() * (s2*ge1), s1*loTri.adjoint() * (s2*ge1));
+  VERIFY_IS_APPROX(rge3 = tri.adjoint().template triangularView<UpperTriangular>() * ge1, loTri.adjoint() * ge1);
+  VERIFY_IS_APPROX( ge3 = tri.adjoint().template triangularView<LowerTriangular>() * ge1, upTri.adjoint() * ge1);
+  VERIFY_IS_APPROX(rge3 = tri.adjoint().template triangularView<LowerTriangular>() * ge1, upTri.adjoint() * ge1);
+  VERIFY_IS_APPROX( ge3 = tri.template triangularView<LowerTriangular>() * ge2.adjoint(), loTri * ge2.adjoint());
+  VERIFY_IS_APPROX(rge3 = tri.template triangularView<LowerTriangular>() * ge2.adjoint(), loTri * ge2.adjoint());
+  VERIFY_IS_APPROX( ge3 = tri.template triangularView<UpperTriangular>() * ge2.adjoint(), upTri * ge2.adjoint());
+  VERIFY_IS_APPROX(rge3 = tri.template triangularView<UpperTriangular>() * ge2.adjoint(), upTri * ge2.adjoint());
+  VERIFY_IS_APPROX( ge3 = tri.adjoint().template triangularView<UpperTriangular>() * ge2.adjoint(), loTri.adjoint() * ge2.adjoint());
+  VERIFY_IS_APPROX(rge3 = tri.adjoint().template triangularView<UpperTriangular>() * ge2.adjoint(), loTri.adjoint() * ge2.adjoint());
+  VERIFY_IS_APPROX( ge3 = tri.adjoint().template triangularView<LowerTriangular>() * ge2.adjoint(), upTri.adjoint() * ge2.adjoint());
+  VERIFY_IS_APPROX(rge3 = tri.adjoint().template triangularView<LowerTriangular>() * ge2.adjoint(), upTri.adjoint() * ge2.adjoint());
+}
+
+void test_product_trmm()
+{
+  for(int i = 0; i < g_repeat ; i++)
+  {
+    trmm<float>(ei_random<int>(1,320),ei_random<int>(1,320));
+    trmm<std::complex<double> >(ei_random<int>(1,320),ei_random<int>(1,320));
+  }
+}
diff --git a/test/product_triangular.cpp b/test/product_trmv.cpp
index 876fb4388..876fb4388 100644
--- a/test/product_triangular.cpp
+++ b/test/product_trmv.cpp
diff --git a/test/product_trsm.cpp b/test/product_trsm.cpp
index 80df5861e..bda158048 100644
--- a/test/product_trsm.cpp
+++ b/test/product_trsm.cpp
@@ -85,6 +85,7 @@ template<typename Scalar> void trsm(int size,int cols)
   solve_ref(rmLhs.template triangularView<UpperTriangular>(),rmRef);
   VERIFY_IS_APPROX(rmRhs, rmRef);
 }
+
 void test_product_trsm()
 {
   for(int i = 0; i < g_repeat ; i++)