From 237b03b3724df7137e82512cd7ad758e20b8e6b6 Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Wed, 23 Jan 2019 00:07:19 +0100 Subject: PR 574: use variadic template instead of initializer_list to implement fixed-size vector ctor from coefficients. --- Eigen/src/Core/Array.h | 27 +++++++++--------- Eigen/src/Core/Matrix.h | 21 +++++++------- Eigen/src/Core/PlainObjectBase.h | 37 +++++++++++++++---------- doc/TutorialMatrixClass.dox | 6 ++-- doc/snippets/Array_initializer_list2_cxx11.cpp | 3 -- doc/snippets/Array_variadic_ctor_cxx11.cpp | 3 ++ doc/snippets/Matrix_initializer_list2_cxx11.cpp | 3 -- doc/snippets/Matrix_variadic_ctor_cxx11.cpp | 3 ++ 8 files changed, 55 insertions(+), 48 deletions(-) delete mode 100644 doc/snippets/Array_initializer_list2_cxx11.cpp create mode 100644 doc/snippets/Array_variadic_ctor_cxx11.cpp delete mode 100644 doc/snippets/Matrix_initializer_list2_cxx11.cpp create mode 100644 doc/snippets/Matrix_variadic_ctor_cxx11.cpp diff --git a/Eigen/src/Core/Array.h b/Eigen/src/Core/Array.h index ff0b69b84..3a2a4fc58 100644 --- a/Eigen/src/Core/Array.h +++ b/Eigen/src/Core/Array.h @@ -183,10 +183,10 @@ class Array protected: enum { IsFixedSizeVectorAtCompileTime = RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic && IsVectorAtCompileTime == 1 }; public: - template::value>::type> - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE Array(const std::initializer_list& list) : Base(list) {} + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + Array(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args) + : Base(a0, a1, a2, a3, args...) {} EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Array(const std::initializer_list >& list) : Base(list) {} @@ -214,15 +214,16 @@ class Array /** constructs an initialized 2D vector with given coefficients */ Array(const Scalar& val0, const Scalar& val1); - /** \copydoc PlainObjectBase::PlainObjectBase(const std::initializer_list& list) - * - * Example: \include Array_initializer_list2_cxx11.cpp - * Output: \verbinclude Array_initializer_list2_cxx11.out - * - * \sa Array(const std::initializer_list >&) - */ - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE Array(const std::initializer_list& list); + /** \copydoc PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args) + * + * Example: \include Array_variadic_ctor_cxx11.cpp + * Output: \verbinclude Array_variadic_ctor_cxx11.out + * + * \sa Array(const std::initializer_list>&) + */ + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + Array(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args); /** \brief Constructs an array and initializes it from the coefficients given as initializer-lists grouped by row. \cpp11 * diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index aaceceafe..fb2a62a82 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -303,13 +303,11 @@ class Matrix } #if EIGEN_HAS_CXX11 - protected: - enum { IsFixedSizeVectorAtCompileTime = RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic && IsVectorAtCompileTime == 1 }; public: - template::value>::type> - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE Matrix(const std::initializer_list& list) : Base(list) {} + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + Matrix(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args) + : Base(a0, a1, a2, a3, args...) {} EIGEN_DEVICE_FUNC explicit EIGEN_STRONG_INLINE Matrix(const std::initializer_list>& list) : Base(list) {} @@ -353,15 +351,16 @@ class Matrix /** \brief Constructs an initialized 2D vector with given coefficients */ Matrix(const Scalar& x, const Scalar& y); - /** \copydoc PlainObjectBase::PlainObjectBase(const std::initializer_list& list) + /** \copydoc PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args) * - * Example: \include Matrix_initializer_list2_cxx11.cpp - * Output: \verbinclude Matrix_initializer_list2_cxx11.out + * Example: \include Matrix_variadic_ctor_cxx11.cpp + * Output: \verbinclude Matrix_variadic_ctor_cxx11.out * * \sa Matrix(const std::initializer_list>&) */ - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE Matrix(const std::initializer_list& list); + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + Matrix(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args); /** \brief Constructs a Matrix and initializes it from the coefficients given as initializer-lists grouped by row. \cpp11 * diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h index 04748e5e9..cd89fd365 100644 --- a/Eigen/src/Core/PlainObjectBase.h +++ b/Eigen/src/Core/PlainObjectBase.h @@ -527,15 +527,16 @@ class PlainObjectBase : public internal::dense_xpr_base::type } #ifdef EIGEN_PARSED_BY_DOXYGEN - /** \brief Construct a row of column vector with fixed size from an initializer list of coefficients. \cpp11 + /** \brief Construct a row of column vector with fixed size from an arbitrary number of coefficients. \cpp11 * * \only_for_vectors * - * \warning To construct a column (resp. row) vector of fixed length, the number of values passed through - * the initializer list must match the the fixed number of rows (resp. columns) of \c *this. + * \warning To construct a column (resp. row) vector of fixed length, the number of values passed to this + * constructor must match the the fixed number of rows (resp. columns) of \c *this. */ - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE PlainObjectBase(const std::initializer_list& list); + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args); /** \brief Constructs a Matrix or Array and initializes it by elements given by an initializer list of initializer * lists \cpp11 @@ -544,19 +545,25 @@ class PlainObjectBase : public internal::dense_xpr_base::type explicit EIGEN_STRONG_INLINE PlainObjectBase(const std::initializer_list>& list); #else // EIGEN_PARSED_BY_DOXYGEN #if EIGEN_HAS_CXX11 - template - EIGEN_DEVICE_FUNC - explicit EIGEN_STRONG_INLINE PlainObjectBase(const std::initializer_list& list, - typename internal::enable_if::value, T>::type* = 0, - typename internal::enable_if::type* = 0) + + protected: + enum { IsFixedSizeVectorAtCompileTime = RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic && IsVectorAtCompileTime == 1 }; + public: + + template + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + PlainObjectBase(const Scalar& a0, const Scalar& a1, const Scalar& a2, const Scalar& a3, const ArgTypes&... args) : m_storage() { _check_template_params(); - EIGEN_STATIC_ASSERT_FIXED_SIZE(PlainObjectBase); - resize(list.size()); - std::copy(list.begin(), list.end(), m_storage.data()); + EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(PlainObjectBase, sizeof...(args) + 4); + m_storage.data()[0] = a0; + m_storage.data()[1] = a1; + m_storage.data()[2] = a2; + m_storage.data()[3] = a3; + int i = 4; + auto x = {(m_storage.data()[i++] = args, 0)...}; + static_cast(x); } EIGEN_DEVICE_FUNC diff --git a/doc/TutorialMatrixClass.dox b/doc/TutorialMatrixClass.dox index c44c8f24f..2c452220f 100644 --- a/doc/TutorialMatrixClass.dox +++ b/doc/TutorialMatrixClass.dox @@ -109,11 +109,11 @@ Vector3d b(5.0, 6.0, 7.0); Vector4d c(5.0, 6.0, 7.0, 8.0); \endcode -If C++11 is enabled, fixed-size column or row vectors of arbitrary size can be initialized through a single initializer list (\link Matrix::Matrix(const std::initializer_list&) details \endlink): +If C++11 is enabled, fixed-size column or row vectors of arbitrary size can be initialized by passing an arbitrary number of coefficients: \code -Vector2i a {1, 2}; // A column vector containing the elements {1, 2} +Vector2i a(1, 2); // A column vector containing the elements {1, 2} Matrix b {1, 2, 3, 4, 5}; // A row-vector containing the elements {1, 2, 3, 4, 5} -Matrix c {1, 2, 3, 4, 5}; // A column vector containing the elements {1, 2, 3, 4, 5} +Matrix c = {1, 2, 3, 4, 5}; // A column vector containing the elements {1, 2, 3, 4, 5} \endcode In the general case of matrices and vectors with either fixed or runtime sizes, diff --git a/doc/snippets/Array_initializer_list2_cxx11.cpp b/doc/snippets/Array_initializer_list2_cxx11.cpp deleted file mode 100644 index 20e74546a..000000000 --- a/doc/snippets/Array_initializer_list2_cxx11.cpp +++ /dev/null @@ -1,3 +0,0 @@ -Array a {1, 2, 3, 4, 5, 6}; -Array b {1, 2, 3}; -cout << a << "\n\n" << b << endl; \ No newline at end of file diff --git a/doc/snippets/Array_variadic_ctor_cxx11.cpp b/doc/snippets/Array_variadic_ctor_cxx11.cpp new file mode 100644 index 000000000..234c7a720 --- /dev/null +++ b/doc/snippets/Array_variadic_ctor_cxx11.cpp @@ -0,0 +1,3 @@ +Array a(1, 2, 3, 4, 5, 6); +Array b {1, 2, 3}; +cout << a << "\n\n" << b << endl; \ No newline at end of file diff --git a/doc/snippets/Matrix_initializer_list2_cxx11.cpp b/doc/snippets/Matrix_initializer_list2_cxx11.cpp deleted file mode 100644 index 2fde52b8d..000000000 --- a/doc/snippets/Matrix_initializer_list2_cxx11.cpp +++ /dev/null @@ -1,3 +0,0 @@ -Matrix a {1, 2, 3, 4, 5, 6}; -Matrix b {1, 2, 3}; -cout << a << "\n\n" << b << endl; \ No newline at end of file diff --git a/doc/snippets/Matrix_variadic_ctor_cxx11.cpp b/doc/snippets/Matrix_variadic_ctor_cxx11.cpp new file mode 100644 index 000000000..fcb4ccf88 --- /dev/null +++ b/doc/snippets/Matrix_variadic_ctor_cxx11.cpp @@ -0,0 +1,3 @@ +Matrix a(1, 2, 3, 4, 5, 6); +Matrix b {1, 2, 3}; +cout << a << "\n\n" << b << endl; \ No newline at end of file -- cgit v1.2.3