[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Toon-members] TooN helpers.h internal/matrix.hh test/test3.cc
|
From: |
Edward Rosten |
|
Subject: |
[Toon-members] TooN helpers.h internal/matrix.hh test/test3.cc |
|
Date: |
Wed, 18 Feb 2009 18:10:39 +0000 |
CVSROOT: /cvsroot/toon
Module name: TooN
Changes by: Edward Rosten <edrosten> 09/02/18 18:10:39
Modified files:
. : helpers.h
internal : matrix.hh
Added files:
test : test3.cc
Log message:
Basic ?= operators for Matrix. Really basic entries in helpers.h
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/helpers.h?cvsroot=toon&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/matrix.hh?cvsroot=toon&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/TooN/test/test3.cc?cvsroot=toon&rev=1.1
Patches:
Index: helpers.h
===================================================================
RCS file: /cvsroot/toon/TooN/helpers.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- helpers.h 7 Jul 2008 13:06:04 -0000 1.25
+++ helpers.h 18 Feb 2009 18:10:37 -0000 1.26
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2005 Tom Drummond
+ Copyright (C) 2005,2009 Tom Drummond, E. Rosten
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,519 +17,43 @@
Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __NUMHELPERS_H
-#define __NUMHELPERS_H
+#ifndef TOON_INCLUDE_HELPERS_H
+#define TOON_INCLUDE_HELPERS_H
#include <TooN/TooN.h>
+#include <cmath>
-#ifndef TOON_NO_NAMESPACE
namespace TooN {
-#endif
-
-//////////// CONTENTS OF THIS FILE ///////////
-
-inline Vector<1> makeVector(double x) { double vals[] = {x}; return
Vector<1>(vals); }
-inline Vector<2> makeVector(double x0, double x1) { double vals[] = {x0,x1};
return Vector<2>(vals); }
-inline Vector<3> makeVector(double x0, double x1, double x2) { double vals[] =
{x0,x1,x2}; return Vector<3>(vals); }
-inline Vector<4> makeVector(double x0, double x1, double x2, double x3) {
double vals[] = {x0,x1,x2,x3}; return Vector<4>(vals); }
-inline Vector<5> makeVector(double x0, double x1, double x2, double x3, double
x4) { double vals[] = {x0,x1,x2,x3,x4}; return Vector<5>(vals); }
-inline Vector<6> makeVector(double x0, double x1, double x2, double x3, double
x4, double x5) { double vals[] = {x0,x1,x2,x3,x4,x5}; return Vector<6>(vals); }
-
-// normalizations (note US spelling)
-template <class Accessor> inline void normalize(VectorBase<Accessor>& v);
-template <class Accessor> inline void normalize_last(VectorBase<Accessor>& v);
-template <class Accessor> inline void
normalize_but_last(VectorBase<Accessor>& v);
-
-// Project
-template <int Size, class Accessor> Vector<Size-1> project(const
FixedVector<Size,Accessor>& v);
-template <class Accessor> Vector<> project(const
DynamicVector<Accessor>& v);
-
-// Unproject
-template <int Size, class Accessor> Vector<Size+1> unproject(const
FixedVector<Size,Accessor>& v);
-template <class Accessor> Vector<> unproject(const
DynamicVector<Accessor>& v);
-
-// Extend - same as unproject, but with 0 instead of 1
-template <int Size, class Accessor> Vector<Size+1> extend(const
FixedVector<Size,Accessor>& v);
-template <class Accessor> Vector<> extend(const
DynamicVector<Accessor>& v);
-
-
-// unit vector
-template <int N, class A> Vector<N> unit(const FixedVector<N,A>& v) { return v
/ sqrt(v*v); }
-template <int N, class A> double norm_sq(const FixedVector<N,A>& v) { return
v*v; }
-
-// as_vector
-template<int Size> inline FixedVector<Size,FixedVAccessor<Size,Stack<Size> >
>& as_vector(double* data);
-template<int Size> inline const
FixedVector<Size,FixedVAccessor<Size,Stack<Size> > >& as_vector(const double*
data);
-
-// set a matrix to (a multiple of) the Identity
-template <class Accessor> void Identity(MatrixBase<Accessor>& M, const double
factor=1);
- template <int N> Matrix<N> Identity(const double factor=1) {
- Matrix<N> M;
- Identity(M,factor);
- return M;
- }
-
-// symmetrize a matrix
-template <class Accessor> void Symmetrize(MatrixBase<Accessor>& m);
-
-// transpose a matrix
-template <class Accessor> void Transpose(MatrixBase<Accessor>& m);
-
-// set a matrix to Zero
-template <class Accessor> void Zero(MatrixBase<Accessor>&m);
-
-// set a vector to zero
-template <class Accessor> inline void Zero(VectorBase<Accessor>& v);
-
-// Fill a matrix with a certain value
-template <class Accessor> void Fill(MatrixBase<Accessor>&m, double value);
-// Fill a vector with a certain value
-template <class Accessor> inline void Fill(VectorBase<Accessor>& v, double
value);
- template <class T, int N> struct ZeroBlock {
- static const T data[N];
- };
-
- template <class T, int N> const T ZeroBlock<T,N>::data[N] = {0};
-
- template <int M, int N> inline const Matrix<M,N>& zeros() { return
*reinterpret_cast<const Matrix<M,N>*>(ZeroBlock<double,M*N>::data); }
- template <int N> inline const Vector<N>& zeros() { return
*reinterpret_cast<const Vector<N>*>(ZeroBlock<double,N>::data); }
-
- inline const Matrix<> zeros(int m, int n) {
- Matrix<> z(m,n);
- Zero(z);
- return z;
- }
-
-template <class A> inline double determinant(const FixedMatrix<2,2,A>& M)
+template<int Size, class Precision, class Base> void Zero(Vector<Size,
Precision, Base>& v)
{
- return M[0][0] * M[1][1] - M[0][1] * M[1][0];
+ for(int i=0; i < v.size(); i++)
+ v[i]= 0;
}
-template <class A> inline Matrix<2> inverse(const FixedMatrix<2,2,A>& M)
+template<int Rows, int Cols, class Precision, class Base> void
Zero(Matrix<Rows, Cols, Precision, Base>& m)
{
- const double det = determinant(M);
- assert(det != 0);
- Matrix<2> inv;
- double rdet = 1.0/det;
- inv[0][0] = M[1][1] * rdet;
- inv[0][1] = -M[0][1] * rdet;
- inv[1][0] = -M[1][0] * rdet;
- inv[1][1] = M[0][0] * rdet;
- return inv;
- }
-
-template <class A> inline double trace(const MatrixBase<A>& M)
-{
- assert(M.num_rows() == M.num_cols());
- double tr = 0;
- for (int i=0; i<M.num_rows(); ++i)
- tr += M[i][i];
- return tr;
+ for(int i=0; i < m.num_rows(); i++)
+ for(int j=0; j < m.num_cols(); j++)
+ m[i][j] = 0;
}
- ////////////////////////////-//////////////////
-
-template <int N, class A> void normalize(FixedVector<N,A>& v)
+template<int Size, class Precision, class Base> void Fill(Vector<Size,
Precision, Base>& v, const Precision& p)
{
- v *= 1.0/sqrt(v*v);
-}
-
-// normalizations (note US spelling)
-template <class Accessor>
-inline void normalize(VectorBase<Accessor>& v){
- double sumSq = v[0]*v[0];
- for (int i=1; i<v.size(); i++)
- sumSq += v[i]*v[i];
- double factor = 1.0/sqrt(sumSq);
- for (int i=0; i<v.size(); i++)
- v[i] *= factor;
-}
-
-template <class Accessor>
-inline void normalize_last(VectorBase<Accessor>& v){
- const double scalefac = 1/v[v.size()-1];
- for(int i=0; i<v.size(); i++){
- v[i]*=scalefac;
- }
-}
-
-template <class Accessor>
-inline void normalize_but_last(VectorBase<Accessor>& v){
- double sumsq=0;
- for(int i=0; i<v.size()-1; i++){
- sumsq += v[i] * v[i];
- }
- const double scalefac = 1/sqrt(sumsq);
- for(int i=0; i<v.size(); i++){
- v[i]*=scalefac;
- }
-}
-
-
-// Project
-template <int Size, class Accessor>
-struct FixedVProject {
- inline static void eval(Vector<Size-1>& ret, const
FixedVector<Size,Accessor>& v){
- const double scalefac = 1/v[Size-1];
- for(int i=0; i<Size-1; i++){
- ret[i]=v[i]*scalefac;
- }
- }
-};
-
- template <int Size, class Accessor> inline
-Vector<Size-1> project(const FixedVector<Size,Accessor>& v){
- return Vector<Size-1>(v,Operator<FixedVProject<Size,Accessor> >());
+ for(int i=0; i < v.size(); i++)
+ v[i]= p;
}
-template <class Accessor>
-struct DynamicVProject : public VSizer{
- inline static void eval(Vector<>& ret, const DynamicVector<Accessor>& v){
- const int size = v.size();
- set_size(ret,size-1);
- const double scalefac = 1/v[size-1];
- for(int i=0; i<size-1; i++){
- ret[i]=v[i]*scalefac;
- }
- }
-};
-
-template <class Accessor>
-Vector<> project(const DynamicVector<Accessor>& v){
- return Vector<>(v,Operator<DynamicVProject<Accessor> >());
-}
-
-// Unproject
-template <int Size, class Accessor>
-struct FixedVUnproject {
- inline static void eval(Vector<Size+1>& ret, const
FixedVector<Size,Accessor>& v){
- ret.template slice<0,Size>() = v;
- ret[Size]=1;
- }
-};
-
-template <int Size, class Accessor>
-Vector<Size+1> unproject(const FixedVector<Size,Accessor>& v){
- return Vector<Size+1>(v,Operator<FixedVUnproject<Size,Accessor> >());
-}
-
-template <class Accessor>
-struct DynamicVUnproject : public VSizer{
- inline static void eval(Vector<>& ret, const DynamicVector<Accessor>& v){
- const int size = v.size();
- set_size(ret,size+1);
- v.copy_into(ret.get_data_ptr());
- ret[size]=1;
- }
-};
-
-template <class Accessor>
-Vector<> unproject(const DynamicVector<Accessor>& v){
- return Vector<>(v,Operator<DynamicVUnproject<Accessor> >());
-}
-
-// Extend
-template <int Size, class Accessor>
-struct FixedVExtend {
- inline static void eval(Vector<Size+1>& ret, const
FixedVector<Size,Accessor>& v){
- ret.template slice<0,Size>() = v;
- ret[Size]=0;
- }
-};
-
-template <int Size, class Accessor>
-Vector<Size+1> extend(const FixedVector<Size,Accessor>& v){
- return Vector<Size+1>(v,Operator<FixedVExtend<Size,Accessor> >());
-}
-
-template <class Accessor>
-struct DynamicVExtend : public VSizer{
- inline static void eval(Vector<>& ret, const DynamicVector<Accessor>& v){
- const int size = v.size();
- set_size(ret,size+1);
- v.copy_into(ret.get_data_ptr());
- ret[size]=0;
- }
-};
-
-template <class Accessor>
-Vector<> extend(const DynamicVector<Accessor>& v){
- return Vector<>(v,Operator<DynamicVExtend<Accessor> >());
-}
-
-
-// as_vector<Size>(double*) to convert a pointer to
-// an array of data into a Vector<Size>
-template<int Size>
-inline FixedVector<Size,FixedVAccessor<Size,Stack<Size> > >&
as_vector(double* data){
- return reinterpret_cast<FixedVector<Size,FixedVAccessor<Size,Stack<Size> >
>&>(*data);
-}
-
-template<int Size>
-inline const FixedVector<Size,FixedVAccessor<Size,Stack<Size> > >&
as_vector(const double* data){
- return reinterpret_cast<const
FixedVector<Size,FixedVAccessor<Size,Stack<Size> > >&>(*data);
-}
-
-
-// set a matrix to (a multiple of) the Identity
-template <class Accessor>
- void Identity(MatrixBase<Accessor>& M, const double factor){
- assert(M.num_rows() == M.num_cols());
- for(int i=0; i<M.num_rows(); i++){
- for(int j=0; j<M.num_cols(); j++){
- M(i,j)=0;
- }
- M(i,i)=factor;
- }
-}
-
-
-// symmetrize a matrix
-template <class Accessor>
-void Symmetrize(MatrixBase<Accessor>& m){
- assert(m.num_rows()==m.num_cols());
- for(int r=0; r<m.num_rows()-1; r++){
- for(int c=r; c<m.num_rows(); c++){
- m(c,r) = m(r,c);// = 0.5*(m(r,c)+m(c,r));
- }
- }
-}
-
-// Transpose a matrix
-template<class Accessor>
-void Transpose(MatrixBase<Accessor>& m){
- assert(m.num_rows() == m.num_cols());
- for(int r=0; r<m.num_rows()-1; r++){
- for(int c=r; c<m.num_rows(); c++){
- double temp = m(r,c);
- m(r,c) = m(c,r);
- m(c,r) = temp;
- }
- }
-}
-
-// set a Matrix to zero
-template <class Accessor> void Zero(MatrixBase<Accessor>&m){
- for(int r=0; r<m.num_rows(); r++){
- for(int c=0; c<m.num_cols(); c++){
- m(r,c) = 0;
- }
- }
-}
-
-// set a vector to zero
-template <class Accessor> inline void Zero(VectorBase<Accessor>& v){
- for(int i=0; i<v.size(); i++){
- v[i]=0;
- }
+template<int Rows, int Cols, class Precision, class Base> void
Zero(Matrix<Rows, Cols, Precision, Base>& m, const Precision& p)
+{
+ for(int i=0; i < m.num_rows(); i++)
+ for(int j=0; j < m.num_cols(); j++)
+ m[i][j] = p;
}
-// Fill a matrix with a certain value
-template <class Accessor> void Fill(MatrixBase<Accessor>&m, double value){
- for(int r=0; r<m.num_rows(); r++){
- for(int c=0; c<m.num_cols(); c++){
- m(r,c) = value;
- }
- }
-}
-// Fill a vector with a certain value
-template <class Accessor> inline void Fill(VectorBase<Accessor>& v, double
value){
- for(int i=0; i<v.size(); i++){
- v[i]=value;
- }
-}
- namespace util {
- template <class F, int R, int N, class A1, class A2, class A3> inline
void transformCovariance(const FixedMatrix<R,N,A1>& A, const
FixedMatrix<N,N,A2>& B, FixedMatrix<R,R,A3>& M)
- {
- for (int i=0; i<R; ++i) {
- const Vector<N> ABi = B * A[i];
- F::eval(M[i][i],ABi * A[i]);
- for (int j=i+1; j<R; ++j) {
- const double v = ABi * A[j];
- F::eval(M[i][j], v);
- F::eval(M[j][i], v);
- }
- }
- }
-
- template <class F, int R, int N, class A1, class A2, class A3> inline
void transformCovarianceUpper(const FixedMatrix<R,N,A1>& A, const
FixedMatrix<N,N,A2>& B, FixedMatrix<R,R,A3>& M)
- {
- for (int i=0; i<R; ++i) {
- const Vector<N> ABi = B * A[i];
- for (int j=i; j<R; ++j)
- F::eval(M[i][j], ABi * A[j]);
- }
- }
-
- template <class F, int R, int N, class A1, class A2, class A3> inline
void transformCovarianceUpper(const FixedMatrix<R,N,A1>& A, const
FixedMatrix<N,N,A2>& B, DynamicMatrix<A3> & M)
- {
- assert(M.num_rows() == R && M.num_cols() == R);
- for (int i=0; i<R; ++i) {
- const Vector<N> ABi = B * A[i];
- for (int j=i; j<R; ++j)
- F::eval(M[i][j], ABi * A[j]);
- }
- }
-
- template <class F, class A1, class M2, class M3> inline void
transformCovarianceUpper(const DynamicMatrix<A1>& A, const M2 & B, M3 & M)
- {
- const int R = A.num_rows();
- const int N = A.num_cols();
- assert(M.num_rows() == R &&
- M.num_cols() == R &&
- B.num_rows() == N &&
- B.num_cols() == N);
- for (int i=0; i<R; ++i) {
- const Vector<> ABi = B * A[i];
- for (int j=i; j<R; ++j)
- F::eval(M[i][j], ABi * A[j]);
- }
- }
-
- template <class F, class A1, class M2, class MatM> inline void
transformCovariance(const DynamicMatrix<A1> & A, const M2 & B, MatM& M)
- {
- const int R = A.num_rows();
- const int N = A.num_cols();
- assert(M.num_rows() == R &&
- M.num_cols() == R &&
- B.num_rows() == N &&
- B.num_cols() == N);
- for (int i=0; i<R; ++i) {
- const Vector<> ABi = B * A[i];
- F::eval(M[i][i], ABi * A[i]);
- for (int j=i+1; j<R; ++j){
- const double v = ABi * A[j];
- F::eval(M[j][i], v);
- F::eval(M[i][j], v);
- }
- }
- }
-
- template <class F, int R, int N, class A1, class A2, class MatM> inline
void transformCovariance(const FixedMatrix<R,N,A1> & A, const DynamicMatrix<A2>
& B, MatM& M)
- {
- assert(M.num_rows() == R &&
- M.num_cols() == R &&
- B.num_rows() == N &&
- B.num_cols() == N);
- for (int i=0; i<R; ++i) {
- const Vector<N> ABi = B * A[i];
- F::eval(M[i][i], ABi * A[i]);
- for (int j=i+1; j<R; ++j){
- const double v = ABi * A[j];
- F::eval(M[j][i], v);
- F::eval(M[i][j], v);
- }
- }
- }
-
- template <class F, int R, int N, class A1, class A2, class A3> inline
void transformCovariance(const FixedMatrix<R,N,A1> & A, const
FixedMatrix<N,N,A2> & B, DynamicMatrix<A3> & M)
- {
- assert(M.num_rows() == R &&
- M.num_cols() == R );
- for (int i=0; i<R; ++i) {
- const Vector<N> ABi = B * A[i];
- F::eval(M[i][i], ABi * A[i]);
- for (int j=i+1; j<R; ++j){
- const double v = ABi * A[j];
- F::eval(M[j][i], v);
- F::eval(M[i][j], v);
- }
- }
- }
-
- }
-
- template <class A1, class A2> inline Matrix<> transformCovariance(const
DynamicMatrix<A1> & A, const A2 & B)
- {
- Matrix<> M(A.num_rows(), A.num_rows());
- util::transformCovariance<util::Assign>(A,B,M);
- return M;
- }
-
-template <int R, int N, class A1, class A2> inline Matrix<R>
transformCovariance(const FixedMatrix<R, N, A1> & A, const DynamicMatrix<A2> &
B)
- {
- assert(B.num_cols() == N && B.num_rows() == N);
- Matrix<R> M;
- util::transformCovariance<util::Assign>(A,B,M);
- return M;
- }
-
- template <int R, int N, class Accessor1, class Accessor2> inline Matrix<R>
transformCovariance(const FixedMatrix<R,N,Accessor1>& A, const
FixedMatrix<N,N,Accessor2>& B)
- {
- Matrix<R> M;
- util::transformCovariance<util::Assign>(A,B,M);
- return M;
- }
-
- template <class MatA, class MatB, class MatM> inline void
transformCovariance(const MatA& A, const MatB& B, MatM& M)
- {
- util::transformCovariance<util::Assign>(A,B,M);
- }
-
- template <class F, class MatA, class MatB, class MatM> void
transformCovariance(const MatA& A, const MatB& B, MatM& M)
- {
- util::transformCovariance<F>(A,B,M);
- }
-
- template <int M, int N, int C, class A, class B, class Mat> inline void
add_product(const FixedMatrix<M,N,A>& Ma, const FixedMatrix<N,C,B>& Mb, Mat& Mc)
- {
- util::matrix_multiply<util::PlusEquals,M,N,C>(Ma,Mb,Mc);
- }
-
- template <int M, int N, int C, class A, class B, class Mat> inline void
subtract_product(const FixedMatrix<M,N,A>& Ma, const FixedMatrix<N,C,B>& Mb,
Mat& Mc)
- {
- util::matrix_multiply<util::MinusEquals,M,N,C>(Ma,Mb,Mc);
- }
-
- template <int M, int N, class A, class B, class Vec> inline void
add_product(const FixedMatrix<M,N,A>& m, const FixedVector<N,B>& v, Vec& r)
- {
- util::matrix_multiply<util::PlusEquals,M,N,1>(m,v.as_col(),r.as_col());
- }
-
- template <int M, int N, class A, class B, class Vec> inline void
subtract_product(const FixedMatrix<M,N,A>& m, const FixedVector<N,B>& v, Vec& r)
- {
- util::matrix_multiply<util::MinusEquals,M,N,1>(m,v.as_col(),r.as_col());
- }
-
- template <class A, class B, class C> inline void add_product(const
DynamicMatrix<A>& Ma, const DynamicMatrix<B>& Mb, DynamicMatrix<C>& r)
- {
- const int M=Ma.num_rows();
- const int N=Ma.num_cols();
- const int R=Mb.num_cols();
- for (int i=0; i<M; ++i)
- for (int j=0; j<R; ++j) {
- double sum = 0;
- for (int k=0; k<N; ++k)
- sum += Ma(i,k)*Mb(k,j);
- r(i,j) += sum;
- }
- }
-
- template <class A, class B, class Vec> inline void add_product(const
DynamicMatrix<A>& Ma, const DynamicVector<B>& Mb, Vec & r)
- {
- const int M=Ma.num_rows();
- const int N=Ma.num_cols();
- assert(N == Mb.size());
- for (int i=0; i<M; ++i) {
- double sum = 0;
- for (int k=0; k<N; ++k)
- sum += Ma(i,k)*Mb[k];
- r[i] += sum;
- }
- }
-
- template <int M, int N, int C, class A1, class A2, class Mat> void
matrix_multiply(const FixedMatrix<M,N,A1>& A, const FixedMatrix<N,C,A2>& B,
Mat& R)
- {
- util::matrix_multiply<M,N,C>(A,B,R);
- }
-
-#ifndef TOON_NO_NAMESPACE
}
#endif
-
-#endif
Index: internal/matrix.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/matrix.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- internal/matrix.hh 7 Feb 2009 15:32:56 -0000 1.7
+++ internal/matrix.hh 18 Feb 2009 18:10:38 -0000 1.8
@@ -3,6 +3,9 @@
{
private:
using Layout::template Layout<Rows, Cols, Precision>::my_data;
+ using Layout::template Layout<Rows, Cols, Precision>::num_rows;
+ using Layout::template Layout<Rows, Cols, Precision>::num_cols;
+
public:
//Use Tom's sneaky constructor hack...
@@ -23,11 +26,121 @@
:Layout::template Layout<Rows,Cols,Precision>(rows, cols)
{}
- Precision* data() {
- return my_data;
+
+ //See vector.hh and allocator.hh for details about why the
+ //copy constructor should be default.
+
+ // constructors to allow return value optimisations
+ // construction from 1-ary operator
+ template <class T, class Op>
+ inline Matrix(const T& arg, const Operator<Op>&, int rows, int cols)
+ :Layout::template Layout<Rows,Cols,Precision>(rows, cols)
+ {
+ Op::eval(*this,arg);
+ }
+
+ // constructor from 2-ary operator
+ template <class LHS, class RHS, class Op>
+ inline Matrix(const LHS& lhs, const RHS& rhs, const Operator<Op>&, int
rows, int cols)
+ :Layout::template Layout<Rows,Cols,Precision>(rows, cols)
+ {
+ Op::eval(*this,lhs,rhs);
+ }
+
+ // constructor from arbitrary vector
+ template<int Rows2, int Cols2, typename Precision2, typename Base2>
+ inline Matrix(const Matrix<Rows2, Cols2,Precision2,Base2>& from)
+ :Layout::template Layout<Rows,Cols,Precision>(from.num_rows(),
from.num_cols())
+ {
+ operator=(from);
+ }
+
+ // operator = from copy
+ inline Matrix& operator= (const Matrix& from)
+ {
+ SizeMismatch<Rows, Rows>::test(num_rows(), from.num_rows());
+ SizeMismatch<Cols, Cols>::test(num_cols(), from.num_cols());
+
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] = from[r][c];
+
+ return *this;
}
- const Precision* data() const {
- return my_data;
+ // operator =
+ template<int Rows2, int Cols2, typename Precision2, typename Base2>
+ Matrix& operator= (const Matrix<Rows2, Cols2, Precision2, Base2>& from)
+ {
+ SizeMismatch<Rows, Rows2>::test(num_rows(), from.num_rows());
+ SizeMismatch<Cols, Cols2>::test(num_cols(), from.num_cols());
+
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] = from[r][c];
+
+ return *this;
+ }
+
+ Matrix& operator+=(const Precision& rhs)
+ {
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] += rhs;
+
+ return *this;
+ }
+
+ Matrix& operator-=(const Precision& rhs)
+ {
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] -= rhs;
+
+ return *this;
+ }
+
+ Matrix& operator*=(const Precision& rhs)
+ {
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] *= rhs;
+
+ return *this;
+ }
+
+ Matrix& operator/=(const Precision& rhs)
+ {
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] /= rhs;
+
+ return *this;
+ }
+
+ template<int Rows2, int Cols2, typename Precision2, typename Base2>
+ Matrix& operator+= (const Matrix<Rows2, Cols2, Precision2, Base2>& from)
+ {
+ SizeMismatch<Rows, Rows2>::test(num_rows(), from.num_rows());
+ SizeMismatch<Cols, Cols2>::test(num_cols(), from.num_cols());
+
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] += from[r][c];
+
+ return *this;
+ }
+
+ template<int Rows2, int Cols2, typename Precision2, typename Base2>
+ Matrix& operator-= (const Matrix<Rows2, Cols2, Precision2, Base2>& from)
+ {
+ SizeMismatch<Rows, Rows2>::test(num_rows(), from.num_rows());
+ SizeMismatch<Cols, Cols2>::test(num_cols(), from.num_cols());
+
+ for(int r=0; r < num_rows(); r++)
+ for(int c=0; c < num_rows(); c++)
+ (*this)[r][c] -= from[r][c];
+
+ return *this;
}
};
Index: test/test3.cc
===================================================================
RCS file: test/test3.cc
diff -N test/test3.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/test3.cc 18 Feb 2009 18:10:39 -0000 1.1
@@ -0,0 +1,29 @@
+#include <TooN/TooN.h>
+#include <TooN/helpers.h>
+
+using namespace std;
+using namespace TooN;
+
+template<class C> void type(const C&)
+{
+ cout << __PRETTY_FUNCTION__ << endl;
+}
+
+int main()
+{
+ Matrix<3> m1;
+ Matrix<3> m2;
+
+ Zero(m1);
+ Zero(m2);
+
+ m1.slice<0,0,2,2>()+=3;
+ m2.slice<1,1,2,2>()+=2;
+
+ cout << m1 << endl;
+ cout << m2 << endl;
+
+ m1+=m2;
+ cout << m1 << endl;
+}
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Toon-members] TooN helpers.h internal/matrix.hh test/test3.cc,
Edward Rosten <=