mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
merge
This commit is contained in:
@@ -15,6 +15,14 @@
|
||||
#ifdef EIGEN_TEST_PART_3
|
||||
// Make sure we also check c++98 max implementation
|
||||
#define EIGEN_MAX_CPP_VER 03
|
||||
|
||||
// We need to disable this warning when compiling with c++11 while limiting Eigen to c++98
|
||||
// Ideally we would rather configure the compiler to build in c++98 mode but this needs
|
||||
// to be done at the CMakeLists.txt level.
|
||||
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#include <valarray>
|
||||
|
||||
@@ -255,8 +255,8 @@ void test_ref_overloads()
|
||||
|
||||
void test_ref_fixed_size_assert()
|
||||
{
|
||||
Vector4f v4;
|
||||
VectorXf vx(10);
|
||||
Vector4f v4 = Vector4f::Random();
|
||||
VectorXf vx = VectorXf::Random(10);
|
||||
VERIFY_RAISES_STATIC_ASSERT( Ref<Vector3f> y = v4; (void)y; );
|
||||
VERIFY_RAISES_STATIC_ASSERT( Ref<Vector3f> y = vx.head<4>(); (void)y; );
|
||||
VERIFY_RAISES_STATIC_ASSERT( Ref<const Vector3f> y = v4; (void)y; );
|
||||
|
||||
@@ -18,7 +18,7 @@ void check_stddeque_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::deque<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::deque<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -33,7 +33,7 @@ void check_stddeque_matrix(const MatrixType& m)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,MatrixType::Zero(rows,cols));
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
@@ -46,8 +46,8 @@ template<typename TransformType>
|
||||
void check_stddeque_transform(const TransformType&)
|
||||
{
|
||||
typedef typename TransformType::MatrixType MatrixType;
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random());
|
||||
std::deque<TransformType,Eigen::aligned_allocator<TransformType> > v(10), w(20, y);
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random()), ti=TransformType::Identity();
|
||||
std::deque<TransformType,Eigen::aligned_allocator<TransformType> > v(10,ti), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -62,7 +62,7 @@ void check_stddeque_transform(const TransformType&)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,ti);
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
@@ -75,8 +75,8 @@ template<typename QuaternionType>
|
||||
void check_stddeque_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::deque<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::deque<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10,qi), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -91,7 +91,7 @@ void check_stddeque_quaternion(const QuaternionType&)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,qi);
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
|
||||
@@ -31,7 +31,7 @@ void check_stddeque_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::deque<MatrixType> v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::deque<MatrixType> v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -64,8 +64,8 @@ template<typename TransformType>
|
||||
void check_stddeque_transform(const TransformType&)
|
||||
{
|
||||
typedef typename TransformType::MatrixType MatrixType;
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random());
|
||||
std::deque<TransformType> v(10), w(20, y);
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random()), ti=TransformType::Identity();
|
||||
std::deque<TransformType> v(10,ti), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -75,7 +75,7 @@ void check_stddeque_transform(const TransformType&)
|
||||
VERIFY_IS_APPROX(w[i], v[i]);
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,ti);
|
||||
v[20] = x;
|
||||
VERIFY_IS_APPROX(v[20], x);
|
||||
v.resize(22,y);
|
||||
@@ -98,8 +98,8 @@ template<typename QuaternionType>
|
||||
void check_stddeque_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::deque<QuaternionType> v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::deque<QuaternionType> v(10,qi), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -109,7 +109,7 @@ void check_stddeque_quaternion(const QuaternionType&)
|
||||
VERIFY_IS_APPROX(w[i], v[i]);
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,qi);
|
||||
v[20] = x;
|
||||
VERIFY_IS_APPROX(v[20], x);
|
||||
v.resize(22,y);
|
||||
|
||||
@@ -18,7 +18,7 @@ void check_stdlist_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::list<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::list<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -33,7 +33,7 @@ void check_stdlist_matrix(const MatrixType& m)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21, MatrixType::Zero(rows,cols));
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
@@ -46,8 +46,8 @@ template<typename TransformType>
|
||||
void check_stdlist_transform(const TransformType&)
|
||||
{
|
||||
typedef typename TransformType::MatrixType MatrixType;
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random());
|
||||
std::list<TransformType,Eigen::aligned_allocator<TransformType> > v(10), w(20, y);
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random()), ti=TransformType::Identity();
|
||||
std::list<TransformType,Eigen::aligned_allocator<TransformType> > v(10,ti), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -62,7 +62,7 @@ void check_stdlist_transform(const TransformType&)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21, ti);
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
@@ -75,8 +75,8 @@ template<typename QuaternionType>
|
||||
void check_stdlist_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::list<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::list<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10,qi), w(20, y);
|
||||
v.front() = x;
|
||||
w.front() = w.back();
|
||||
VERIFY_IS_APPROX(w.front(), w.back());
|
||||
@@ -91,7 +91,7 @@ void check_stdlist_quaternion(const QuaternionType&)
|
||||
++wi;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,qi);
|
||||
v.back() = x;
|
||||
VERIFY_IS_APPROX(v.back(), x);
|
||||
v.resize(22,y);
|
||||
|
||||
@@ -47,7 +47,7 @@ void check_stdlist_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::list<MatrixType> v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::list<MatrixType> v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
typename std::list<MatrixType>::iterator itv = get(v, 5);
|
||||
typename std::list<MatrixType>::iterator itw = get(w, 6);
|
||||
*itv = x;
|
||||
@@ -86,8 +86,8 @@ template<typename TransformType>
|
||||
void check_stdlist_transform(const TransformType&)
|
||||
{
|
||||
typedef typename TransformType::MatrixType MatrixType;
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random());
|
||||
std::list<TransformType> v(10), w(20, y);
|
||||
TransformType x(MatrixType::Random()), y(MatrixType::Random()), ti=TransformType::Identity();
|
||||
std::list<TransformType> v(10,ti), w(20, y);
|
||||
typename std::list<TransformType>::iterator itv = get(v, 5);
|
||||
typename std::list<TransformType>::iterator itw = get(w, 6);
|
||||
*itv = x;
|
||||
@@ -103,7 +103,7 @@ void check_stdlist_transform(const TransformType&)
|
||||
++itw;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21, ti);
|
||||
set(v, 20, x);
|
||||
VERIFY_IS_APPROX(*get(v, 20), x);
|
||||
v.resize(22,y);
|
||||
@@ -126,8 +126,8 @@ template<typename QuaternionType>
|
||||
void check_stdlist_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::list<QuaternionType> v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::list<QuaternionType> v(10,qi), w(20, y);
|
||||
typename std::list<QuaternionType>::iterator itv = get(v, 5);
|
||||
typename std::list<QuaternionType>::iterator itw = get(w, 6);
|
||||
*itv = x;
|
||||
@@ -143,7 +143,7 @@ void check_stdlist_quaternion(const QuaternionType&)
|
||||
++itw;
|
||||
}
|
||||
|
||||
v.resize(21);
|
||||
v.resize(21,qi);
|
||||
set(v, 20, x);
|
||||
VERIFY_IS_APPROX(*get(v, 20), x);
|
||||
v.resize(22,y);
|
||||
|
||||
@@ -17,7 +17,7 @@ void check_stdvector_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::vector<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::vector<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -86,8 +86,8 @@ template<typename QuaternionType>
|
||||
void check_stdvector_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::vector<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::vector<QuaternionType,Eigen::aligned_allocator<QuaternionType> > v(10,qi), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -117,6 +117,16 @@ void check_stdvector_quaternion(const QuaternionType&)
|
||||
}
|
||||
}
|
||||
|
||||
// the code below triggered an invalid warning with gcc >= 7
|
||||
// eigen/Eigen/src/Core/util/Memory.h:189:12: warning: argument 1 value '18446744073709551612' exceeds maximum object size 9223372036854775807
|
||||
// This has been reported to gcc there: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87544
|
||||
void std_vector_gcc_warning()
|
||||
{
|
||||
typedef Eigen::Vector3f T;
|
||||
std::vector<T, Eigen::aligned_allocator<T> > v;
|
||||
v.push_back(T());
|
||||
}
|
||||
|
||||
EIGEN_DECLARE_TEST(stdvector)
|
||||
{
|
||||
// some non vectorizable fixed sizes
|
||||
|
||||
@@ -31,7 +31,7 @@ void check_stdvector_matrix(const MatrixType& m)
|
||||
Index rows = m.rows();
|
||||
Index cols = m.cols();
|
||||
MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
|
||||
std::vector<MatrixType> v(10, MatrixType(rows,cols)), w(20, y);
|
||||
std::vector<MatrixType> v(10, MatrixType::Zero(rows,cols)), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
@@ -100,8 +100,8 @@ template<typename QuaternionType>
|
||||
void check_stdvector_quaternion(const QuaternionType&)
|
||||
{
|
||||
typedef typename QuaternionType::Coefficients Coefficients;
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random());
|
||||
std::vector<QuaternionType> v(10), w(20, y);
|
||||
QuaternionType x(Coefficients::Random()), y(Coefficients::Random()), qi=QuaternionType::Identity();
|
||||
std::vector<QuaternionType> v(10,qi), w(20, y);
|
||||
v[5] = x;
|
||||
w[6] = v[5];
|
||||
VERIFY_IS_APPROX(w[6], v[5]);
|
||||
|
||||
Reference in New Issue
Block a user