mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-01-18 14:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

add zero() and identity() static methods, update unit-tests

Browse Source
This commit is contained in:
Benoit Jacob 2007-10-14 09:18:18 +00:00
parent 0f2df4b202
commit 6c8f159635
7 changed files with 167 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core.h
View File

@ -27,6 +27,8 @@ namespace Eigen {
#include "Core/Trace.h"
#include "Core/Dot.h"
#include "Core/Random.h"
#include "Core/Zero.h"
#include "Core/Identity.h"
#include "Core/Fuzzy.h"
} // namespace Eigen

2
src/Core/Fuzzy.h
View File

@ -33,6 +33,7 @@ bool Object<Scalar, Derived>::isApprox(
const typename NumTraits<Scalar>::Real& prec
) const
{
assert(rows() == other.rows() && cols() == other.cols());
if(IsVector)
{
return((*this - other).norm2() <= std::min(norm2(), other.norm2()) * prec * prec);
@ -73,6 +74,7 @@ bool Object<Scalar, Derived>::isMuchSmallerThan(
const typename NumTraits<Scalar>::Real& prec
) const
{
assert(rows() == other.rows() && cols() == other.cols());
if(IsVector)
{
return(norm2() <= other.norm2() * prec * prec);

65
src/Core/Identity.h Normal file
View File

@ -0,0 +1,65 @@
// 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_IDENTITY_H
#define EI_IDENTITY_H
template<typename MatrixType> class Identity
: public Object<typename MatrixType::Scalar, Identity<MatrixType> >
{
public:
typedef typename MatrixType::Scalar Scalar;
friend class Object<Scalar, Identity<MatrixType> >;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
Identity(int rows, int cols) : m_rows(rows), m_cols(cols)
{
assert(rows > 0 && cols > 0);
}
private:
Identity& _ref() { return *this; }
const Identity& _constRef() const { return *this; }
int _rows() const { return m_rows; }
int _cols() const { return m_cols; }
Scalar _read(int row, int col) const
{
return static_cast<Scalar>(row == col);
}
protected:
int m_rows, m_cols;
};
template<typename Scalar, typename Derived>
Identity<Derived> Object<Scalar, Derived>::identity(int rows, int cols)
{
return Identity<Derived>(rows, cols);
}
#endif // EI_IDENTITY_H

4
src/Core/Object.h
View File

@ -113,6 +113,10 @@ template<typename Scalar, typename Derived> class Object
static Eval<Random<Derived> >
random(int rows = RowsAtCompileTime, int cols = ColsAtCompileTime);
static Zero<Derived>
zero(int rows = RowsAtCompileTime, int cols = ColsAtCompileTime);
static Identity<Derived>
identity(int rows = RowsAtCompileTime, int cols = ColsAtCompileTime);
template<typename OtherDerived>
bool isApprox(

2
src/Core/Util.h
View File

@ -56,6 +56,8 @@ template<typename Lhs, typename Rhs> class Difference;
template<typename Lhs, typename Rhs> class Product;
template<typename MatrixType> class ScalarMultiple;
template<typename MatrixType> class Random;
template<typename MatrixType> class Zero;
template<typename MatrixType> class Identity;
template<typename ExpressionType> class Eval;
template<typename T> struct ForwardDecl

67
src/Core/Zero.h Normal file
View File

@ -0,0 +1,67 @@
// 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_ZERO_H
#define EI_ZERO_H
template<typename MatrixType> class Zero
: public Object<typename MatrixType::Scalar, Zero<MatrixType> >
{
public:
typedef typename MatrixType::Scalar Scalar;
friend class Object<Scalar, Zero<MatrixType> >;
static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime;
Zero(int rows, int cols) : m_rows(rows), m_cols(cols)
{
assert(rows > 0 && cols > 0);
}
private:
Zero& _ref() { return *this; }
const Zero& _constRef() const { return *this; }
int _rows() const { return m_rows; }
int _cols() const { return m_cols; }
Scalar _read(int row, int col) const
{
EI_UNUSED(row);
EI_UNUSED(col);
return static_cast<Scalar>(0);
}
protected:
int m_rows, m_cols;
};
template<typename Scalar, typename Derived>
Zero<Derived> Object<Scalar, Derived>::zero(int rows, int cols)
{
return Zero<Derived>(rows, cols);
}
#endif // EI_ZERO_H

33
test/basicstuff.cpp
View File

@ -34,26 +34,38 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
MatrixType m1 = MatrixType::random(rows, cols),
m2 = MatrixType::random(rows, cols),
m3;
VectorType v1 = VectorType::random(rows, 1),
v2 = VectorType::random(rows, 1);
m3,
mzero = MatrixType::zero(rows, cols),
identity = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::identity(rows, rows),
square = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::random(rows, rows);
VectorType v1 = VectorType::random(rows),
v2 = VectorType::random(rows),
vzero = VectorType::zero(rows);
Scalar s1 = NumTraits<Scalar>::random(),
s2 = NumTraits<Scalar>::random();
QVERIFY(v1.isApprox(v1));
QVERIFY((v1-v1).isMuchSmallerThan(v1));
QVERIFY((v1-v1).isMuchSmallerThan(v1.norm()));
QVERIFY(!v1.isApprox(2*v1));
QVERIFY(vzero.isMuchSmallerThan(v1));
QVERIFY(vzero.isMuchSmallerThan(v1.norm()));
QVERIFY(!v1.isMuchSmallerThan(v1));
QVERIFY(m1.isApprox(m1));
QVERIFY((m1-m1).isMuchSmallerThan(m1));
QVERIFY(!m1.isApprox(2*m1));
QVERIFY(mzero.isMuchSmallerThan(m1));
QVERIFY(!m1.isMuchSmallerThan(m1));
QVERIFY(vzero.isApprox(v1-v1));
QVERIFY(mzero.isApprox(m1-m1));
QVERIFY((m1+m1).isApprox(2 * m1));
QVERIFY((m1 * s1).isApprox(s1 * m1));
QVERIFY(((m1 + m2) * s1).isApprox(s1 * m1 + s1 * m2));
QVERIFY(((s1 + s2) * m1).isApprox(m1 * s1 + m1 * s2));
m3 = m2;
QVERIFY((m3 += m1).isApprox(m1 + m2));
m3 = m2;
@ -70,6 +82,11 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
m3 *= (m1.transpose() * m2);
QVERIFY(m3.isApprox(m1 * (m1.transpose() * m2)));
QVERIFY(m3.isApprox(m1.lazyProduct(m1.transpose() * m2)));
QVERIFY(m1.isApprox(identity * m1));
QVERIFY(v1.isApprox(identity * v1));
QVERIFY((square * (m1 + m2)).isApprox(square * m1 + square * m2));
}
void EigenTest::testBasicStuff()