fix memory leaks on EMGLLF, test OK for EMGrank

[valse.git] / src / test / test.EMGrank.c

diff --git a/src/test/test.EMGrank.c b/src/test/test.EMGrank.c
index 1227738..8374b2f 100644 (file)
--- 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);
-       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 //
+       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 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);
-
        /////////////
        // OUTPUTS //
-       /////////////
-
-       // phi
-       const mwSize dimPhi[] = {p, m, k};
-       Real* phi = (Real*)malloc(dimPhi[0]*dimPhi[1]*dimPhi[2]*sizeof(Real));
-
-       // LLF
+       Real* phi = (Real*)malloc(p*m*k*sizeof(Real));
        Real* LLF = (Real*)malloc(1*sizeof(Real));
+       /////////////
 
        //////////////////////////
        // 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
-       Real* 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
-       Real* 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;
 }