Merge WrapArray into FromArray. Less code. The downside is that we're using one more

const_cast. But I think that anyway trying to maintain const strictness in Eigen2 is not
worth the hassle.

Konstantin: so the code snippet I sent you won't work anymore, replace wrapArray with fromArray.

CCMAIL:konst.heil@stud.uni-heidelberg.de

7 files changed, 17 insertions, 85 deletions

diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp
index 8a7d499d3..4400bd2d1 100644
--- a/doc/tutorial.cpp
+++ b/doc/tutorial.cpp
@@ -32,10 +32,5 @@ int main(int, char **)
   cout << "Column 1 of m2 is:" << endl << m2.col(1) << endl;
   cout << "The transpose of m2 is:" << endl << m2.transpose() << endl;
   cout << "The matrix m2 with row 0 and column 1 removed is:" << endl << m2.minor(0,1) << endl;
-  
-  double a1[3] = {1.0, 3.0, 2.0};
-  double a2[3];
-  Vector3d::wrapArray(a2) = 2 * Vector3d::fromArray(a1);
-  cout << Vector3d::fromArray(a2) << endl;
   return 0;
 }
diff --git a/src/Core.h b/src/Core.h
index c62124ac6..2b2e5b388 100644
--- a/src/Core.h
+++ b/src/Core.h
@@ -30,6 +30,5 @@ namespace Eigen {
 #include "Core/Identity.h"
 #include "Core/Fuzzy.h"
 #include "Core/FromArray.h"
-#include "Core/WrapArray.h"
 
 } // namespace Eigen
diff --git a/src/Core/FromArray.h b/src/Core/FromArray.h
index 2350bf345..30ee567cb 100644
--- a/src/Core/FromArray.h
+++ b/src/Core/FromArray.h
@@ -36,11 +36,13 @@ template<typename MatrixType> class FromArray
     static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
                      ColsAtCompileTime = MatrixType::ColsAtCompileTime;
 
-    FromArray(int rows, int cols, const Scalar* array) : m_rows(rows), m_cols(cols), m_array(array)
+    FromArray(int rows, int cols, Scalar* array) : m_rows(rows), m_cols(cols), m_array(array)
     {
       assert(rows > 0 && cols > 0);
     }
     
+    EI_INHERIT_ASSIGNMENT_OPERATORS(FromArray)
+    
   private:
     FromArray& _ref() { return *this; }
     const FromArray& _constRef() const { return *this; }
@@ -52,15 +54,20 @@ template<typename MatrixType> class FromArray
       return m_array[row + col * m_rows];
     }
     
+    Scalar& _write(int row, int col)
+    {
+      return m_array[row + col * m_rows];
+    }
+    
   protected:
     int m_rows, m_cols;
-    const Scalar* m_array;
+    Scalar* m_array;
 };
 
 template<typename Scalar, typename Derived>
 FromArray<Derived> Object<Scalar, Derived>::fromArray(const Scalar* array, int rows, int cols)
 {
-  return FromArray<Derived>(rows, cols, array);
+  return FromArray<Derived>(rows, cols, const_cast<Scalar*>(array));
 }
 
 #endif // EI_FROMARRAY_H
diff --git a/src/Core/Object.h b/src/Core/Object.h
index 6a3be1d05..96eb83cfd 100644
--- a/src/Core/Object.h
+++ b/src/Core/Object.h
@@ -119,8 +119,6 @@ template<typename Scalar, typename Derived> class Object
     identity(int rows = RowsAtCompileTime);
     static FromArray<Derived>
     fromArray(const Scalar* array, int rows = RowsAtCompileTime, int cols = ColsAtCompileTime);
-    static WrapArray<Derived>
-    wrapArray(Scalar* array, int rows = RowsAtCompileTime, int cols = ColsAtCompileTime);
     
     template<typename OtherDerived>
     bool isApprox(
diff --git a/src/Core/Util.h b/src/Core/Util.h
index bbe98f3bb..fdc6b27a1 100644
--- a/src/Core/Util.h
+++ b/src/Core/Util.h
@@ -60,7 +60,6 @@ template<typename MatrixType> class Zero;
 template<typename MatrixType> class Identity;
 template<typename ExpressionType> class Eval;
 template<typename MatrixType> class FromArray;
-template<typename MatrixType> class WrapArray;
 
 template<typename T> struct ForwardDecl
 {
diff --git a/src/Core/WrapArray.h b/src/Core/WrapArray.h
deleted file mode 100644
index 4c32a3ee8..000000000
--- a/src/Core/WrapArray.h
+++ /dev/null
@@ -1,73 +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-2007 Benoit Jacob <jacob@math.jussieu.fr>
-//
-// Eigen is free software; 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 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 General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along
-// with Eigen; if not, write to the Free Software Foundation, Inc., 51
-// Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// As a special exception, if other files instantiate templates or use macros
-// or functions from this file, or you compile this file and link it
-// with other works to produce a work based on this file, this file does not
-// by itself cause the resulting work to be covered by the GNU General Public
-// License. This exception does not invalidate any other reasons why a work
-// based on this file might be covered by the GNU General Public License.
-
-#ifndef EI_WRAPARRAY_H
-#define EI_WRAPARRAY_H
-
-template<typename MatrixType> class WrapArray
-  : public Object<typename MatrixType::Scalar, WrapArray<MatrixType> >
-{
-  public:
-    typedef typename MatrixType::Scalar Scalar;
-    friend class Object<Scalar, WrapArray<MatrixType> >;
-    
-    static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
-                     ColsAtCompileTime = MatrixType::ColsAtCompileTime;
-
-    WrapArray(int rows, int cols, Scalar* array) : m_rows(rows), m_cols(cols), m_array(array)
-    {
-      assert(rows > 0 && cols > 0);
-    }
-    
-    EI_INHERIT_ASSIGNMENT_OPERATORS(WrapArray)
-    
-  private:
-    WrapArray& _ref() { return *this; }
-    const WrapArray& _constRef() const { return *this; }
-    int _rows() const { return m_rows; }
-    int _cols() const { return m_cols; }
-    
-    const Scalar& _read(int row, int col) const
-    {
-      return m_array[row + col * m_rows];
-    }
-    
-    Scalar& _write(int row, int col) const
-    {
-      return m_array[row + col * m_rows];
-    }
-    
-  protected:
-    int m_rows, m_cols;
-    Scalar* m_array;
-};
-
-template<typename Scalar, typename Derived>
-WrapArray<Derived> Object<Scalar, Derived>::wrapArray(Scalar* array, int rows, int cols)
-{
-  return WrapArray<Derived>(rows, cols, array);
-}
-
-#endif // EI_WRAPARRAY_H
diff --git a/test/basicstuff.cpp b/test/basicstuff.cpp
index 3e734a498..02ebb2343 100644
--- a/test/basicstuff.cpp
+++ b/test/basicstuff.cpp
@@ -87,6 +87,13 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
   QVERIFY(v1.isApprox(identity * v1));
   
   QVERIFY((square * (m1 + m2)).isApprox(square * m1 + square * m2));
+  
+  Scalar* array1 = new Scalar[rows];
+  Scalar* array2 = new Scalar[rows];
+  Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows) = Matrix<Scalar, Dynamic, 1>::random(rows);
+  Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows) = Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows);
+  bool b = Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows).isApprox(Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows));
+  QVERIFY(b);
 }
 
 void EigenTest::testBasicStuff()