From c3731b36d1fc37546d00f52b3ccaa1c690646cf1 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <jacob.benoit.1@gmail.com>
Date: Fri, 7 Sep 2007 07:41:10 +0000
Subject: [PATCH] Add operator += and operator -= between
 matrices/vectors/expressions

---
 src/MatrixBase.h     | 10 +++++++++
 src/MatrixOps.h      | 48 ++++++++++++++++++++++++++++++++++++++++++++
 src/MatrixXpr.h      | 11 ++++++++++
 test/matrixmanip.cpp |  3 ++-
 test/matrixops.cpp   |  4 ++++
 test/vectorops.cpp   |  5 +++++
 6 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/MatrixBase.h b/src/MatrixBase.h
index 860b9272d..93552b467 100644
--- a/src/MatrixBase.h
+++ b/src/MatrixBase.h
@@ -202,6 +202,16 @@ class MatrixBase
     MatrixConstXpr<MatrixBlock<const ConstRef> >
       block(int startRow, int endRow, int startCol = 0, int endCol = 0) const;
     
+    template<typename Content>
+    MatrixBase& operator+=(const MatrixConstXpr<Content> &xpr);
+    template<typename Content>
+    MatrixBase& operator-=(const MatrixConstXpr<Content> &xpr);
+    template<typename Derived2>
+    MatrixBase& operator+=(const MatrixBase<Derived2> &other);
+    template<typename Derived2>
+    MatrixBase& operator-=(const MatrixBase<Derived2> &other);
+
+    
   protected:
   
     MatrixBase() {};
diff --git a/src/MatrixOps.h b/src/MatrixOps.h
index e4975daca..cf205e7cd 100644
--- a/src/MatrixOps.h
+++ b/src/MatrixOps.h
@@ -167,6 +167,54 @@ EIGEN_MAKE_MATRIX_OP(Product,    *)
 
 #undef EIGEN_MAKE_MATRIX_OP
 
+#define EIGEN_MAKE_MATRIX_OP_EQ(SYMBOL) \
+template<typename Derived1> \
+template<typename Derived2> \
+MatrixBase<Derived1> & \
+MatrixBase<Derived1>::operator SYMBOL##=(const MatrixBase<Derived2> &mat2) \
+{ \
+  return *this = *this SYMBOL mat2; \
+} \
+\
+template<typename Derived> \
+template<typename Content> \
+MatrixBase<Derived> & \
+MatrixBase<Derived>::operator SYMBOL##=(const MatrixConstXpr<Content> &xpr) \
+{ \
+  return *this = *this SYMBOL xpr; \
+} \
+\
+template<typename Content> \
+template<typename Derived> \
+MatrixXpr<Content> & \
+MatrixXpr<Content>::operator SYMBOL##=(const MatrixBase<Derived> &mat) \
+{ \
+  assert(rows() == mat.rows() && cols() == mat.cols()); \
+  for(int i = 0; i < rows(); i++) \
+    for(int j = 0; j < cols(); j++) \
+      this->operator()(i, j) SYMBOL##= mat(i, j); \
+  return *this; \
+} \
+\
+template<typename Content1> \
+template<typename Content2> \
+MatrixXpr<Content1> & \
+MatrixXpr<Content1>::operator SYMBOL##=(const MatrixConstXpr<Content2> &other) \
+{ \
+  assert(rows() == other.rows() && cols() == other.cols()); \
+  for(int i = 0; i < rows(); i++) \
+    for(int j = 0; j < cols(); j++) \
+      this->operator()(i, j) SYMBOL##= other(i, j); \
+  return *this; \
+}
+
+EIGEN_MAKE_MATRIX_OP_EQ(+)
+EIGEN_MAKE_MATRIX_OP_EQ(-)
+
+#undef EIGEN_MAKE_MATRIX_OP_EQ
+
+
+
 } // namespace Eigen
 
 #endif // EIGEN_MATRIXOPS_H
diff --git a/src/MatrixXpr.h b/src/MatrixXpr.h
index 937d4e280..843cb214d 100644
--- a/src/MatrixXpr.h
+++ b/src/MatrixXpr.h
@@ -114,6 +114,17 @@ template<typename Content> class MatrixXpr
     MatrixXpr<MatrixMinor<MatrixXpr<Content> > > minor(int row, int col);
     MatrixXpr<MatrixBlock<MatrixXpr<Content> > >
       block(int startRow, int endRow, int startCol= 0, int endCol = 0);
+    
+    template<typename Content2>
+    MatrixXpr& operator+=(const MatrixConstXpr<Content2> &other);
+    template<typename Content2>
+    MatrixXpr& operator-=(const MatrixConstXpr<Content2> &other);
+    template<typename Derived>
+    MatrixXpr& operator+=(const MatrixBase<Derived> &matrix);
+    template<typename Derived>
+    MatrixXpr& operator-=(const MatrixBase<Derived> &matrix);
+    
+  
   
   private:
     void operator=(const MatrixXpr &other)
diff --git a/test/matrixmanip.cpp b/test/matrixmanip.cpp
index 5ce8fa615..aa55d02cf 100644
--- a/test/matrixmanip.cpp
+++ b/test/matrixmanip.cpp
@@ -36,8 +36,9 @@ template<typename MatrixType> void matrixManip(const MatrixType& m)
   a.minor(i, j);
   a.block(1, rows-1, 1, cols-1);
   a.xpr().row(i) = b.row(i);
+  a.xpr().row(i) += b.row(i);
   a.xpr().minor(i, j) = b.block(1, rows-1, 1, cols-1);
-  a.alias().xpr().minor(i, j) = a.block(1, rows-1, 1, cols-1);
+  a.alias().xpr().minor(i, j) -= a.block(1, rows-1, 1, cols-1);
 }
 
 void EigenTest::testMatrixManip()
diff --git a/test/matrixops.cpp b/test/matrixops.cpp
index a9034dcf2..56b252287 100644
--- a/test/matrixops.cpp
+++ b/test/matrixops.cpp
@@ -46,6 +46,10 @@ template<typename MatrixType1,
   a = s * (b - c);
   a.alias() = a + b;
   
+  a += b;
+  a.alias().xpr() += b;
+  a -= b + b;
+  
   MatrixType1 d(rows1, cols1);
   MatrixType2 e(rows2, cols2);
   QVERIFY( (d * e).rows() == rows1 && (d * e).cols() == cols2 );
diff --git a/test/vectorops.cpp b/test/vectorops.cpp
index b4b638495..3aadb73c6 100644
--- a/test/vectorops.cpp
+++ b/test/vectorops.cpp
@@ -43,6 +43,11 @@ template<typename VectorType> void vectorOps(const VectorType& v)
   a = b + c;
   a = s * (b - c);
   a.alias() = a + b;
+  
+  a += b;
+  a += b + b;
+  a.xpr() -= b;
+  a.xpr() -= b + b;
 }
 
 void EigenTest::testVectorOps()