From 2aff3c664540a7f34d04b8d1933068058b220388 Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Thu, 15 Nov 2012 10:18:20 +0000
Subject: [PATCH] reverted to CBs HEAD
---
miscmaths.cc | 301 +++++++++++++++++++++++++++++++++++++--------------
miscmaths.h | 17 ++-
2 files changed, 233 insertions(+), 85 deletions(-)
diff --git a/miscmaths.cc b/miscmaths.cc
index 33abfb8..e48ae7e 100644
--- a/miscmaths.cc
+++ b/miscmaths.cc
@@ -40,7 +40,6 @@ namespace MISCMATHS {
}
-
float Sinc(const float x) {
if (fabs(x)<1e-9) {
return 1-x*x*M_PI*M_PI/6.0;
@@ -1413,6 +1412,15 @@ ReturnMatrix abs(const Matrix& mat)
return res;
}
+void abs_econ(Matrix& mat)
+{
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ mat(mr,mc)=std::abs(mat(mr,mc));
+ }
+ }
+}
+
ReturnMatrix sqrt(const Matrix& mat)
{
Matrix res = mat;
@@ -1431,6 +1439,21 @@ ReturnMatrix sqrt(const Matrix& mat)
return res;
}
+void sqrt_econ(Matrix& mat)
+{
+ bool neg_flag = false;
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ if(mat(mr,mc)<0){ neg_flag = true; }
+ mat(mr,mc)=std::sqrt(std::abs(mat(mr,mc)));
+ }
+ }
+ if(neg_flag){
+ //cerr << " Matrix contained negative elements" << endl;
+ //cerr << " return sqrt(abs(X)) instead" << endl;
+ }
+}
+
ReturnMatrix sqrtm(const Matrix& mat)
{
Matrix res, tmpU, tmpV;
@@ -1459,6 +1482,21 @@ ReturnMatrix log(const Matrix& mat)
return res;
}
+void log_econ(Matrix& mat)
+{
+ bool neg_flag = false;
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ if(mat(mr,mc)<0){ neg_flag = true; }
+ mat(mr,mc)=std::log(std::abs(mat(mr,mc)));
+ }
+ }
+ if(neg_flag){
+ // cerr << " Matrix contained negative elements" << endl;
+ // cerr << " return log(abs(X)) instead" << endl;
+ }
+}
+
ReturnMatrix exp(const Matrix& mat)
{
Matrix res = mat;
@@ -1471,6 +1509,15 @@ ReturnMatrix exp(const Matrix& mat)
return res;
}
+void exp_econ(Matrix& mat)
+{
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ mat(mr,mc)=std::exp(mat(mr,mc));
+ }
+ }
+}
+
// optimised code for calculating matrix exponential
ReturnMatrix expm(const Matrix& mat){
float nmat = sum(mat).Maximum();
@@ -1550,6 +1597,15 @@ ReturnMatrix tanh(const Matrix& mat)
return res;
}
+void tanh_econ(Matrix& mat)
+{
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ mat(mr,mc)=std::tanh(mat(mr,mc));
+ }
+ }
+}
+
ReturnMatrix pow(const Matrix& mat, const double exp)
{
Matrix res = mat;
@@ -1562,6 +1618,15 @@ ReturnMatrix pow(const Matrix& mat, const double exp)
return res;
}
+void pow_econ(Matrix& mat, const double exp)
+{
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ mat(mr,mc)=std::pow(mat(mr,mc),exp);
+ }
+ }
+}
+
ReturnMatrix max(const Matrix& mat)
{
Matrix res;
@@ -1644,60 +1709,83 @@ ReturnMatrix min(const Matrix& mat)
ReturnMatrix sum(const Matrix& mat, const int dim)
{
- Matrix tmp;
+ Matrix res;
+
+ if (dim == 1){
+ res = zeros(1,mat.Ncols());
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ res(1,mc) += mat(mr,mc);
+ }
+ }
+ }
+ else{
+ res = zeros(mat.Nrows(),1);
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ res(mr,1) += mat(mr,mc);
+ }
+ }
+ }
- if (dim == 1) {tmp=mat;}
- else {tmp=mat.t();}
- Matrix res(1,tmp.Ncols());
- res = 0.0;
- for (int mc=1; mc<=tmp.Ncols(); mc++) {
- for (int mr=1; mr<=tmp.Nrows(); mr++) {
- res(1,mc) += tmp(mr,mc);
- }
- }
- if (!(dim == 1)) {res=res.t();}
res.Release();
return res;
}
ReturnMatrix mean(const Matrix& mat, const int dim)
{
- Matrix tmp;
- if (dim == 1) {tmp=mat;}
- else {tmp=mat.t();}
-
- int N = tmp.Nrows();
-
- Matrix res(1,tmp.Ncols());
- res = 0.0;
- for (int mc=1; mc<=tmp.Ncols(); mc++) {
- for (int mr=1; mr<=tmp.Nrows(); mr++) {
- res(1,mc) += tmp(mr,mc)/N;
- }
- }
- if (!(dim == 1)) {res=res.t();}
-
- res.Release();
- return res;
+ Matrix res;
+ int N;
+ if (dim == 1){
+ res = zeros(1,mat.Ncols());
+ N = mat.Nrows();
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ res(1,mc) += mat(mr,mc)/N;
+ }
+ }
+ }
+ else{
+ res = zeros(mat.Nrows(),1);
+ N = mat.Ncols();
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ res(mr,1) += mat(mr,mc)/N;
+ }
+ }
+ }
+ res.Release();
+ return res;
}
ReturnMatrix var(const Matrix& mat, const int dim)
-{
- Matrix tmp;
- if (dim == 1) {tmp=mat;}
- else {tmp=mat.t();}
- int N = tmp.Nrows();
- Matrix res(1,tmp.Ncols());
- res = 0.0;
-
- if(N>1){
- tmp -= ones(tmp.Nrows(),1)*mean(tmp,1);
- for (int mc=1; mc<=tmp.Ncols(); mc++)
- for (int mr=1; mr<=tmp.Nrows(); mr++)
- res(1,mc) += tmp(mr,mc) / (N-1) * tmp(mr,mc);
- }
+{
+ Matrix res, matmean;
+ matmean = mean(mat,dim);
+ int N;
+ if (dim == 1){
+ res = zeros(1,mat.Ncols());
+ N = mat.Nrows();
+ if(N>1){
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ res(1,mc) += (mat(mr,mc) - matmean(1,mc)) * (mat(mr,mc) - matmean(1,mc))/(N-1);
+ }
+ }
+ }
+ }
+ else{
+ res = zeros(mat.Nrows(),1);
+ N = mat.Ncols();
+ if(N>1){
+ for (int mr=1; mr<=mat.Nrows(); mr++) {
+ for (int mc=1; mc<=mat.Ncols(); mc++) {
+ res(mr,1) += (mat(mr,mc) -matmean(mr,1))* (mat(mr,mc)-matmean(mr,1))/(N-1);
+ }
+ }
+ }
+ }
- if (!(dim == 1)) {res=res.t();}
res.Release();
return res;
}
@@ -1864,6 +1952,37 @@ ReturnMatrix SD(const Matrix& mat1,const Matrix& mat2)
return ret;
}
+void SD_econ(Matrix& mat1,const Matrix& mat2)
+{
+ if((mat1.Nrows() != mat2.Nrows()) ||
+ (mat1.Ncols() != mat2.Ncols()) ){
+ cerr <<"MISCMATHS::SD - matrices are of different dimensions"<<endl;
+ exit(-1);
+ }
+ for (int r = 1; r <= mat1.Nrows(); r++) {
+ for (int c =1; c <= mat1.Ncols(); c++) {
+ if( mat2(r,c)==0)
+ mat1(r,c)=0;
+ else
+ mat1(r,c) = mat1(r,c)/mat2(r,c);
+ }
+ }
+}
+
+void SP_econ(Matrix& mat1,const Matrix& mat2)
+{
+ if((mat1.Nrows() != mat2.Nrows()) ||
+ (mat1.Ncols() != mat2.Ncols()) ){
+ cerr <<"MISCMATHS::SD - matrices are of different dimensions"<<endl;
+ exit(-1);
+ }
+ for (int r = 1; r <= mat1.Nrows(); r++) {
+ for (int c =1; c <= mat1.Ncols(); c++) {
+ mat1(r,c) = mat1(r,c) * mat2(r,c);
+ }
+ }
+}
+
//Deprecate?
ReturnMatrix vox_to_vox(const ColumnVector& xyz1,const ColumnVector& dims1,const ColumnVector& dims2,const Matrix& xfm){
ColumnVector xyz1_mm(4),xyz2_mm,xyz2(3);
@@ -1886,43 +2005,40 @@ ReturnMatrix mni_to_imgvox(const ColumnVector& mni,const ColumnVector& mni_origi
return img_vox;
}
-
-ReturnMatrix remmean(const Matrix& mat, const int dim)
-{
- Matrix res;
- if (dim == 1) {res=mat;}
- else {res=mat.t();}
-
- Matrix Mean;
- Mean = mean(res);
-
- for (int ctr = 1; ctr <= res.Nrows(); ctr++) {
- for (int ctr2 =1; ctr2 <= res.Ncols(); ctr2++) {
- res(ctr,ctr2)-=Mean(1,ctr2);
- }
- }
- if (dim != 1) {res=res.t();}
- res.Release();
- return res;
+void remmean_econ(Matrix& mat, const int dim)
+{
+ Matrix matmean;
+ remmean(mat, matmean, dim);
}
+void remmean(Matrix& mat, Matrix& matmean, const int dim)
+{
+ matmean = mean(mat,dim);
+ if (dim == 1){
+ for (int mr=1; mr<=mat.Nrows(); mr++)
+ mat.Row(mr) -= matmean.AsRow();
+ }
+ else{
+ for (int mc=1; mc<=mat.Ncols(); mc++)
+ mat.Column(mc) -= matmean.AsColumn();
+ }
+}
void remmean(const Matrix& mat, Matrix& demeanedmat, Matrix& Mean, const int dim)
{
- if (dim == 1) {demeanedmat=mat;}
- else {demeanedmat=mat.t();}
-
- Mean = mean(demeanedmat);
+ demeanedmat = mat;
+ remmean(demeanedmat,Mean, dim);
+}
- for (int ctr = 1; ctr <= demeanedmat.Nrows(); ctr++) {
- for (int ctr2 =1; ctr2 <= demeanedmat.Ncols(); ctr2++) {
- demeanedmat(ctr,ctr2)-=Mean(1,ctr2);
- }
- }
- if (dim != 1){demeanedmat = demeanedmat.t();Mean = Mean.t();}
+ReturnMatrix remmean(const Matrix& mat, const int dim)
+{
+ Matrix res = mat;
+ remmean_econ(res,dim);
+ res.Release();
+ return res;
}
-ReturnMatrix cov(const Matrix& mat, const int norm)
+/* ReturnMatrix cov(const Matrix& mat, const int norm)
{
SymmetricMatrix res;
Matrix tmp;
@@ -1936,20 +2052,38 @@ ReturnMatrix cov(const Matrix& mat, const int norm)
res.Release();
return res;
}
+*/
-ReturnMatrix corrcoef(const Matrix& mat, const int norm)
+ReturnMatrix cov(const Matrix& mat, const int norm)
{
SymmetricMatrix res;
- SymmetricMatrix C;
- C = cov(mat,norm);
- Matrix D;
- D=diag(C);
- D=pow(sqrt(D*D.t()),-1);
- res << SP(C,D);
+ res << ones(mat.Ncols(),mat.Ncols());
+
+ Matrix meanM;
+ int N;
+ meanM = mean(mat);
+ if (norm == 1) {N = mat.Nrows();}
+ else {N = mat.Nrows()-1;}
+ for (int ctr=1; ctr <= mat.Nrows(); ctr++)
+ res << res + (mat.Row(ctr) - meanM ).t() * (mat.Row(ctr) - meanM);
+ res = res/N;
+
res.Release();
return res;
}
+ReturnMatrix corrcoef(const Matrix& mat, const int norm)
+{
+ SymmetricMatrix res;
+ res = cov(mat,norm);
+ Matrix D;
+ D=diag(res);
+ D=sqrt(D*D.t());
+ res << SD(res,D);
+ res.Release();
+ return res;
+}
+
ReturnMatrix flipud(const Matrix& mat)
{
Matrix rmat(mat.Nrows(),mat.Ncols());
@@ -1995,9 +2129,12 @@ void powerspectrum(const Matrix &Mat1, Matrix &Result, bool useLog)
ColumnVector tmpPow;
RealFFT(tmpCol,FtmpCol_real,FtmpCol_imag);
- tmpPow = pow(FtmpCol_real,2)+pow(FtmpCol_imag,2);
+ pow(FtmpCol_real,2);
+ pow(FtmpCol_imag,2);
+
+ tmpPow = FtmpCol_real+FtmpCol_imag;
tmpPow = tmpPow.Rows(2,tmpPow.Nrows());
- if(useLog){tmpPow = log(tmpPow);}
+ if(useLog){log(tmpPow);}
if(res.Storage()==0){res= tmpPow;}else{res|=tmpPow;}
}
Result=res;
diff --git a/miscmaths.h b/miscmaths.h
index bfb4f7f..02fa63f 100644
--- a/miscmaths.h
+++ b/miscmaths.h
@@ -23,9 +23,7 @@
#include <sstream>
#include <string>
#include <iterator>
-#include "NewNifti/NewNifti.h"
-#include "niftiio/nifti1_io.h"
-
+#include "fslio/fslio.h"
//#include "config.h"
#include "newmatap.h"
#include "kernel.h"
@@ -219,13 +217,19 @@ namespace MISCMATHS {
ReturnMatrix repmat(const Matrix& mat, const int rows = 1, const int cols = 1);
ReturnMatrix dist2(const Matrix& mat1, const Matrix& mat2);
ReturnMatrix abs(const Matrix& mat);
+ void abs_econ(Matrix& mat);
ReturnMatrix sqrt(const Matrix& mat);
+ void sqrt_econ(Matrix& mat);
ReturnMatrix sqrtm(const Matrix& mat);
ReturnMatrix log(const Matrix& mat);
+ void log_econ(Matrix& mat);
ReturnMatrix exp(const Matrix& mat);
+ void exp_econ(Matrix& mat);
ReturnMatrix expm(const Matrix& mat);
ReturnMatrix tanh(const Matrix& mat);
+ void tanh_econ(Matrix& mat);
ReturnMatrix pow(const Matrix& mat, const double exp);
+ void pow_econ(Matrix& mat, const double exp);
ReturnMatrix sum(const Matrix& mat, const int dim = 1);
ReturnMatrix mean(const Matrix& mat, const int dim = 1);
ReturnMatrix var(const Matrix& mat, const int dim = 1);
@@ -240,10 +244,17 @@ namespace MISCMATHS {
ReturnMatrix eq(const Matrix& mat1,const Matrix& mat2);
ReturnMatrix neq(const Matrix& mat1,const Matrix& mat2);
ReturnMatrix SD(const Matrix& mat1,const Matrix& mat2); // Schur (element-wise) divide
+ void SD_econ(Matrix& mat1,const Matrix& mat2); // Schur (element-wise) divide
+ void SP_econ(Matrix& mat1,const Matrix& mat2); // Schur (element-wise) divide
+
ReturnMatrix vox_to_vox(const ColumnVector& xyz1,const ColumnVector& dims1,const ColumnVector& dims2,const Matrix& xfm);
ReturnMatrix mni_to_imgvox(const ColumnVector& mni,const ColumnVector& mni_origin,const Matrix& mni2img, const ColumnVector& img_dims);
+
+ void remmean_econ(Matrix& mat, const int dim = 1);
+ void remmean(Matrix& mat, Matrix& Mean, const int dim = 1);
void remmean(const Matrix& mat, Matrix& demeanedmat, Matrix& Mean, const int dim = 1);
ReturnMatrix remmean(const Matrix& mat, const int dim = 1);
+
ReturnMatrix stdev(const Matrix& mat, const int dim = 1);
ReturnMatrix cov(const Matrix& mat, const int norm = 0);
ReturnMatrix corrcoef(const Matrix& mat, const int norm = 0);
--
GitLab