From 336ad582131f94b9e77c91c83c067dbd0c54c3fc Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Mon, 12 Jan 2009 13:41:40 +0000 Subject: [PATCH] * move cwise *= and /= to Core (like * and /) * tidy the StdVector module * fix warnings (especially a | instead of ||) in stdvector test --- Eigen/StdVector | 65 +---------------------------- Eigen/src/Array/CwiseOperators.h | 37 ---------------- Eigen/src/Core/CwiseBinaryOp.h | 28 +++++++++++++ Eigen/src/StdVector/StdVector.h | 51 ++++++++++++++++++++++ Eigen/src/StdVector/UnalignedType.h | 45 ++++++++++++++++++++ test/stdvector.cpp | 4 +- 6 files changed, 128 insertions(+), 102 deletions(-) create mode 100644 Eigen/src/StdVector/StdVector.h create mode 100644 Eigen/src/StdVector/UnalignedType.h diff --git a/Eigen/StdVector b/Eigen/StdVector index 19be257db..e8b5354ac 100644 --- a/Eigen/StdVector +++ b/Eigen/StdVector @@ -1,28 +1,3 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. Eigen itself is part of the KDE project. -// -// Copyright (C) 2009 Benoit Jacob -// Copyright (C) 2009 Alex Stapleton -// -// Eigen is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 3 of the License, or (at your option) any later version. -// -// Alternatively, you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of -// the License, or (at your option) any later version. -// -// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License and a copy of the GNU General Public License along with -// Eigen. If not, see . - #ifndef EIGEN_STDVECTOR_MODULE_H #define EIGEN_STDVECTOR_MODULE_H @@ -30,47 +5,11 @@ #include namespace Eigen { -template class ei_unaligned_type; - -template -class ei_unaligned_type > - : public Matrix<_Scalar,_Rows,_Cols,_Options,_MaxRows,_MaxCols> -{ - public: - typedef Matrix<_Scalar,_Rows,_Cols,_Options,_MaxRows,_MaxCols> aligned_base; - ei_unaligned_type() : aligned_base(ei_constructor_without_unaligned_array_assert()) {} - ei_unaligned_type(const aligned_base& other) - { - resize(other.rows(), other.cols()); - ei_assign_impl::run(*this, other); - } -}; +#include "src/StdVector/UnalignedType.h" } // namespace Eigen namespace std { - - template - class vector, _Alloc> - : public vector >, - Eigen::aligned_allocator > > > - { - public: - typedef Eigen::ei_unaligned_type > value_type; - typedef Eigen::aligned_allocator allocator_type; - typedef vector unaligned_base; - typedef typename unaligned_base::size_type size_type; - typedef typename unaligned_base::iterator iterator; - - explicit vector(const allocator_type& __a = allocator_type()) : unaligned_base(__a) {} - vector(const vector& c) : unaligned_base(c) {} - vector(size_type num, const value_type& val = value_type()) : unaligned_base(num, val) {} - vector(iterator start, iterator end) : unaligned_base(start, end) {} - vector& operator=(const vector& __x) { - unaligned_base::operator=(__x); - return *this; - } - }; - +#include "src/StdVector/StdVector.h" } // namespace std #endif // EIGEN_STDVECTOR_MODULE_H diff --git a/Eigen/src/Array/CwiseOperators.h b/Eigen/src/Array/CwiseOperators.h index 81e51f8d9..4b6346daa 100644 --- a/Eigen/src/Array/CwiseOperators.h +++ b/Eigen/src/Array/CwiseOperators.h @@ -418,43 +418,6 @@ inline ExpressionType& Cwise::operator+=(const Scalar& scalar) return m_matrix.const_cast_derived() = *this + scalar; } - -//============= - -/** \array_module - * - * Replaces this expression by its coefficient-wise product with \a other. - * - * Example: \include Cwise_times_equal.cpp - * Output: \verbinclude Cwise_times_equal.out - * - * \sa operator*(), operator/=() - */ -template -template -inline ExpressionType& Cwise::operator*=(const MatrixBase &other) -{ - return m_matrix.const_cast_derived() = *this * other; -} - -/** \array_module - * - * Replaces this expression by its coefficient-wise quotient with \a other. - * - * Example: \include Cwise_slash_equal.cpp - * Output: \verbinclude Cwise_slash_equal.out - * - * \sa operator/(), operator*=() - */ -template -template -inline ExpressionType& Cwise::operator/=(const MatrixBase &other) -{ - return m_matrix.const_cast_derived() = *this / other; -} - -//============= - /** \array_module * * \returns an expression of \c *this with each coeff decremented by the constant \a scalar diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index 87d7123dd..c5bead928 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -224,6 +224,34 @@ Cwise::operator/(const MatrixBase &other) const return EIGEN_CWISE_BINOP_RETURN_TYPE(ei_scalar_quotient_op)(_expression(), other.derived()); } +/** Replaces this expression by its coefficient-wise product with \a other. + * + * Example: \include Cwise_times_equal.cpp + * Output: \verbinclude Cwise_times_equal.out + * + * \sa operator*(), operator/=() + */ +template +template +inline ExpressionType& Cwise::operator*=(const MatrixBase &other) +{ + return m_matrix.const_cast_derived() = *this * other; +} + +/** Replaces this expression by its coefficient-wise quotient by \a other. + * + * Example: \include Cwise_slash_equal.cpp + * Output: \verbinclude Cwise_slash_equal.out + * + * \sa operator/(), operator*=() + */ +template +template +inline ExpressionType& Cwise::operator/=(const MatrixBase &other) +{ + return m_matrix.const_cast_derived() = *this / other; +} + /** \returns an expression of the coefficient-wise min of *this and \a other * * Example: \include Cwise_min.cpp diff --git a/Eigen/src/StdVector/StdVector.h b/Eigen/src/StdVector/StdVector.h new file mode 100644 index 000000000..432582c52 --- /dev/null +++ b/Eigen/src/StdVector/StdVector.h @@ -0,0 +1,51 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. Eigen itself is part of the KDE project. +// +// Copyright (C) 2009 Benoit Jacob +// Copyright (C) 2009 Alex Stapleton +// +// Eigen is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 3 of the License, or (at your option) any later version. +// +// Alternatively, you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License and a copy of the GNU General Public License along with +// Eigen. If not, see . + +#ifndef EIGEN_STDVECTOR_H +#define EIGEN_STDVECTOR_H + +template +class vector, _Alloc> + : public vector >, + Eigen::aligned_allocator > > > +{ +public: + typedef Eigen::ei_unaligned_type > value_type; + typedef Eigen::aligned_allocator allocator_type; + typedef vector unaligned_base; + typedef typename unaligned_base::size_type size_type; + typedef typename unaligned_base::iterator iterator; + + explicit vector(const allocator_type& __a = allocator_type()) : unaligned_base(__a) {} + vector(const vector& c) : unaligned_base(c) {} + vector(size_type num, const value_type& val = value_type()) : unaligned_base(num, val) {} + vector(iterator start, iterator end) : unaligned_base(start, end) {} + vector& operator=(const vector& __x) { + unaligned_base::operator=(__x); + return *this; + } +}; + +#endif // EIGEN_STDVECTOR_H diff --git a/Eigen/src/StdVector/UnalignedType.h b/Eigen/src/StdVector/UnalignedType.h new file mode 100644 index 000000000..6ceeddd71 --- /dev/null +++ b/Eigen/src/StdVector/UnalignedType.h @@ -0,0 +1,45 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. Eigen itself is part of the KDE project. +// +// Copyright (C) 2009 Benoit Jacob +// Copyright (C) 2009 Alex Stapleton +// +// Eigen is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 3 of the License, or (at your option) any later version. +// +// Alternatively, you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License and a copy of the GNU General Public License along with +// Eigen. If not, see . + +#ifndef EIGEN_UNALIGNEDTYPE_H +#define EIGEN_UNALIGNEDTYPE_H + +template class ei_unaligned_type; + +template +class ei_unaligned_type > + : public Matrix<_Scalar,_Rows,_Cols,_Options,_MaxRows,_MaxCols> +{ + public: + typedef Matrix<_Scalar,_Rows,_Cols,_Options,_MaxRows,_MaxCols> aligned_base; + ei_unaligned_type() : aligned_base(ei_constructor_without_unaligned_array_assert()) {} + ei_unaligned_type(const aligned_base& other) + { + resize(other.rows(), other.cols()); + ei_assign_impl::run(*this, other); + } +}; + +#endif // EIGEN_UNALIGNEDTYPE_H diff --git a/test/stdvector.cpp b/test/stdvector.cpp index ea57c0736..024f97287 100644 --- a/test/stdvector.cpp +++ b/test/stdvector.cpp @@ -53,9 +53,9 @@ void check_stdvector(const MatrixType& m) // do a lot of push_back such that the vector gets internally resized // (with memory reallocation) MatrixType* ref = &w[0]; - for(int i=0; i<30 | ((ref==&w[0]) && i<300); ++i) + for(int i=0; i<30 || ((ref==&w[0]) && i<300); ++i) v.push_back(w[i%w.size()]); - for(int i=23; i