aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/triangular.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/triangular.cpp')
-rw-r--r--test/triangular.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/test/triangular.cpp b/test/triangular.cpp
index c9df13274..111774b75 100644
--- a/test/triangular.cpp
+++ b/test/triangular.cpp
@@ -110,14 +110,24 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
// check M * inv(L) using in place API
m4 = m3;
+<<<<<<< local
+ m3.transpose().template triangularView<Eigen::UpperTriangular>().solveInPlace(trm4);
+ VERIFY(m4.cwiseAbs().isIdentity(test_precision<RealScalar>()));
+=======
m3.transpose().template triangularView<UpperTriangular>().solveInPlace(trm4);
VERIFY(m4.cwise().abs().isIdentity(test_precision<RealScalar>()));
+>>>>>>> other
// check M * inv(U) using in place API
m3 = m1.template triangularView<UpperTriangular>();
m4 = m3;
+<<<<<<< local
+ m3.transpose().template triangularView<Eigen::LowerTriangular>().solveInPlace(trm4);
+ VERIFY(m4.cwiseAbs().isIdentity(test_precision<RealScalar>()));
+=======
m3.transpose().template triangularView<LowerTriangular>().solveInPlace(trm4);
VERIFY(m4.cwise().abs().isIdentity(test_precision<RealScalar>()));
+>>>>>>> other
// check solve with unit diagonal
m3 = m1.template triangularView<UnitUpperTriangular>();