port VectorwiseOp and Swap to the novel mechanisms, and various cleanning

2 files changed, 43 insertions, 88 deletions

diff --git a/Eigen/src/Array/ArrayBase.h b/Eigen/src/Array/ArrayBase.h
index ccc8b8373..1ec2a3516 100644
--- a/Eigen/src/Array/ArrayBase.h
+++ b/Eigen/src/Array/ArrayBase.h
@@ -35,17 +35,17 @@ template<typename ExpressionType> class MatrixWrapper;
   *
   * An array is similar to a dense vector or matrix. While matrices are mathematical
   * objects with well defined linear algebra operators, an array is just a collection
-  * of scalar values arranged in a one or two dimensionnal fashion. The main consequence,
-  * is that all operations applied to an array are performed coefficient wise. Furthermore,
-  * arays support scalar math functions of the c++ standard library, and convenient
+  * of scalar values arranged in a one or two dimensionnal fashion. As the main consequence,
+  * all operations applied to an array are performed coefficient wise. Furthermore,
+  * arrays support scalar math functions of the c++ standard library (e.g., std::sin(x)), and convenient
   * constructors allowing to easily write generic code working for both scalar values
   * and arrays.
   *
   * This class is the base that is inherited by all array expression types.
   *
-  * \param Derived is the derived type, e.g. an array type, or an expression, etc.
+  * \param Derived is the derived type, e.g., an array or an expression type.
   *
-  * \sa class ArrayBase
+  * \sa class MatrixBase
   */
 template<typename Derived> class ArrayBase
   : public DenseBase<Derived>
@@ -60,8 +60,6 @@ template<typename Derived> class ArrayBase
     using ei_special_scalar_op_base<Derived,typename ei_traits<Derived>::Scalar,
                 typename NumTraits<typename ei_traits<Derived>::Scalar>::Real>::operator*;
 
-    class InnerIterator;
-
     typedef typename ei_traits<Derived>::Scalar Scalar;
     typedef typename ei_packet_traits<Scalar>::type PacketScalar;
 
@@ -126,11 +124,6 @@ template<typename Derived> class ArrayBase
 #   endif
 #undef EIGEN_CURRENT_STORAGE_BASE_CLASS
 
-
-    /** Copies \a other into *this. \returns a reference to *this. */
-//     template<typename OtherDerived>
-//     Derived& operator=(const ArrayBase<OtherDerived>& other);
-
     /** Special case of the template operator=, in order to prevent the compiler
       * from generating a default operator= (issue hit with g++ 4.1)
       */
@@ -139,14 +132,6 @@ template<typename Derived> class ArrayBase
       return ei_assign_selector<Derived,Derived>::run(derived(), other.derived());
     }
 
-#ifndef EIGEN_PARSED_BY_DOXYGEN
-    /** Copies \a other into *this without evaluating other. \returns a reference to *this. */
-//     template<typename OtherDerived>
-//     Derived& lazyAssign(const ArrayBase<OtherDerived>& other);
-//     template<typename OtherDerived>
-//     Derived& lazyAssign(const MatrixBase<OtherDerived>& other);
-#endif // not EIGEN_PARSED_BY_DOXYGEN
-
     Derived& operator+=(const Scalar& scalar)
     { return *this = derived() + scalar; }
     Derived& operator-=(const Scalar& scalar)
@@ -168,46 +153,16 @@ template<typename Derived> class ArrayBase
     inline bool operator!=(const ArrayBase<OtherDerived>& other) const
     { return cwiseNotEqual(other).all(); }
 
-
-    /** \returns the matrix or vector obtained by evaluating this expression.
-      *
-      * Notice that in the case of a plain matrix or vector (not an expression) this function just returns
-      * a const reference, in order to avoid a useless copy.
-      */
-//     EIGEN_STRONG_INLINE const typename ei_eval<Derived>::type eval() const
-//     { return typename ei_eval<Derived>::type(derived()); }
-
-//     template<typename OtherDerived>
-//     void swap(ArrayBase<OtherDerived> EIGEN_REF_TO_TEMPORARY other);
-
-
-//     const VectorwiseOp<Derived,Horizontal> rowwise() const;
-//     VectorwiseOp<Derived,Horizontal> rowwise();
-//     const VectorwiseOp<Derived,Vertical> colwise() const;
-//     VectorwiseOp<Derived,Vertical> colwise();
-
-
-
   public:
     MatrixWrapper<Derived> asMatrix() { return derived(); }
     const MatrixWrapper<Derived> asMatrix() const { return derived(); }
 
-    template<typename Dest>
-    inline void evalTo(Dest& dst) const { dst = asMatrix(); }
+//     template<typename Dest>
+//     inline void evalTo(Dest& dst) const { dst = asMatrix(); }
 
   protected:
-    /** Default constructor. Do nothing. */
-    ArrayBase()
-    {
-      /* Just checks for self-consistency of the flags.
-       * Only do it when debugging Eigen, as this borders on paranoiac and could slow compilation down
-       */
-#ifdef EIGEN_INTERNAL_DEBUGGING
-      EIGEN_STATIC_ASSERT(ei_are_flags_consistent<Flags>::ret,
-                          INVALID_MATRIXBASE_TEMPLATE_PARAMETERS)
-#endif
-    }
-
+    ArrayBase() : Base() {}
+    
   private:
     explicit ArrayBase(int);
     ArrayBase(int,int);
diff --git a/Eigen/src/Array/VectorwiseOp.h b/Eigen/src/Array/VectorwiseOp.h
index 05dd69789..c0944fc42 100644
--- a/Eigen/src/Array/VectorwiseOp.h
+++ b/Eigen/src/Array/VectorwiseOp.h
@@ -119,7 +119,7 @@ class PartialReduxExpr : ei_no_assignment_operator,
     template<typename Scalar, int Size> struct Cost                 \
     { enum { value = COST }; };                                     \
     template<typename Derived>                                      \
-    inline ResultType operator()(const MatrixBase<Derived>& mat) const     \
+    inline ResultType operator()(const DenseBase<Derived>& mat) const     \
     { return mat.MEMBER(); } \
   }
 
@@ -148,7 +148,7 @@ struct ei_member_redux {
   { enum { value = (Size-1) * ei_functor_traits<BinaryOp>::Cost }; };
   ei_member_redux(const BinaryOp func) : m_functor(func) {}
   template<typename Derived>
-  inline result_type operator()(const MatrixBase<Derived>& mat) const
+  inline result_type operator()(const DenseBase<Derived>& mat) const
   { return mat.redux(m_functor); }
   const BinaryOp m_functor;
 };
@@ -163,13 +163,13 @@ struct ei_member_redux {
   * \param Direction indicates the direction of the redux (Vertical or Horizontal)
   *
   * This class represents a pseudo expression with partial reduction features.
-  * It is the return type of MatrixBase::colwise() and MatrixBase::rowwise()
+  * It is the return type of DenseBase::colwise() and DenseBase::rowwise()
   * and most of the time this is the only way it is used.
   *
   * Example: \include MatrixBase_colwise.cpp
   * Output: \verbinclude MatrixBase_colwise.out
   *
-  * \sa MatrixBase::colwise(), MatrixBase::rowwise(), class PartialReduxExpr
+  * \sa DenseBase::colwise(), DenseBase::rowwise(), class PartialReduxExpr
   */
 template<typename ExpressionType, int Direction> class VectorwiseOp
 {
@@ -227,7 +227,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Replicates a vector to match the size of \c *this */
     template<typename OtherDerived>
     typename ExtendedType<OtherDerived>::Type
-    extendedTo(const MatrixBase<OtherDerived>& other) const
+    extendedTo(const DenseBase<OtherDerived>& other) const
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived);
       return typename ExtendedType<OtherDerived>::Type
@@ -248,7 +248,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * The template parameter \a BinaryOp is the type of the functor
       * of the custom redux operator. Note that func must be an associative operator.
       *
-      * \sa class VectorwiseOp, MatrixBase::colwise(), MatrixBase::rowwise()
+      * \sa class VectorwiseOp, DenseBase::colwise(), DenseBase::rowwise()
       */
     template<typename BinaryOp>
     const typename ReduxReturnType<BinaryOp>::Type
@@ -261,7 +261,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_minCoeff.cpp
       * Output: \verbinclude PartialRedux_minCoeff.out
       *
-      * \sa MatrixBase::minCoeff() */
+      * \sa DenseBase::minCoeff() */
     const typename ReturnType<ei_member_minCoeff>::Type minCoeff() const
     { return _expression(); }
 
@@ -271,7 +271,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_maxCoeff.cpp
       * Output: \verbinclude PartialRedux_maxCoeff.out
       *
-      * \sa MatrixBase::maxCoeff() */
+      * \sa DenseBase::maxCoeff() */
     const typename ReturnType<ei_member_maxCoeff>::Type maxCoeff() const
     { return _expression(); }
 
@@ -281,7 +281,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_squaredNorm.cpp
       * Output: \verbinclude PartialRedux_squaredNorm.out
       *
-      * \sa MatrixBase::squaredNorm() */
+      * \sa DenseBase::squaredNorm() */
     const typename ReturnType<ei_member_squaredNorm>::Type squaredNorm() const
     { return _expression(); }
 
@@ -291,7 +291,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_norm.cpp
       * Output: \verbinclude PartialRedux_norm.out
       *
-      * \sa MatrixBase::norm() */
+      * \sa DenseBase::norm() */
     const typename ReturnType<ei_member_norm>::Type norm() const
     { return _expression(); }
 
@@ -300,7 +300,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * of each column (or row) of the referenced expression, using
       * blue's algorithm.
       *
-      * \sa MatrixBase::blueNorm() */
+      * \sa DenseBase::blueNorm() */
     const typename ReturnType<ei_member_blueNorm>::Type blueNorm() const
     { return _expression(); }
 
@@ -309,7 +309,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * of each column (or row) of the referenced expression, avoiding
       * underflow and overflow.
       *
-      * \sa MatrixBase::stableNorm() */
+      * \sa DenseBase::stableNorm() */
     const typename ReturnType<ei_member_stableNorm>::Type stableNorm() const
     { return _expression(); }
 
@@ -318,7 +318,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * of each column (or row) of the referenced expression, avoiding
       * underflow and overflow using a concatenation of hypot() calls.
       *
-      * \sa MatrixBase::hypotNorm() */
+      * \sa DenseBase::hypotNorm() */
     const typename ReturnType<ei_member_hypotNorm>::Type hypotNorm() const
     { return _expression(); }
 
@@ -328,28 +328,28 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_sum.cpp
       * Output: \verbinclude PartialRedux_sum.out
       *
-      * \sa MatrixBase::sum() */
+      * \sa DenseBase::sum() */
     const typename ReturnType<ei_member_sum>::Type sum() const
     { return _expression(); }
 
     /** \returns a row (or column) vector expression of the mean
     * of each column (or row) of the referenced expression.
     *
-    * \sa MatrixBase::mean() */
+    * \sa DenseBase::mean() */
     const typename ReturnType<ei_member_mean>::Type mean() const
     { return _expression(); }
 
     /** \returns a row (or column) vector expression representing
       * whether \b all coefficients of each respective column (or row) are \c true.
       *
-      * \sa MatrixBase::all() */
+      * \sa DenseBase::all() */
     const typename ReturnType<ei_member_all>::Type all() const
     { return _expression(); }
 
     /** \returns a row (or column) vector expression representing
       * whether \b at \b least one coefficient of each respective column (or row) is \c true.
       *
-      * \sa MatrixBase::any() */
+      * \sa DenseBase::any() */
     const typename ReturnType<ei_member_any>::Type any() const
     { return _expression(); }
 
@@ -359,7 +359,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_count.cpp
       * Output: \verbinclude PartialRedux_count.out
       *
-      * \sa MatrixBase::count() */
+      * \sa DenseBase::count() */
     const PartialReduxExpr<ExpressionType, ei_member_count<int>, Direction> count() const
     { return _expression(); }
 
@@ -369,7 +369,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_prod.cpp
       * Output: \verbinclude PartialRedux_prod.out
       *
-      * \sa MatrixBase::prod() */
+      * \sa DenseBase::prod() */
     const typename ReturnType<ei_member_prod>::Type prod() const
     { return _expression(); }
 
@@ -380,7 +380,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include PartialRedux_reverse.cpp
       * Output: \verbinclude PartialRedux_reverse.out
       *
-      * \sa MatrixBase::reverse() */
+      * \sa DenseBase::reverse() */
     const Reverse<ExpressionType, Direction> reverse() const
     { return Reverse<ExpressionType, Direction>( _expression() ); }
 
@@ -393,7 +393,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
       * Example: \include DirectionWise_replicate.cpp
       * Output: \verbinclude DirectionWise_replicate.out
       *
-      * \sa VectorwiseOp::replicate(int), MatrixBase::replicate(), class Replicate
+      * \sa VectorwiseOp::replicate(int), DenseBase::replicate(), class Replicate
       */
     // NOTE implemented here because of sunstudio's compilation errors
     template<int Factor> const Replicate<ExpressionType,(IsVertical?Factor:1),(IsHorizontal?Factor:1)>
@@ -407,7 +407,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
 
     /** Copies the vector \a other to each subvector of \c *this */
     template<typename OtherDerived>
-    ExpressionType& operator=(const MatrixBase<OtherDerived>& other)
+    ExpressionType& operator=(const DenseBase<OtherDerived>& other)
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived)
       //ei_assert((m_matrix.isNull()) == (other.isNull())); FIXME
@@ -418,21 +418,21 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
 
     /** Adds the vector \a other to each subvector of \c *this */
     template<typename OtherDerived>
-    ExpressionType& operator+=(const MatrixBase<OtherDerived>& other)
+    ExpressionType& operator+=(const DenseBase<OtherDerived>& other)
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived)
       for(int j=0; j<subVectors(); ++j)
-        subVector(j) += other;
+        subVector(j) += other.derived();
       return const_cast<ExpressionType&>(m_matrix);
     }
 
     /** Substracts the vector \a other to each subvector of \c *this */
     template<typename OtherDerived>
-    ExpressionType& operator-=(const MatrixBase<OtherDerived>& other)
+    ExpressionType& operator-=(const DenseBase<OtherDerived>& other)
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived)
       for(int j=0; j<subVectors(); ++j)
-        subVector(j) -= other;
+        subVector(j) -= other.derived();
       return const_cast<ExpressionType&>(m_matrix);
     }
 
@@ -441,10 +441,10 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
     CwiseBinaryOp<ei_scalar_sum_op<Scalar>,
                   ExpressionType,
                   typename ExtendedType<OtherDerived>::Type>
-    operator+(const MatrixBase<OtherDerived>& other) const
+    operator+(const DenseBase<OtherDerived>& other) const
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived);
-      return m_matrix + extendedTo(other);
+      return m_matrix + extendedTo(other.derived());
     }
 
     /** Returns the expression of the difference between each subvector of \c *this and the vector \a other */
@@ -452,10 +452,10 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
     CwiseBinaryOp<ei_scalar_difference_op<Scalar>,
                   ExpressionType,
                   typename ExtendedType<OtherDerived>::Type>
-    operator-(const MatrixBase<OtherDerived>& other) const
+    operator-(const DenseBase<OtherDerived>& other) const
     {
       EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived);
-      return m_matrix - extendedTo(other);
+      return m_matrix - extendedTo(other.derived());
     }
 
 /////////// Geometry module ///////////
@@ -505,7 +505,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
   */
 template<typename Derived>
 inline const VectorwiseOp<Derived,Vertical>
-MatrixBase<Derived>::colwise() const
+DenseBase<Derived>::colwise() const
 {
   return derived();
 }
@@ -518,7 +518,7 @@ MatrixBase<Derived>::colwise() const
   */
 template<typename Derived>
 inline VectorwiseOp<Derived,Vertical>
-MatrixBase<Derived>::colwise()
+DenseBase<Derived>::colwise()
 {
   return derived();
 }
@@ -534,7 +534,7 @@ MatrixBase<Derived>::colwise()
   */
 template<typename Derived>
 inline const VectorwiseOp<Derived,Horizontal>
-MatrixBase<Derived>::rowwise() const
+DenseBase<Derived>::rowwise() const
 {
   return derived();
 }
@@ -547,7 +547,7 @@ MatrixBase<Derived>::rowwise() const
   */
 template<typename Derived>
 inline VectorwiseOp<Derived,Horizontal>
-MatrixBase<Derived>::rowwise()
+DenseBase<Derived>::rowwise()
 {
   return derived();
 }