Add matrix transposition

This commit is contained in:
Benoit Jacob 2007-10-01 18:20:35 +00:00
parent f5f45d751c
commit c768a44909
5 changed files with 78 additions and 1 deletions

View File

@ -25,10 +25,10 @@ int main(int, char **)
m2.block(2,3,2,3) = m - m;
cout << "Now the 4x4 matrix m2 is:" << endl << m2 << endl;
cout << "The central 2x2 block of m2 is:" << endl << m2.block(1,2,1,2) << endl;
cout << "Row 0 of m2 is:" << endl << m2.row(0) << endl;
cout << "The third element in that row is " << m2.row(0)[2] << endl;
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;
return 0;

View File

@ -30,5 +30,6 @@
#include "internal/Column.h"
#include "internal/Block.h"
#include "internal/Minor.h"
#include "internal/Transpose.h"
#endif // EI_MANIP_H

View File

@ -94,6 +94,7 @@ template<typename Scalar, typename Derived> class EiObject
EiColumn<Derived> col(int i);
EiMinor<Derived> minor(int row, int col);
EiBlock<Derived> block(int startRow, int endRow, int startCol, int endCol);
EiTranspose<Derived> transpose();
template<typename OtherDerived>
EiMatrixProduct<Derived, OtherDerived>

74
src/internal/Transpose.h Normal file
View File

@ -0,0 +1,74 @@
// 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_TRANSPOSE_H
#define EI_TRANSPOSE_H
template<typename MatrixType> class EiTranspose
: public EiObject<typename MatrixType::Scalar, EiTranspose<MatrixType> >
{
public:
typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::Ref MatRef;
friend class EiObject<Scalar, EiTranspose<MatrixType> >;
static const int RowsAtCompileTime = MatrixType::ColsAtCompileTime,
ColsAtCompileTime = MatrixType::RowsAtCompileTime;
EiTranspose(const MatRef& matrix) : m_matrix(matrix) {}
EiTranspose(const EiTranspose& other)
: m_matrix(other.m_matrix) {}
EI_INHERIT_ASSIGNMENT_OPERATORS(EiTranspose)
private:
EiTranspose& _ref() { return *this; }
const EiTranspose& _constRef() const { return *this; }
int _rows() const { return m_matrix.cols(); }
int _cols() const { return m_matrix.rows(); }
Scalar& _write(int row, int col)
{
return m_matrix.write(col, row);
}
Scalar _read(int row, int col) const
{
return m_matrix.read(col, row);
}
protected:
MatRef m_matrix;
};
template<typename Scalar, typename Derived>
EiTranspose<Derived>
EiObject<Scalar, Derived>::transpose()
{
return EiTranspose<Derived>(static_cast<Derived*>(this)->ref());
}
#endif // EI_TRANSPOSE_H

View File

@ -48,6 +48,7 @@ template<typename MatrixType> class EiRow;
template<typename MatrixType> class EiColumn;
template<typename MatrixType> class EiMinor;
template<typename MatrixType> class EiBlock;
template<typename MatrixType> class EiTranspose;
template<typename Lhs, typename Rhs> class EiSum;
template<typename Lhs, typename Rhs> class EiDifference;
template<typename Lhs, typename Rhs> class EiMatrixProduct;