X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Ftest.constructionModelesLassoRank.c;h=b3ed34ae328722f8fdb142c606a1b7ea54650214;hp=cf95bc4918c57685dc3c60dd45b37d35ee0713df;hb=c3bc47052f3ccb659659c59a82e9a99ea842398d;hpb=e39bc178cf5de02489ea2dce3869ba6323e18492

diff --git a/src/test/test.constructionModelesLassoRank.c b/src/test/test.constructionModelesLassoRank.c
index cf95bc4..b3ed34a 100644
--- a/src/test/test.constructionModelesLassoRank.c
+++ b/src/test/test.constructionModelesLassoRank.c
@@ -1,107 +1,62 @@
 #include "constructionModelesLassoRank.h"
 #include "test_utils.h"
+#include <stdlib.h>
 
 int main(int argc, char** argv)
 {
-	// read dimensions
-	const int nbDims = 5;
-	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];
 	int L = dimensions[4];
 	free(dimensions);
-	int lengthOne = 1;
 
 	////////////
 	// INPUTS //
+	Real* Pi = readArray_real("Pi");
+	Real* Rho = readArray_real("Rho");
+	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* A1 = readArray_int("A1");
+	int rangmin = read_int("rangmin");
+	int rangmax = read_int("rangmax");
 	////////////
 
-	// piInit
-	const int dimPi[] = {k, L};
-	float* Pi = readArray_real("Pi",dimPi,2);
-
-	// rhoInit
-	const int dimRho[] = {m, m, k, L};
-	float* Rho = readArray_real("Rho",dimRho,4);
-
-	// 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);
-
-	// A1
-	const int dimA[] = {p, L};
-	int* A1 = readArray_int("A1",dimA,2);
-
-	// rangmin
-	int* prangmin = readArray_int("rangmin",&lengthOne,1);
-	int rangmin = *prangmin;
-	free(prangmin);
-
-	// rangmax
-	int* prangmax = readArray_int("rangmax",&lengthOne,1);
-	int rangmax = *prangmax;
-	free(prangmax);
-	
 	/////////////
 	// OUTPUTS //
-	/////////////
-
-	// phi
 	int Size = (int)pow(rangmax-rangmin+1, k);
-	const int dimPhi[] = {p, m, k, L*Size};
-	float* phi = (float*)malloc(dimPhi[0]*dimPhi[1]*dimPhi[2]*dimPhi[3]*sizeof(float));
-
-	// lvraisemblance
-	const int dimLvraisemblance[] = {L*Size, 2};
-	float* lvraisemblance = (float*)malloc(dimLvraisemblance[0]*dimLvraisemblance[1]*sizeof(float));
-
-	//////////////////////////////////////////////
-	// Main call to constructionModelesLassoMLE //
-	//////////////////////////////////////////////
+	Real* phi = (Real*)malloc(p*m*k*L*Size*sizeof(Real));
+	Real* llh = (Real*)malloc(L*Size*2*sizeof(Real));
+	/////////////
 
-	constructionModelesLassoRank(
+	/////////////////////////////////////////
+	// Call to constructionModelesLassoMLE //
+	constructionModelesLassoRank_core(
 		Pi,Rho,mini,maxi,X,Y,tau,A1,rangmin,rangmax,
-		phi,lvraisemblance,
+		phi,llh,
 		n,p,m,k,L);
-	
+	/////////////////////////////////////////
+
 	free(Rho);
 	free(Pi);
 	free(X);
 	free(Y);
 	free(A1);
-	
+
 	// Compare to reference outputs
-	float* ref_phi = readArray_real("phi",dimPhi, 4);
-	compareArray_real("phi", phi, ref_phi, dimPhi[0]*dimPhi[1]*dimPhi[2]*dimPhi[3]);
+	Real* ref_phi = readArray_real("phi");
+	compareArray_real("phi", phi, ref_phi, p*m*k*L*Size);
 	free(phi);
 	free(ref_phi);
-	
-	// lvraisemblance
-	float* ref_lvraisemblance = readArray_real("lvraisemblance",dimLvraisemblance,2);
-	compareArray_real("lvraisemblance", lvraisemblance, ref_lvraisemblance, dimLvraisemblance[0]*dimLvraisemblance[1]);
-	free(lvraisemblance);
-	free(ref_lvraisemblance);
-	
+
+	Real* ref_llh = readArray_real("llh");
+	compareArray_real("llh", llh, ref_llh, L*Size*2);
+	free(llh);
+	free(ref_llh);
+
 	return 0;
 }