diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-04-24 18:35:39 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-04-24 18:35:39 +0000 |
commit | 9385793f71f2a606b0527df8ea1d2153c3e70e11 (patch) | |
tree | 7881ba4e88218c356465609d44c6b43ab17491b1 /Eigen/src/Core/Random.h | |
parent | 6ae037dfb5b340d2d545ccbb4135b04903a2e44f (diff) |
Fix a couple of issue with the vectorization. In particular, default ei_p* functions
are provided to handle not suported types seemlessly.
Added a generic null-ary expression with null-ary functors. They replace
Zero, Ones, Identity and Random.
Diffstat (limited to 'Eigen/src/Core/Random.h')
-rw-r--r-- | Eigen/src/Core/Random.h | 158 |
1 files changed, 0 insertions, 158 deletions
diff --git a/Eigen/src/Core/Random.h b/Eigen/src/Core/Random.h deleted file mode 100644 index 4d6a21da4..000000000 --- a/Eigen/src/Core/Random.h +++ /dev/null @@ -1,158 +0,0 @@ -// This file is part of Eigen, a lightweight C++ template library -// for linear algebra. Eigen itself is part of the KDE project. -// -// Copyright (C) 2006-2008 Benoit Jacob <jacob@math.jussieu.fr> -// -// 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 <http://www.gnu.org/licenses/>. - -#ifndef EIGEN_RANDOM_H -#define EIGEN_RANDOM_H - -/** \class Random - * - * \brief Expression of a random matrix or vector. - * - * \sa MatrixBase::random(), MatrixBase::random(int), MatrixBase::random(int,int), - * MatrixBase::setRandom() - */ -template<typename MatrixType> -struct ei_traits<Random<MatrixType> > -{ - typedef typename ei_traits<MatrixType>::Scalar Scalar; - enum { - RowsAtCompileTime = ei_traits<MatrixType>::RowsAtCompileTime, - ColsAtCompileTime = ei_traits<MatrixType>::ColsAtCompileTime, - MaxRowsAtCompileTime = ei_traits<MatrixType>::MaxRowsAtCompileTime, - MaxColsAtCompileTime = ei_traits<MatrixType>::MaxColsAtCompileTime, - Flags = (ei_traits<MatrixType>::Flags | EvalBeforeNestingBit) & ~VectorizableBit, - CoeffReadCost = 2 * NumTraits<Scalar>::MulCost // FIXME: arbitrary value - }; -}; - -template<typename MatrixType> class Random : ei_no_assignment_operator, - public MatrixBase<Random<MatrixType> > -{ - public: - - EIGEN_GENERIC_PUBLIC_INTERFACE(Random) - - private: - - int _rows() const { return m_rows.value(); } - int _cols() const { return m_cols.value(); } - - const Scalar _coeff(int, int) const - { - return ei_random<Scalar>(); - } - - public: - - Random(int rows, int cols) : m_rows(rows), m_cols(cols) - { - ei_assert(rows > 0 - && (RowsAtCompileTime == Dynamic || RowsAtCompileTime == rows) - && cols > 0 - && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols)); - } - - protected: - const ei_int_if_dynamic<RowsAtCompileTime> m_rows; - const ei_int_if_dynamic<ColsAtCompileTime> m_cols; -}; - -/** \returns a random matrix (not an expression, the matrix is immediately evaluated). - * - * The parameters \a rows and \a cols are the number of rows and of columns of - * the returned matrix. Must be compatible with this MatrixBase type. - * - * This variant is meant to be used for dynamic-size matrix types. For fixed-size types, - * it is redundant to pass \a rows and \a cols as arguments, so ei_random() should be used - * instead. - * - * Example: \include MatrixBase_random_int_int.cpp - * Output: \verbinclude MatrixBase_random_int_int.out - * - * \sa ei_random(), ei_random(int) - */ -template<typename Derived> -const Random<Derived> -MatrixBase<Derived>::random(int rows, int cols) -{ - return Random<Derived>(rows, cols); -} - -/** \returns a random vector (not an expression, the vector is immediately evaluated). - * - * The parameter \a size is the size of the returned vector. - * Must be compatible with this MatrixBase type. - * - * \only_for_vectors - * - * This variant is meant to be used for dynamic-size vector types. For fixed-size types, - * it is redundant to pass \a size as argument, so ei_random() should be used - * instead. - * - * Example: \include MatrixBase_random_int.cpp - * Output: \verbinclude MatrixBase_random_int.out - * - * \sa ei_random(), ei_random(int,int) - */ -template<typename Derived> -const Random<Derived> -MatrixBase<Derived>::random(int size) -{ - ei_assert(IsVectorAtCompileTime); - if(RowsAtCompileTime == 1) return Random<Derived>(1, size); - else return Random<Derived>(size, 1); -} - -/** \returns a fixed-size random matrix or vector - * (not an expression, the matrix is immediately evaluated). - * - * This variant is only for fixed-size MatrixBase types. For dynamic-size types, you - * need to use the variants taking size arguments. - * - * Example: \include MatrixBase_random.cpp - * Output: \verbinclude MatrixBase_random.out - * - * \sa ei_random(int), ei_random(int,int) - */ -template<typename Derived> -const Random<Derived> -MatrixBase<Derived>::random() -{ - return Random<Derived>(RowsAtCompileTime, ColsAtCompileTime); -} - -/** Sets all coefficients in this expression to random values. - * - * Example: \include MatrixBase_setRandom.cpp - * Output: \verbinclude MatrixBase_setRandom.out - * - * \sa class Random, ei_random() - */ -template<typename Derived> -Derived& MatrixBase<Derived>::setRandom() -{ - return *this = Random<Derived>(rows(), cols()); -} - -#endif // EIGEN_RANDOM_H |