GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-17 22:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for plain-array as indices, e.g., mat({1,2,3,4})

Browse Source
This commit is contained in:
Gael Guennebaud 2017-01-06 21:53:32 +01:00
parent a875167d99
commit 3264d3c761
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Eigen/src/Core/ArithmeticSequence.h
View File

@ -159,6 +159,12 @@ span(FirstType first, SizeType size) {
namespace internal { namespace internal {
template<typename T>
Index size(const T& x) { return x.size(); }
template<typename T,std::size_t N>
Index size(const T (&x) [N]) { return N; }
template<typename T, int XprSize, typename EnableIf = void> struct get_compile_time_size { template<typename T, int XprSize, typename EnableIf = void> struct get_compile_time_size {
enum { value = Dynamic }; enum { value = Dynamic };
}; };

7
Eigen/src/Core/DenseBase.h
View File

@ -566,6 +566,13 @@ template<typename Derived> class DenseBase
derived(), internal::make_indexing(rowIndices,derived().rows()), internal::make_indexing(colIndices,derived().cols())); derived(), internal::make_indexing(rowIndices,derived().rows()), internal::make_indexing(colIndices,derived().cols()));
} }
template<typename RowIndicesT, std::size_t RowIndicesN, typename ColIndices>
IndexedView<const Derived,const RowIndicesT (&)[RowIndicesN],typename internal::MakeIndexing<ColIndices>::type>
operator()(const RowIndicesT (&rowIndices)[RowIndicesN], const ColIndices& colIndices) const {
return IndexedView<const Derived,const RowIndicesT (&) [RowIndicesN],typename internal::MakeIndexing<ColIndices>::type>(
derived(), rowIndices, internal::make_indexing(colIndices,derived().cols()));
}
#define EIGEN_CURRENT_STORAGE_BASE_CLASS Eigen::DenseBase #define EIGEN_CURRENT_STORAGE_BASE_CLASS Eigen::DenseBase
#define EIGEN_DOC_BLOCK_ADDONS_NOT_INNER_PANEL #define EIGEN_DOC_BLOCK_ADDONS_NOT_INNER_PANEL
#define EIGEN_DOC_BLOCK_ADDONS_INNER_PANEL_IF(COND) #define EIGEN_DOC_BLOCK_ADDONS_INNER_PANEL_IF(COND)

4
Eigen/src/Core/IndexedView.h
View File

@ -70,8 +70,8 @@ public:
IndexedView(XprType& xpr, const T0& rowIndices, const T1& colIndices) IndexedView(XprType& xpr, const T0& rowIndices, const T1& colIndices)
: m_xpr(xpr), m_rowIndices(rowIndices), m_colIndices(colIndices) : m_xpr(xpr), m_rowIndices(rowIndices), m_colIndices(colIndices)
{} {}
Index rows() const { return m_rowIndices.size(); } Index rows() const { return internal::size(m_rowIndices); }
Index cols() const { return m_colIndices.size(); } Index cols() const { return internal::size(m_colIndices); }
/** \returns the nested expression */ /** \returns the nested expression */
const typename internal::remove_all<XprType>::type& const typename internal::remove_all<XprType>::type&

8
test/indexed_view.cpp
View File

@ -93,6 +93,7 @@ void check_indexed_view()
"600 601 602 603 604 605 606 607 608 609\n" "600 601 602 603 604 605 606 607 608 609\n"
"500 501 502 503 504 505 506 507 508 509") "500 501 502 503 504 505 506 507 508 509")
); );
// takes the row numer 3, and repeat it 5 times // takes the row numer 3, and repeat it 5 times
VERIFY( MATCH( A(span(3,5,0), all), VERIFY( MATCH( A(span(3,5,0), all),
"300 301 302 303 304 305 306 307 308 309\n" "300 301 302 303 304 305 306 307 308 309\n"
@ -138,10 +139,17 @@ void check_indexed_view()
VERIFY_IS_EQUAL( (A(eii, eii)).InnerStrideAtCompileTime, 0); VERIFY_IS_EQUAL( (A(eii, eii)).InnerStrideAtCompileTime, 0);
VERIFY_IS_EQUAL( (A(eii, eii)).OuterStrideAtCompileTime, 0); VERIFY_IS_EQUAL( (A(eii, eii)).OuterStrideAtCompileTime, 0);
#if EIGEN_HAS_CXX11 #if EIGEN_HAS_CXX11
VERIFY( (A(all, std::array<int,4>{{1,3,2,4}})).ColsAtCompileTime == 4); VERIFY( (A(all, std::array<int,4>{{1,3,2,4}})).ColsAtCompileTime == 4);
VERIFY_IS_APPROX( (A(std::array<int,3>{{1,3,5}}, std::array<int,4>{{9,6,3,0}})), A(span(1,3,2), span(9,4,-3)) ); VERIFY_IS_APPROX( (A(std::array<int,3>{{1,3,5}}, std::array<int,4>{{9,6,3,0}})), A(span(1,3,2), span(9,4,-3)) );
#if (!EIGEN_COMP_CLANG) || (EIGEN_COMP_CLANG>=308 && !defined(__apple_build_version__))
VERIFY_IS_APPROX( A({3, 1, 6, 5}, all), A(std::array<int,4>{{3, 1, 6, 5}}, all) );
#endif
#endif #endif
} }