diff --git a/fsl_glm.cc b/fsl_glm.cc index e1f98736fd6c520a20e5e643d62dd3c310a36208..900c6566bb5576f7743ab478530de510f5925138 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 d14d7fed274a785e262b6c713160b0dee629faa4..df6e4bd028021420af9c1f12f56a8b235dd4fd2d 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 a1115ec9f420ca47afc1ad9f58b91d3ac62f291c..4b2ffa359996ef233596896f6e9befa16a67fc22 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 42bcaae9fbb7c18907e27c8cbf435cc6aa1b0f1e..66d3d0545e9aad195d733cd6e4f810ef13c3a0ec 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 99568374edcd6be69c82b025bf8d8b38337f7fdd..cd5329958dab20ef1c32335062a80f73a860ddc4 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;