From 4b8122b7a7f6f31bcd4191320bcb09511add5d38 Mon Sep 17 00:00:00 2001
From: Matthew Webster <mwebster@fmrib.ox.ac.uk>
Date: Thu, 3 Apr 2008 12:24:46 +0000
Subject: [PATCH] Identity to IdentityMatrix
---
fsl_glm.cc | 2 +-
ggmix.cc | 2 +-
meldata.cc | 2 +-
melgmix.cc | 2 +-
melica.cc | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fsl_glm.cc b/fsl_glm.cc
index e1f9873..900c656 100644
--- a/fsl_glm.cc
+++ b/fsl_glm.cc
@@ -185,7 +185,7 @@ int setup(){
return 1;
}
}else{
- contrasts = Identity(design.Ncols());
+ contrasts = IdentityMatrix(design.Ncols());
contrasts &= -1.0 * contrasts;
}
return 0;
diff --git a/ggmix.cc b/ggmix.cc
index d14d7fe..df6e4bd 100644
--- a/ggmix.cc
+++ b/ggmix.cc
@@ -490,7 +490,7 @@ namespace GGMIX{
}
}
- dlm += Identity(nummix)*dlm.Maximum();
+ dlm += IdentityMatrix(nummix)*dlm.Maximum();
int i,j;
float val;
diff --git a/meldata.cc b/meldata.cc
index a1115ec..4b2ffa3 100644
--- a/meldata.cc
+++ b/meldata.cc
@@ -268,7 +268,7 @@ namespace Melodic{
if(numfiles == 1){
Data = alldat;
- Matrix tmp = Identity(Data.Nrows());
+ Matrix tmp = IdentityMatrix(Data.Nrows());
DWM.push_back(tmp);
WM.push_back(tmp);
}
diff --git a/melgmix.cc b/melgmix.cc
index 42bcaae..66d3d05 100644
--- a/melgmix.cc
+++ b/melgmix.cc
@@ -468,7 +468,7 @@ namespace Melodic{
}
}
- dlm += Identity(nummix)*dlm.Maximum();
+ dlm += IdentityMatrix(nummix)*dlm.Maximum();
int i,j;
float val;
diff --git a/melica.cc b/melica.cc
index 9956837..cd53299 100644
--- a/melica.cc
+++ b/melica.cc
@@ -270,7 +270,7 @@ namespace Melodic{
int itt_ctr=1;
double minAbsSin = 1.0;
Matrix Id;
- Id = Identity(redUMM.Ncols());
+ Id = IdentityMatrix(redUMM.Ncols());
//cerr << " nonlinearity : " << opts.nonlinearity.value() << endl;
do{ // da loop!!!
@@ -314,7 +314,7 @@ namespace Melodic{
int dim_sym = (int) (dim*(dim+1))/2;
int num_CM = dim_sym;
Matrix CM;
- Matrix R; R = Identity(dim);
+ Matrix R; R = IdentityMatrix(dim);
Matrix Qij; Qij = zeros(dim);
Matrix Xim;
Matrix Xjm;
@@ -336,7 +336,7 @@ namespace Melodic{
}
write_ascii_matrix("CM",CM);
- Matrix redUMM; redUMM = Identity(dim);
+ Matrix redUMM; redUMM = IdentityMatrix(dim);
bool exitloop = false;
int ctr_itt = 0;
--
GitLab