GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #1776: fix vector-wise STL iterator's operator-> using a proxy as pointer type.

Browse Source 
This changeset fixes also the value_type definition.
This commit is contained in:
Gael Guennebaud 2019-12-03 14:40:15 +01:00
parent 66f07efeae
commit 7745f69013
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Eigen/src/Core/StlIterators.h
View File

@ -241,17 +241,30 @@ protected:
typedef typename internal::conditional<Direction==Vertical,typename XprType::ColXpr,typename XprType::RowXpr>::type SubVectorType; typedef typename internal::conditional<Direction==Vertical,typename XprType::ColXpr,typename XprType::RowXpr>::type SubVectorType;
typedef typename internal::conditional<Direction==Vertical,typename XprType::ConstColXpr,typename XprType::ConstRowXpr>::type ConstSubVectorType; typedef typename internal::conditional<Direction==Vertical,typename XprType::ConstColXpr,typename XprType::ConstRowXpr>::type ConstSubVectorType;
public: public:
typedef typename internal::conditional<bool(is_lvalue), SubVectorType, ConstSubVectorType>::type value_type; typedef typename internal::conditional<bool(is_lvalue), SubVectorType, ConstSubVectorType>::type reference;
typedef value_type* pointer; typedef typename reference::PlainObject value_type;
typedef value_type reference;
private:
class subvector_stl_iterator_ptr
{
public:
subvector_stl_iterator_ptr(const reference &subvector) : m_subvector(subvector) {}
reference* operator->() { return &m_subvector; }
private:
reference m_subvector;
};
public:
typedef subvector_stl_iterator_ptr pointer;
subvector_stl_iterator() : Base() {} subvector_stl_iterator() : Base() {}
subvector_stl_iterator(XprType& xpr, Index index) : Base(xpr,index) {} subvector_stl_iterator(XprType& xpr, Index index) : Base(xpr,index) {}
reference operator*() const { return (*mp_xpr).template subVector<Direction>(m_index); } reference operator*() const { return (*mp_xpr).template subVector<Direction>(m_index); }
reference operator[](Index i) const { return (*mp_xpr).template subVector<Direction>(m_index+i); } reference operator[](Index i) const { return (*mp_xpr).template subVector<Direction>(m_index+i); }
pointer operator->() const { return &((*mp_xpr).template subVector<Direction>(m_index)); } pointer operator->() const { return (*mp_xpr).template subVector<Direction>(m_index); }
}; };
} // namespace internal } // namespace internal

26
test/stl_iterators.cpp
View File

@ -272,6 +272,31 @@ void test_stl_iterators(int rows=Rows, int cols=Cols)
} }
} }
} }
{
// check basic for loop on vector-wise iterators
j=0;
for (auto it = A.colwise().cbegin(); it != A.colwise().cend(); ++it, ++j) {
VERIFY_IS_APPROX( it->coeff(0), A(0,j) );
VERIFY_IS_APPROX( (*it).coeff(0), A(0,j) );
}
j=0;
for (auto it = A.colwise().begin(); it != A.colwise().end(); ++it, ++j) {
(*it).coeffRef(0) = (*it).coeff(0); // compilation check
it->coeffRef(0) = it->coeff(0); // compilation check
VERIFY_IS_APPROX( it->coeff(0), A(0,j) );
VERIFY_IS_APPROX( (*it).coeff(0), A(0,j) );
}
// check valuetype gives us a copy
j=0;
for (auto it = A.colwise().cbegin(); it != A.colwise().cend(); ++it, ++j) {
typename decltype(it)::value_type tmp = *it;
VERIFY_IS_NOT_EQUAL( tmp.data() , it->data() );
VERIFY_IS_APPROX( tmp, A.col(j) );
}
}
#endif #endif
if(rows>=3) { if(rows>=3) {
@ -411,6 +436,7 @@ void test_stl_iterators(int rows=Rows, int cols=Cols)
VectorType col = VectorType::Random(rows); VectorType col = VectorType::Random(rows);
A.colwise() = col; A.colwise() = col;
VERIFY( std::all_of(A.colwise().begin(), A.colwise().end(), [&col](typename ColMatrixType::ColXpr x) { return internal::isApprox(x.norm(),col.norm()); }) ); VERIFY( std::all_of(A.colwise().begin(), A.colwise().end(), [&col](typename ColMatrixType::ColXpr x) { return internal::isApprox(x.norm(),col.norm()); }) );
VERIFY( std::all_of(A.colwise().cbegin(), A.colwise().cend(), [&col](typename ColMatrixType::ConstColXpr x) { return internal::isApprox(x.norm(),col.norm()); }) );
i = internal::random<Index>(0,A.rows()-1); i = internal::random<Index>(0,A.rows()-1);
A.setRandom(); A.setRandom();