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

Add free-function swap.

Browse Source
This commit is contained in:
Antonio Sánchez 2024-10-14 15:51:40 +00:00 committed by Rasmus Munk Larsen
parent 820e8a45fb
commit b396a6fbb2
4 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,6 +642,18 @@ class DenseBase
EIGEN_DEVICE_FUNC explicit DenseBase(const DenseBase<OtherDerived>&); EIGEN_DEVICE_FUNC explicit DenseBase(const DenseBase<OtherDerived>&);
}; };
/** Free-function swap.
*/
template <typename DerivedA, typename DerivedB>
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE
// Use forwarding references to capture all combinations of cv-qualified l+r-value cases.
std::enable_if_t<std::is_base_of<DenseBase<std::decay_t<DerivedA>>, std::decay_t<DerivedA>>::value &&
std::is_base_of<DenseBase<std::decay_t<DerivedB>>, std::decay_t<DerivedB>>::value,
void>
swap(DerivedA&& a, DerivedB&& b) {
a.swap(b);
}
} // end namespace Eigen } // end namespace Eigen
#endif // EIGEN_DENSEBASE_H #endif // EIGEN_DENSEBASE_H

2
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -829,6 +829,8 @@ class SparseMatrix : public SparseCompressedBase<SparseMatrix<Scalar_, Options_,
std::swap(m_innerNonZeros, other.m_innerNonZeros); std::swap(m_innerNonZeros, other.m_innerNonZeros);
m_data.swap(other.m_data); m_data.swap(other.m_data);
} }
/** Free-function swap. */
friend EIGEN_DEVICE_FUNC void swap(SparseMatrix& a, SparseMatrix& b) { a.swap(b); }
/** Sets *this to the identity matrix. /** Sets *this to the identity matrix.
* This function also turns the matrix into compressed mode, and drop any reserved memory. */ * This function also turns the matrix into compressed mode, and drop any reserved memory. */

9
Eigen/src/SparseCore/SparseVector.h
View File

@ -278,6 +278,7 @@ class SparseVector : public SparseCompressedBase<SparseVector<Scalar_, Options_,
std::swap(m_size, other.m_size); std::swap(m_size, other.m_size);
m_data.swap(other.m_data); m_data.swap(other.m_data);
} }
friend EIGEN_DEVICE_FUNC void swap(SparseVector& a, SparseVector& b) { a.swap(b); }
template <int OtherOptions> template <int OtherOptions>
inline void swap(SparseMatrix<Scalar, OtherOptions, StorageIndex>& other) { inline void swap(SparseMatrix<Scalar, OtherOptions, StorageIndex>& other) {
@ -285,6 +286,14 @@ class SparseVector : public SparseCompressedBase<SparseVector<Scalar_, Options_,
std::swap(m_size, other.m_innerSize); std::swap(m_size, other.m_innerSize);
m_data.swap(other.m_data); m_data.swap(other.m_data);
} }
template <int OtherOptions>
friend EIGEN_DEVICE_FUNC void swap(SparseVector& a, SparseMatrix<Scalar, OtherOptions, StorageIndex>& b) {
a.swap(b);
}
template <int OtherOptions>
friend EIGEN_DEVICE_FUNC void swap(SparseMatrix<Scalar, OtherOptions, StorageIndex>& a, SparseVector& b) {
b.swap(a);
}
inline SparseVector& operator=(const SparseVector& other) { inline SparseVector& operator=(const SparseVector& other) {
if (other.isRValue()) { if (other.isRValue()) {

25
test/swap.cpp
View File

@ -63,6 +63,16 @@ void swap(const MatrixType& m) {
} }
m1 = m1_copy; m1 = m1_copy;
m2 = m2_copy; m2 = m2_copy;
d1 = m1.data(), d2 = m2.data();
swap(m1, m2);
VERIFY_IS_APPROX(m1, m2_copy);
VERIFY_IS_APPROX(m2, m1_copy);
if (MatrixType::SizeAtCompileTime == Dynamic) {
VERIFY(m1.data() == d2);
VERIFY(m2.data() == d1);
}
m1 = m1_copy;
m2 = m2_copy;
// test swapping 2 matrices of different types // test swapping 2 matrices of different types
m1.swap(m3); m1.swap(m3);
@ -70,6 +80,11 @@ void swap(const MatrixType& m) {
VERIFY_IS_APPROX(m3, m1_copy); VERIFY_IS_APPROX(m3, m1_copy);
m1 = m1_copy; m1 = m1_copy;
m3 = m3_copy; m3 = m3_copy;
swap(m1, m3);
VERIFY_IS_APPROX(m1, m3_copy);
VERIFY_IS_APPROX(m3, m1_copy);
m1 = m1_copy;
m3 = m3_copy;
// test swapping matrix with expression // test swapping matrix with expression
m1.swap(m2.block(0, 0, rows, cols)); m1.swap(m2.block(0, 0, rows, cols));
@ -77,6 +92,11 @@ void swap(const MatrixType& m) {
VERIFY_IS_APPROX(m2, m1_copy); VERIFY_IS_APPROX(m2, m1_copy);
m1 = m1_copy; m1 = m1_copy;
m2 = m2_copy; m2 = m2_copy;
swap(m1, m2.block(0, 0, rows, cols));
VERIFY_IS_APPROX(m1, m2_copy);
VERIFY_IS_APPROX(m2, m1_copy);
m1 = m1_copy;
m2 = m2_copy;
// test swapping two expressions of different types // test swapping two expressions of different types
m1.transpose().swap(m3.transpose()); m1.transpose().swap(m3.transpose());
@ -84,6 +104,11 @@ void swap(const MatrixType& m) {
VERIFY_IS_APPROX(m3, m1_copy); VERIFY_IS_APPROX(m3, m1_copy);
m1 = m1_copy; m1 = m1_copy;
m3 = m3_copy; m3 = m3_copy;
swap(m1.transpose(), m3.transpose());
VERIFY_IS_APPROX(m1, m3_copy);
VERIFY_IS_APPROX(m3, m1_copy);
m1 = m1_copy;
m3 = m3_copy;
check_row_swap(m1); check_row_swap(m1);
} }