X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2Ftest%2Ftest.EMGrank.c;h=59a68d073401c4d9451f91bde69d3ac9170a59ca;hb=e8bb47649b9f4e625ef050aae096d23cfc058163;hp=12277388a7175795ec389daf618f3b097560d2c3;hpb=7b2720733e9aebe177c211119a9ec160c7e7117b;p=valse.git

diff --git a/src/test/test.EMGrank.c b/src/test/test.EMGrank.c
index 1227738..59a68d0 100644
--- a/src/test/test.EMGrank.c
+++ b/src/test/test.EMGrank.c
@@ -1,65 +1,34 @@
 #include "EMGrank.h"
-#include "ioutils.h"
+#include "utils.h"
 
 int main(int argc, char** argv)
 {
-	// read dimensions
-	const Int nbDims = 4;
-	Int* dimensions = readArray_int("dimensions",&nbDims,1);
-	mwSize n = dimensions[0];
-	mwSize p = dimensions[1];
-	mwSize m = dimensions[2];
-	mwSize k = dimensions[3];
+	int* dimensions = readArray_int("dimensions");
+	int n = dimensions[0];
+	int p = dimensions[1];
+	int m = dimensions[2];
+	int k = dimensions[3];
 	free(dimensions);
-	mwSize lengthOne = 1;
 
 	////////////
 	// INPUTS //
 	////////////
 
-	// Rho
-	const mwSize dimRho[] = {m, m, k};
-	Real* Rho = readArray_real("Rho",dimRho,3);
-
-	// Pi
-	Real* Pi = readArray_real("Pi",&k,1);
-
-	// min number of iterations
-	Int* pmini = readArray_int("mini",&lengthOne,1);
-	Int mini = *pmini;
-	free(pmini);
-
-	// max number of iterations
-	Int* pmaxi = readArray_int("maxi",&lengthOne,1);
-	Int maxi = *pmaxi;
-	free(pmaxi);
-
-	// X
-	const mwSize dimX[] = {n, p};
-	Real* X = readArray_real("X",dimX, 2);
-
-	// Y
-	const mwSize dimY[] = {n, m};
-	Real* Y = readArray_real("Y",dimY, 2);
-
-	// tau
-	Real* ptau = readArray_real("tau",&lengthOne,1);
-	Real tau = *ptau;
-	free(ptau);
-
-	// tau
-	Int* rank = readArray_int("rank",&k,1);
+	float* Rho = readArray_real("Rho");
+	float* Pi = readArray_real("Pi");
+	int mini = read_int("mini");
+	int maxi = read_int("maxi");
+	float* X = readArray_real("X");
+	float* Y = readArray_real("Y");
+	float tau = read_real("tau");
+	int* rank = readArray_int("rank");
 
 	/////////////
 	// OUTPUTS //
 	/////////////
 
-	// phi
-	const mwSize dimPhi[] = {p, m, k};
-	Real* phi = (Real*)malloc(dimPhi[0]*dimPhi[1]*dimPhi[2]*sizeof(Real));
-
-	// LLF
-	Real* LLF = (Real*)malloc(1*sizeof(Real));
+	float* phi = (float*)malloc(p*m*k*sizeof(float));
+	float* LLF = (float*)malloc(1*sizeof(float));
 
 	//////////////////////////
 	// Main call to EMGrank //
@@ -68,25 +37,24 @@ int main(int argc, char** argv)
 	EMGrank(Pi,Rho,mini,maxi,X,Y,tau,rank,
 		phi,LLF,
 		n,p,m,k);
-	
-	// free input pointers
+
 	free(Rho);
 	free(Pi);
 	free(X);
 	free(Y);
 	free(rank);
-	
+
 	// Compare to reference outputs
-	Real* ref_phi = readArray_real("phi",dimPhi, 3);
-	compareArray_real("phi", phi, ref_phi, dimPhi[0]*dimPhi[1]*dimPhi[2]);
+	float* ref_phi = readArray_real("phi");
+	compareArray_real("phi", phi, ref_phi, p*m*k);
 	free(phi);
 	free(ref_phi);
-	
+
 	// LLF
-	Real* ref_LLF = readArray_real("LLF",&lengthOne,1);
+	float* ref_LLF = readArray_real("LLF");
 	compareArray_real("LLF", LLF, ref_LLF, 1);
 	free(LLF);
 	free(ref_LLF);
-	
+
 	return 0;
 }