mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-27 07:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
fd5f48e465
eigen/test/reshape.cpp

220 lines
10 KiB
C++
Raw Normal View History

Add unit-test for reshape - add unittest for dynamic & fixed-size reshape - fix fixed-size reshape bugs bugs found while testing
2014-01-18 16:10:46 +08:00
// This file is part of Eigen, a lightweight C++ template library
// for linear algebra.
//
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
// Copyright (C) 2017 Gael Guennebaud <gael.guennebaud@inria.fr>
Add unit-test for reshape - add unittest for dynamic & fixed-size reshape - fix fixed-size reshape bugs bugs found while testing
2014-01-18 16:10:46 +08:00
// Copyright (C) 2014 yoco <peter.xiau@gmail.com>
//
// This Source Code Form is subject to the terms of the Mozilla
// Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "main.h"
Move Eigen::all,last,lastp1,lastN to Eigen::placeholders::. These names are so common, IMO they should not exist directly in the `Eigen::` namespace. This prevents us from using the `last` or `all` names for any parameters or local variables, otherwise spitting out warnings about shadowing or hiding the global values. Many external projects (and our own examples) also heavily use ``` using namespace Eigen; ``` which means these conflict with external libraries as well, e.g. `std::fill(first,last,value)`. It seems originally these were placed in a separate namespace `Eigen::placeholders`, which has since been deprecated. I propose to un-deprecate this, and restore the original locations. These symbols are also imported into `Eigen::indexing`, which additionally imports `fix` and `seq`. An alternative is to remove the `placeholders` namespace and stick with `indexing`. NOTE: this is an API-breaking change. Fixes #2321.
2021-09-16 05:10:29 +08:00
using Eigen::placeholders::last;
using Eigen::placeholders::all;
Add missing const version of mat(all).
2017-02-21 20:56:26 +08:00
template<typename T1,typename T2>
typename internal::enable_if<internal::is_same<T1,T2>::value,bool>::type
is_same_eq(const T1& a, const T2& b)
{
return (a.array() == b.array()).all();
}
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
template <int Order,typename MatType>
void check_auto_reshape4x4(MatType m)
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
{
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 1> v1( 1);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 2> v2( 2);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 4> v4( 4);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 8> v8( 8);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1:16> v16(16);
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
VERIFY(is_same_eq(m.template reshaped<Order>( 1, AutoSize), m.template reshaped<Order>( 1, 16)));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, 16 ), m.template reshaped<Order>( 1, 16)));
VERIFY(is_same_eq(m.template reshaped<Order>( 2, AutoSize), m.template reshaped<Order>( 2, 8)));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, 8 ), m.template reshaped<Order>( 2, 8)));
VERIFY(is_same_eq(m.template reshaped<Order>( 4, AutoSize), m.template reshaped<Order>( 4, 4)));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, 4 ), m.template reshaped<Order>( 4, 4)));
VERIFY(is_same_eq(m.template reshaped<Order>( 8, AutoSize), m.template reshaped<Order>( 8, 2)));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, 2 ), m.template reshaped<Order>( 8, 2)));
VERIFY(is_same_eq(m.template reshaped<Order>(16, AutoSize), m.template reshaped<Order>(16, 1)));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, 1 ), m.template reshaped<Order>(16, 1)));
VERIFY(is_same_eq(m.template reshaped<Order>(fix< 1>, AutoSize), m.template reshaped<Order>(fix< 1>, v16 )));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, fix<16> ), m.template reshaped<Order>( v1, fix<16>)));
VERIFY(is_same_eq(m.template reshaped<Order>(fix< 2>, AutoSize), m.template reshaped<Order>(fix< 2>, v8 )));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, fix< 8> ), m.template reshaped<Order>( v2, fix< 8>)));
VERIFY(is_same_eq(m.template reshaped<Order>(fix< 4>, AutoSize), m.template reshaped<Order>(fix< 4>, v4 )));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, fix< 4> ), m.template reshaped<Order>( v4, fix< 4>)));
VERIFY(is_same_eq(m.template reshaped<Order>(fix< 8>, AutoSize), m.template reshaped<Order>(fix< 8>, v2 )));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, fix< 2> ), m.template reshaped<Order>( v8, fix< 2>)));
VERIFY(is_same_eq(m.template reshaped<Order>(fix<16>, AutoSize), m.template reshaped<Order>(fix<16>, v1 )));
VERIFY(is_same_eq(m.template reshaped<Order>(AutoSize, fix< 1> ), m.template reshaped<Order>(v16, fix< 1>)));
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
}
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
template <typename MatType>
void check_direct_access_reshape4x4(MatType , internal::FixedInt<RowMajorBit>) {}
template <typename MatType>
void check_direct_access_reshape4x4(MatType m, internal::FixedInt<0>) {
VERIFY_IS_EQUAL(m.reshaped( 1, 16).data(), m.data());
VERIFY_IS_EQUAL(m.reshaped( 1, 16).innerStride(), 1);
VERIFY_IS_EQUAL(m.reshaped( 2, 8).data(), m.data());
VERIFY_IS_EQUAL(m.reshaped( 2, 8).innerStride(), 1);
VERIFY_IS_EQUAL(m.reshaped( 2, 8).outerStride(), 2);
}
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
// just test a 4x4 matrix, enumerate all combination manually
add reshape test for const and static-size matrix
2014-01-18 23:27:53 +08:00
template <typename MatType>
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
void reshape4x4(MatType m)
Cleanup intitial reshape implementation: - reshape -> reshaped - make it compatible with evaluators.
2017-01-29 21:57:45 +08:00
{
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
typedef typename MatType::Scalar Scalar;
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 1> v1( 1);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 2> v2( 2);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 4> v4( 4);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 8> v8( 8);
internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1:16> v16(16);
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
if((MatType::Flags&RowMajorBit)==0)
{
typedef Map<MatrixXi> MapMat;
// dynamic
VERIFY_IS_EQUAL((m.reshaped( 1, 16)), MapMat(m.data(), 1, 16));
VERIFY_IS_EQUAL((m.reshaped( 2, 8)), MapMat(m.data(), 2, 8));
VERIFY_IS_EQUAL((m.reshaped( 4, 4)), MapMat(m.data(), 4, 4));
VERIFY_IS_EQUAL((m.reshaped( 8, 2)), MapMat(m.data(), 8, 2));
VERIFY_IS_EQUAL((m.reshaped(16, 1)), MapMat(m.data(), 16, 1));
Improve reshape test case - simplify test code - add reshape chain
2014-02-04 02:50:23 +08:00
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
// static
VERIFY_IS_EQUAL(m.reshaped(fix< 1>, fix<16>), MapMat(m.data(), 1, 16));
VERIFY_IS_EQUAL(m.reshaped(fix< 2>, fix< 8>), MapMat(m.data(), 2, 8));
VERIFY_IS_EQUAL(m.reshaped(fix< 4>, fix< 4>), MapMat(m.data(), 4, 4));
VERIFY_IS_EQUAL(m.reshaped(fix< 8>, fix< 2>), MapMat(m.data(), 8, 2));
VERIFY_IS_EQUAL(m.reshaped(fix<16>, fix< 1>), MapMat(m.data(), 16, 1));
Improve reshape test case - simplify test code - add reshape chain
2014-02-04 02:50:23 +08:00
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
// reshape chain
VERIFY_IS_EQUAL(
(m
.reshaped( 1, 16)
.reshaped(fix< 2>,fix< 8>)
.reshaped(16, 1)
.reshaped(fix< 8>,fix< 2>)
.reshaped( 2, 8)
.reshaped(fix< 1>,fix<16>)
.reshaped( 4, 4)
.reshaped(fix<16>,fix< 1>)
.reshaped( 8, 2)
.reshaped(fix< 4>,fix< 4>)
),
MapMat(m.data(), 4, 4)
);
}
Fallback Reshaped to MapBase when possible (same storage order and linear access to the nested expression)
2017-02-11 22:32:53 +08:00
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
VERIFY(is_same_eq(m.reshaped( 1, AutoSize), m.reshaped( 1, 16)));
VERIFY(is_same_eq(m.reshaped(AutoSize, 16), m.reshaped( 1, 16)));
VERIFY(is_same_eq(m.reshaped( 2, AutoSize), m.reshaped( 2, 8)));
VERIFY(is_same_eq(m.reshaped(AutoSize, 8), m.reshaped( 2, 8)));
VERIFY(is_same_eq(m.reshaped( 4, AutoSize), m.reshaped( 4, 4)));
VERIFY(is_same_eq(m.reshaped(AutoSize, 4), m.reshaped( 4, 4)));
VERIFY(is_same_eq(m.reshaped( 8, AutoSize), m.reshaped( 8, 2)));
VERIFY(is_same_eq(m.reshaped(AutoSize, 2), m.reshaped( 8, 2)));
VERIFY(is_same_eq(m.reshaped(16, AutoSize), m.reshaped(16, 1)));
VERIFY(is_same_eq(m.reshaped(AutoSize, 1), m.reshaped(16, 1)));
VERIFY(is_same_eq(m.reshaped(fix< 1>, AutoSize), m.reshaped(fix< 1>, v16)));
VERIFY(is_same_eq(m.reshaped(AutoSize, fix<16>), m.reshaped( v1, fix<16>)));
VERIFY(is_same_eq(m.reshaped(fix< 2>, AutoSize), m.reshaped(fix< 2>, v8)));
VERIFY(is_same_eq(m.reshaped(AutoSize, fix< 8>), m.reshaped( v2, fix< 8>)));
VERIFY(is_same_eq(m.reshaped(fix< 4>, AutoSize), m.reshaped(fix< 4>, v4)));
VERIFY(is_same_eq(m.reshaped(AutoSize, fix< 4>), m.reshaped( v4, fix< 4>)));
VERIFY(is_same_eq(m.reshaped(fix< 8>, AutoSize), m.reshaped(fix< 8>, v2)));
VERIFY(is_same_eq(m.reshaped(AutoSize, fix< 2>), m.reshaped( v8, fix< 2>)));
VERIFY(is_same_eq(m.reshaped(fix<16>, AutoSize), m.reshaped(fix<16>, v1)));
VERIFY(is_same_eq(m.reshaped(AutoSize, fix< 1>), m.reshaped(v16, fix< 1>)));
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
check_auto_reshape4x4<ColMajor> (m);
check_auto_reshape4x4<RowMajor> (m);
check_auto_reshape4x4<AutoOrder>(m);
check_auto_reshape4x4<ColMajor> (m.transpose());
check_auto_reshape4x4<ColMajor> (m.transpose());
check_auto_reshape4x4<AutoOrder>(m.transpose());
Add support for automatic-size deduction in reshaped, e.g.: mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);
2017-02-21 22:57:25 +08:00
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
check_direct_access_reshape4x4(m,fix<MatType::Flags&RowMajorBit>);
Fallback Reshaped to MapBase when possible (same storage order and linear access to the nested expression)
2017-02-11 22:32:53 +08:00
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
if((MatType::Flags&RowMajorBit)==0)
{
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
VERIFY_IS_EQUAL(m.template reshaped<ColMajor>(2,8),m.reshaped(2,8));
VERIFY_IS_EQUAL(m.template reshaped<ColMajor>(2,8),m.template reshaped<AutoOrder>(2,8));
VERIFY_IS_EQUAL(m.transpose().template reshaped<RowMajor>(2,8),m.transpose().template reshaped<AutoOrder>(2,8));
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
}
else
{
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
VERIFY_IS_EQUAL(m.template reshaped<ColMajor>(2,8),m.reshaped(2,8));
VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(2,8),m.template reshaped<AutoOrder>(2,8));
VERIFY_IS_EQUAL(m.transpose().template reshaped<ColMajor>(2,8),m.transpose().template reshaped<AutoOrder>(2,8));
VERIFY_IS_EQUAL(m.transpose().reshaped(2,8),m.transpose().template reshaped<AutoOrder>(2,8));
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
}
Fallback Reshaped to MapBase when possible (same storage order and linear access to the nested expression)
2017-02-11 22:32:53 +08:00
Update reshaped API to use RowMajor/ColMajor directly as integral values instead of introducing RowOrder/ColOrder types. The API changed from A.respahed(rows,cols,RowOrder) to A.template reshaped<RowOrder>(rows,cols).
2018-09-19 17:49:26 +08:00
MatrixXi m28r1 = m.template reshaped<RowMajor>(2,8);
MatrixXi m28r2 = m.transpose().template reshaped<ColMajor>(8,2).transpose();
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
VERIFY_IS_EQUAL( m28r1, m28r2);
Add support for mat(all) as an alias to mat.reshaped(mat.size(),fix<1>);
2017-02-21 20:49:09 +08:00
Add reshaped<>() shortcuts when returning vectors and remove the reshaping version of operator()(all)
2018-09-21 22:50:04 +08:00
VERIFY(is_same_eq(m.reshaped(v16,fix<1>), m.reshaped()));
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
VERIFY_IS_EQUAL(m.reshaped(16,1).eval(), m.reshaped().eval());
VERIFY_IS_EQUAL(m.reshaped(1,16).eval(), m.reshaped().transpose().eval());
Add reshaped<>() shortcuts when returning vectors and remove the reshaping version of operator()(all)
2018-09-21 22:50:04 +08:00
VERIFY_IS_EQUAL(m.reshaped().reshaped(2,8), m.reshaped(2,8));
VERIFY_IS_EQUAL(m.reshaped().reshaped(4,4), m.reshaped(4,4));
VERIFY_IS_EQUAL(m.reshaped().reshaped(8,2), m.reshaped(8,2));
VERIFY_IS_EQUAL(m.reshaped(), m.template reshaped<ColMajor>());
Change the logic of A.reshaped<Order>() to be a simple alias to A.reshaped<Order>(AutoSize,fix<1>). This means that now AutoOrder is allowed, and it always return a column-vector.
2018-10-03 17:41:47 +08:00
VERIFY_IS_EQUAL(m.transpose().reshaped(), m.template reshaped<RowMajor>());
VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(AutoSize,fix<1>), m.template reshaped<RowMajor>());
VERIFY_IS_EQUAL(m.template reshaped<AutoOrder>(AutoSize,fix<1>), m.template reshaped<AutoOrder>());
Add reshaped<>() shortcuts when returning vectors and remove the reshaping version of operator()(all)
2018-09-21 22:50:04 +08:00
VERIFY(is_same_eq(m.reshaped(AutoSize,fix<1>), m.reshaped()));
VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(fix<1>,AutoSize), m.transpose().reshaped().transpose());
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
// check assignment
{
Matrix<Scalar,Dynamic,1> m1x(m.size()); m1x.setRandom();
VERIFY_IS_APPROX(m.reshaped() = m1x, m1x);
VERIFY_IS_APPROX(m, m1x.reshaped(4,4));
Matrix<Scalar,Dynamic,Dynamic> m28(2,8); m28.setRandom();
VERIFY_IS_APPROX(m.reshaped(2,8) = m28, m28);
VERIFY_IS_APPROX(m, m28.reshaped(4,4));
VERIFY_IS_APPROX(m.template reshaped<RowMajor>(2,8) = m28, m28);
Matrix<Scalar,Dynamic,Dynamic> m24(2,4); m24.setRandom();
VERIFY_IS_APPROX(m(seq(0,last,2),all).reshaped(2,4) = m24, m24);
// check constness:
m.reshaped(2,8).nestedExpression() = m;
}
Add unit-test for reshape - add unittest for dynamic & fixed-size reshape - fix fixed-size reshape bugs bugs found while testing
2014-01-18 16:10:46 +08:00
}
Add reshaped<>() shortcuts when returning vectors and remove the reshaping version of operator()(all)
2018-09-21 22:50:04 +08:00
EIGEN_DECLARE_TEST(reshape)
Add unit-test for reshape - add unittest for dynamic & fixed-size reshape - fix fixed-size reshape bugs bugs found while testing
2014-01-18 16:10:46 +08:00
{
Extend reshaped unit tests and remove useless const_cast
2019-01-18 00:35:32 +08:00
typedef Matrix<int,Dynamic,Dynamic,RowMajor> RowMatrixXi;
typedef Matrix<int,4,4,RowMajor> RowMatrix4i;
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
MatrixXi mx = MatrixXi::Random(4, 4);
Matrix4i m4 = Matrix4i::Random(4, 4);
RowMatrixXi rmx = RowMatrixXi::Random(4, 4);
RowMatrix4i rm4 = RowMatrix4i::Random(4, 4);
Remove reshape InnerPanel, add test, fix bug
2014-01-20 01:43:28 +08:00
add reshape test for const and static-size matrix
2014-01-18 23:27:53 +08:00
// test dynamic-size matrix
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
CALL_SUBTEST(reshape4x4(mx));
add reshape test for const and static-size matrix
2014-01-18 23:27:53 +08:00
// test static-size matrix
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
CALL_SUBTEST(reshape4x4(m4));
add reshape test for const and static-size matrix
2014-01-18 23:27:53 +08:00
// test dynamic-size const matrix
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
CALL_SUBTEST(reshape4x4(static_cast<const MatrixXi>(mx)));
add reshape test for const and static-size matrix
2014-01-18 23:27:53 +08:00
// test static-size const matrix
Add support for RowOrder reshaped
2017-02-20 18:46:21 +08:00
CALL_SUBTEST(reshape4x4(static_cast<const Matrix4i>(m4)));
CALL_SUBTEST(reshape4x4(rmx));
CALL_SUBTEST(reshape4x4(rm4));
Add unit-test for reshape - add unittest for dynamic & fixed-size reshape - fix fixed-size reshape bugs bugs found while testing
2014-01-18 16:10:46 +08:00
}
Reference in New Issue Copy Permalink