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

diff --git a/src/test/test.ConstructionModelesLassoMLE.c b/src/test/test.ConstructionModelesLassoMLE.c
index e9c7678..45402db 100644
--- a/src/test/test.ConstructionModelesLassoMLE.c
+++ b/src/test/test.ConstructionModelesLassoMLE.c
@@ -3,108 +3,48 @@
 
 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* phiInit = readArray_real("phiInit");
+	Real* rhoInit = readArray_real("rhoInit");
+	Real* piInit = readArray_real("piInit");
+	Real* gamInit = readArray_real("gamInit");
+	int mini = read_int("mini");
+	int maxi = read_int("maxi");
+	Real gamma = read_real("gamma");
+	Real* glambda = readArray_real("glambda");
+	Real* X = readArray_real("X");
+	Real* Y = readArray_real("Y");
+	Real seuil = read_real("seuil");
+	Real tau = read_real("tau");
+	int* A1 = readArray_int("A1");
+	int* A2 = readArray_int("A2");
 	////////////
 
-	// phiInit
-	const int dimPhiInit[] = {p, m, k};
-	float* phiInit = readArray_real("phiInit",dimPhiInit,3);
-
-	// rhoInit
-	const int dimRhoInit[] = {m, m, k};
-	float* rhoInit = readArray_real("rhoInit",dimRhoInit,3);
-
-	// piInit
-	float* piInit = readArray_real("piInit",&k,1);
-
-	// gamInit
-	const int dimGamInit[] = {n, k};
-	float* gamInit = readArray_real("gamInit",dimGamInit,2);
-
-	// 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);
-
-	// gamma
-	float* pgamma = readArray_real("gamma",&lengthOne,1);
-	float gamma = *pgamma;
-	free(pgamma);
-
-	// lambda
-	float* glambda = readArray_real("glambda",&L,1);
-
-	// 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);
-
-	// seuil
-	float* pseuil = readArray_real("seuil",&lengthOne,1);
-	float seuil = *pseuil;
-	free(pseuil);
-
-	// tau
-	float* ptau = readArray_real("tau",&lengthOne,1);
-	float tau = *ptau;
-	free(ptau);
-	
-	// A1
-	const int dimA[] = {p, m+1, L};
-	int* A1 = readArray_int("A1",dimA,3);
-	
-	// A2
-	int* A2 = readArray_int("A2",dimA,3);
-	
 	/////////////
 	// OUTPUTS //
+	Real* phi = (Real*)malloc(p*m*k*L*sizeof(Real));
+	Real* rho = (Real*)malloc(m*m*k*L*sizeof(Real));
+	Real* pi = (Real*)malloc(k*L*sizeof(Real));
+	Real* llh = (Real*)malloc(L*2*sizeof(Real));
 	/////////////
 
-	// phi
-	const int dimPhi[] = {dimPhiInit[0], dimPhiInit[1], dimPhiInit[2], L};
-	float* phi = (float*)malloc(dimPhi[0]*dimPhi[1]*dimPhi[2]*dimPhi[3]*sizeof(float));
-
-	// rho
-	const int dimRho[] = {dimRhoInit[0], dimRhoInit[1], dimRhoInit[2], L};
-	float* rho = (float*)malloc(dimRho[0]*dimRho[1]*dimRho[2]*dimRho[3]*sizeof(float));
-
-	// pi
-	const int dimPi[] = {k, L};
-	float* pi = (float*)malloc(dimPi[0]*dimPi[1]*sizeof(float));
-
-	// lvraisemblance
-	const int dimLvraisemblance[] = {L, 2};
-	float* lvraisemblance = (float*)malloc(dimLvraisemblance[0]*dimLvraisemblance[1]*sizeof(float));
-
 	/////////////////////////////////////////
 	// Call to constructionModelesLassoMLE //
-	/////////////////////////////////////////
-
 	constructionModelesLassoMLE(
 		phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,seuil,tau,A1,A2,
-		phi,rho,pi,lvraisemblance,
+		phi,rho,pi,llh,
 		n,p,m,k,L);
-	
+	/////////////////////////////////////////
+
 	free(phiInit);
 	free(rhoInit);
 	free(piInit);
@@ -114,30 +54,27 @@ int main(int argc, char** argv)
 	free(A1);
 	free(A2);
 	free(glambda);
-	
+
 	// 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",dimPhi,4);
+	compareArray_real("phi", phi, ref_phi, p*m*k*L);
 	free(phi);
 	free(ref_phi);
-	
-	// rho
-	float* ref_rho = readArray_real("rho",dimRho,4);
-	compareArray_real("rho", rho, ref_rho, dimRho[0]*dimRho[1]*dimRho[2]*dimRho[3]);
+
+	Real* ref_rho = readArray_real("rho",dimRho,4);
+	compareArray_real("rho", rho, ref_rho, m*m*k*L);
 	free(rho);
 	free(ref_rho);
-	
-	// pi
-	float* ref_pi = readArray_real("pi",dimPi,2);
-	compareArray_real("pi", pi, ref_pi, dimPi[0]*dimPi[1]);
+
+	Real* ref_pi = readArray_real("pi",dimPi,2);
+	compareArray_real("pi", pi, ref_pi, k*L);
 	free(pi);
 	free(ref_pi);
-	
-	// 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",dimllh,2);
+	compareArray_real("llh", llh, ref_llh, L*2);
+	free(llh);
+	free(ref_llh);
 
 	return 0;
 }