mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-06-04 18:54:00 +08:00
add an eigen2support test and a few fixes
This commit is contained in:
parent
7a9988ebb6
commit
22a6ab1f4b
@ -82,14 +82,10 @@ template<typename Derived> class ArrayBase
|
|||||||
using Base::size;
|
using Base::size;
|
||||||
using Base::coeff;
|
using Base::coeff;
|
||||||
using Base::coeffRef;
|
using Base::coeffRef;
|
||||||
// using Base::;
|
using Base::operator=;
|
||||||
// using Base::;
|
|
||||||
|
|
||||||
typedef typename Base::RealScalar RealScalar;
|
typedef typename Base::RealScalar RealScalar;
|
||||||
typedef typename Base::CoeffReturnType CoeffReturnType;
|
typedef typename Base::CoeffReturnType CoeffReturnType;
|
||||||
// typedef typename Base::ColXpr ColXpr;
|
|
||||||
// typedef typename Base::RowXpr RowXpr;
|
|
||||||
// typedef typename Base::;
|
|
||||||
#endif // not EIGEN_PARSED_BY_DOXYGEN
|
#endif // not EIGEN_PARSED_BY_DOXYGEN
|
||||||
|
|
||||||
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
||||||
@ -144,6 +140,8 @@ template<typename Derived> class ArrayBase
|
|||||||
// Derived& lazyAssign(const ArrayBase<OtherDerived>& other);
|
// Derived& lazyAssign(const ArrayBase<OtherDerived>& other);
|
||||||
#endif // not EIGEN_PARSED_BY_DOXYGEN
|
#endif // not EIGEN_PARSED_BY_DOXYGEN
|
||||||
|
|
||||||
|
Derived& operator+=(const Scalar& scalar)
|
||||||
|
{ return *this = derived() + scalar; }
|
||||||
|
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
Derived& operator+=(const ArrayBase<OtherDerived>& other);
|
Derived& operator+=(const ArrayBase<OtherDerived>& other);
|
||||||
|
@ -34,7 +34,9 @@ template<typename ExpressionType>
|
|||||||
class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> >
|
class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> >
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
EIGEN_GENERIC_PUBLIC_INTERFACE(ArrayWrapper)
|
typedef ArrayBase<ArrayWrapper> Base;
|
||||||
|
_EIGEN_DENSE_PUBLIC_INTERFACE(ArrayWrapper)
|
||||||
|
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(ArrayWrapper)
|
||||||
|
|
||||||
inline ArrayWrapper(const ExpressionType& matrix) : m_expression(matrix) {}
|
inline ArrayWrapper(const ExpressionType& matrix) : m_expression(matrix) {}
|
||||||
|
|
||||||
|
@ -160,6 +160,7 @@ ei_add_test(householder)
|
|||||||
ei_add_test(swap)
|
ei_add_test(swap)
|
||||||
ei_add_test(conservative_resize)
|
ei_add_test(conservative_resize)
|
||||||
ei_add_test(permutationmatrices)
|
ei_add_test(permutationmatrices)
|
||||||
|
ei_add_test(eigen2support)
|
||||||
|
|
||||||
ei_add_property(EIGEN_TESTING_SUMMARY "CXX: ${CMAKE_CXX_COMPILER}\n")
|
ei_add_property(EIGEN_TESTING_SUMMARY "CXX: ${CMAKE_CXX_COMPILER}\n")
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
68
test/eigen2support.cpp
Normal file
68
test/eigen2support.cpp
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
// This file is part of Eigen, a lightweight C++ template library
|
||||||
|
// for linear algebra.
|
||||||
|
//
|
||||||
|
// Copyright (C) 2009 Gael Guennebaud <g.gael@free.fr>
|
||||||
|
//
|
||||||
|
// 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/>.
|
||||||
|
|
||||||
|
#define EIGEN2_SUPPORT
|
||||||
|
|
||||||
|
#include "main.h"
|
||||||
|
|
||||||
|
template<typename MatrixType> void eigen2support(const MatrixType& m)
|
||||||
|
{
|
||||||
|
typedef typename MatrixType::Scalar Scalar;
|
||||||
|
|
||||||
|
int rows = m.rows();
|
||||||
|
int cols = m.cols();
|
||||||
|
|
||||||
|
MatrixType m1 = MatrixType::Random(rows, cols),
|
||||||
|
m2 = MatrixType::Random(rows, cols),
|
||||||
|
m3(rows, cols);
|
||||||
|
|
||||||
|
Scalar s1 = ei_random<Scalar>(),
|
||||||
|
s2 = ei_random<Scalar>();
|
||||||
|
|
||||||
|
// scalar addition
|
||||||
|
VERIFY_IS_APPROX(m1.cwise() + s1, s1 + m1.cwise());
|
||||||
|
VERIFY_IS_APPROX(m1.cwise() + s1, MatrixType::Constant(rows,cols,s1) + m1);
|
||||||
|
VERIFY_IS_APPROX((m1*Scalar(2)).cwise() - s2, (m1+m1) - MatrixType::Constant(rows,cols,s2) );
|
||||||
|
m3 = m1;
|
||||||
|
m3.cwise() += s2;
|
||||||
|
VERIFY_IS_APPROX(m3, m1.cwise() + s2);
|
||||||
|
m3 = m1;
|
||||||
|
m3.cwise() -= s1;
|
||||||
|
VERIFY_IS_APPROX(m3, m1.cwise() - s1);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void test_eigen2support()
|
||||||
|
{
|
||||||
|
for(int i = 0; i < g_repeat; i++) {
|
||||||
|
CALL_SUBTEST_1( eigen2support(Matrix<double,1,1>()) );
|
||||||
|
CALL_SUBTEST_2( eigen2support(MatrixXd(1,1)) );
|
||||||
|
CALL_SUBTEST_4( eigen2support(Matrix3f()) );
|
||||||
|
CALL_SUBTEST_5( eigen2support(Matrix4d()) );
|
||||||
|
CALL_SUBTEST_2( eigen2support(MatrixXf(200,200)) );
|
||||||
|
CALL_SUBTEST_6( eigen2support(MatrixXcd(100,100)) );
|
||||||
|
}
|
||||||
|
}
|
@ -40,8 +40,8 @@ template<typename Scalar> void trsm(int size,int cols)
|
|||||||
Matrix<Scalar,Dynamic,Dynamic,ColMajor> cmRhs(size,cols), ref(size,cols);
|
Matrix<Scalar,Dynamic,Dynamic,ColMajor> cmRhs(size,cols), ref(size,cols);
|
||||||
Matrix<Scalar,Dynamic,Dynamic,RowMajor> rmRhs(size,cols);
|
Matrix<Scalar,Dynamic,Dynamic,RowMajor> rmRhs(size,cols);
|
||||||
|
|
||||||
cmLhs.setRandom(); cmLhs *= static_cast<RealScalar>(0.1); cmLhs.diagonal().cwise() += static_cast<RealScalar>(1);
|
cmLhs.setRandom(); cmLhs *= static_cast<RealScalar>(0.1); cmLhs.diagonal().array() += static_cast<RealScalar>(1);
|
||||||
rmLhs.setRandom(); rmLhs *= static_cast<RealScalar>(0.1); rmLhs.diagonal().cwise() += static_cast<RealScalar>(1);
|
rmLhs.setRandom(); rmLhs *= static_cast<RealScalar>(0.1); rmLhs.diagonal().array() += static_cast<RealScalar>(1);
|
||||||
|
|
||||||
VERIFY_TRSM(cmLhs.conjugate().template triangularView<LowerTriangular>(), cmRhs);
|
VERIFY_TRSM(cmLhs.conjugate().template triangularView<LowerTriangular>(), cmRhs);
|
||||||
VERIFY_TRSM(cmLhs .template triangularView<UpperTriangular>(), cmRhs);
|
VERIFY_TRSM(cmLhs .template triangularView<UpperTriangular>(), cmRhs);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user