X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2Ftest%2Ftest.EMGrank.c;h=8374b2f118547b64c5faa18d39d01c268b3133e8;hb=c3bc47052f3ccb659659c59a82e9a99ea842398d;hp=c6edbc2ff9a78ba4dc2f36be3ae1d812f79139f0;hpb=7ea8c1e58b3ab98eda5b003ccdffe5e35222bb4f;p=valse.git

diff --git a/src/test/test.EMGrank.c b/src/test/test.EMGrank.c
index c6edbc2..8374b2f 100644
--- a/src/test/test.EMGrank.c
+++ b/src/test/test.EMGrank.c
@@ -1,92 +1,58 @@
 #include "EMGrank.h"
-#include "ioutils.h"
+#include "test_utils.h"
+#include <stdlib.h>
 
 int main(int argc, char** argv)
 {
-	// read dimensions
-	const int nbDims = 4;
-	int* dimensions = readArray_int("dimensions",&nbDims,1);
+	int* dimensions = readArray_int("dimensions");
 	int n = dimensions[0];
 	int p = dimensions[1];
 	int m = dimensions[2];
 	int k = dimensions[3];
 	free(dimensions);
-	int lengthOne = 1;
 
 	////////////
 	// INPUTS //
+	Real* rho = readArray_real("rho");
+	Real* pi = readArray_real("pi");
+	int mini = read_int("mini");
+	int maxi = read_int("maxi");
+	Real* X = readArray_real("X");
+	Real* Y = readArray_real("Y");
+	Real tau = read_real("tau");
+	int* rank = readArray_int("rank");
 	////////////
 
-	// Rho
-	const int dimRho[] = {m, m, k};
-	float* Rho = readArray_real("Rho",dimRho,3);
-
-	// Pi
-	float* 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 int dimX[] = {n, p};
-	float* X = readArray_real("X",dimX, 2);
-
-	// Y
-	const int dimY[] = {n, m};
-	float* Y = readArray_real("Y",dimY, 2);
-
-	// tau
-	float* ptau = readArray_real("tau",&lengthOne,1);
-	float tau = *ptau;
-	free(ptau);
-
-	// tau
-	int* rank = readArray_int("rank",&k,1);
-
 	/////////////
 	// OUTPUTS //
+	Real* phi = (Real*)malloc(p*m*k*sizeof(Real));
+	Real* LLF = (Real*)malloc(1*sizeof(Real));
 	/////////////
 
-	// phi
-	const int dimPhi[] = {p, m, k};
-	float* phi = (float*)malloc(dimPhi[0]*dimPhi[1]*dimPhi[2]*sizeof(float));
-
-	// LLF
-	float* LLF = (float*)malloc(1*sizeof(float));
-
 	//////////////////////////
 	// Main call to EMGrank //
-	//////////////////////////
-
-	EMGrank(Pi,Rho,mini,maxi,X,Y,tau,rank,
+	EMGrank_core(pi,rho,mini,maxi,X,Y,tau,rank,
 		phi,LLF,
 		n,p,m,k);
-	
-	// free input pointers
-	free(Rho);
-	free(Pi);
+	//////////////////////////
+
+	free(rho);
+	free(pi);
 	free(X);
 	free(Y);
 	free(rank);
-	
+
 	// Compare to reference outputs
-	float* ref_phi = readArray_real("phi",dimPhi, 3);
-	compareArray_real("phi", phi, ref_phi, dimPhi[0]*dimPhi[1]*dimPhi[2]);
+	Real* ref_phi = readArray_real("phi");
+	compareArray_real("phi", phi, ref_phi, p*m*k);
 	free(phi);
 	free(ref_phi);
-	
+
 	// LLF
-	float* ref_LLF = readArray_real("LLF",&lengthOne,1);
+	Real* ref_LLF = readArray_real("LLF");
 	compareArray_real("LLF", LLF, ref_LLF, 1);
 	free(LLF);
 	free(ref_LLF);
-	
+
 	return 0;
 }