separate levinUtils from levin.h and modify functions(which wheren't good)

1 files changed, 40 insertions, 47 deletions

diff --git a/src/signalProcessing/levin/slevina.c b/src/signalProcessing/levin/slevina.c
index 636aa285..8d3ef1d2 100644
--- a/src/signalProcessing/levin/slevina.c
+++ b/src/signalProcessing/levin/slevina.c
@@ -11,8 +11,10 @@
  */
 
 #include "levin.h"
+#include "levinUtils.h"
 #include "matrixInversion.h"
 #include "matrixMultiplication.h"
+#include "zeros.h"
 #include <malloc.h>
 #include <stdio.h>
 
@@ -32,13 +34,16 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 	Enter now in a element of the list. Take the first for example.
 	This is, like said before, a cCov*cCov matrix. In la, it contains (n+1)*cCov*cCov. Each element of the matrix contains (n+1)
 	elements. As it's stocked by columns, if we represent a matrix like [a   c], for example, the elements 0 to n of la represent 
-									    [b   d]
+							     					  [b   d]
 	a, the elements (n+1) to 2(n+1)-1 represent b,...
 	
 	To finish, look at the elements of the matrix, the polynomes. The coefficients of the polynomes are stocked in increasing order.
 
-	For example, if la in Scilab is  : list( [3+2x  5-2x ],[3+x-x^2    -1+2x    ]) 
-					       ( [-5+x  -2+4x],[1+6x+3x^2  -2x-x^2  ]), the result in dlevin will be : 
+	For example, if la in Scilab is  : list( [3+2x  5-2x ]) 
+					     		   ( [-5+x  -2+4x])
+					     		   ([3+x-x^2    -1+2x    ])
+					     		   ([1+6x+3x^2  -2x-x^2  ])
+		the result in dlevin will be : 
 		-la is a table of 2*3*2*2 elements(n=2,cCov=2);
 		-la[]={3,2,0,  -5,1,0,   5,-2,0,   -2,4,0,   3,1,-1,   1,6,3   -1,2,0,   0,-2,-1}.
 
@@ -50,16 +55,24 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 	The greatest size of a element of the list is : cCov*cCov.
 
 	Let see an example so know how it's stocked.
-	In Scilab, if sig is : list( [1  3],[5  7]) 
-				   ( [2  4],[6  8]),the result in dlevin will be :
+	In Scilab, if sig is : list( [1  3]) 
+				   	   ( [2  4])
+				   	   ( [5  7])
+				   	   ( [6  8])
+	the result in dlevin will be :
 		-sig={1,2,  5,6,  3,4,  7,8}.
 	It's as if we put the matrix the ones under the others and we take the first column, the second,...
 
 
-
+	>>>CAREFUL<<<
+	la/lb and sig are stored differently 
 
 */
+
+
 	int i=0;
+	
+	
 /*version ISO C99	
 	double tmp1[n*cCov*cCov], tmp2[n*cCov*cCov];
 	double sig1[cCov], gam[cCov];
@@ -70,7 +83,7 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 	float *sig1, *gam;
 	float *R1,*R2,*R3,*R4;
 
-
+	/* FIXME : malloc here */
 
 	tmp1=malloc((unsigned int)((n+1)*cCov*cCov)*sizeof(float));
 	tmp2=malloc((unsigned int)((n+1)*cCov*cCov)*sizeof(float));
@@ -86,9 +99,9 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 	/* 
 	 * Initializations
 	 * */
-	sinitTab(sig,n*cCov*cCov);
-	sinitTab(la,n*(n+1)*cCov*cCov);
-	sinitTab(lb,n*(n+1)*cCov*cCov);
+	szerosa(sig,n*cCov*cCov,1);
+	szerosa(la,n*(n+1)*cCov*cCov,1);
+	szerosa(lb,n*(n+1)*cCov*cCov,1);
 
 	/*equal to eye(la) and eye(lb)
 	  but we can't use eye cause to the indexation*/
@@ -105,49 +118,38 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 /* case i=0 */
 
 
-	/*calculation of sig */
+	/*computation of sig */
 	slevinmul(la,R4,n,cCov,0,sig,n*cCov,0,'d');
-	/*calculation of gam1 */
+	/*computation of gam1 */
 	slevinmul(lb,R2,n,cCov,0,gam,cCov,0,'u');	
-	/*calculation of c1*r1 */
+	/*computation of c1*r1 */
 	slevinmul(la,R1,n,cCov,0,tmp1,cCov,0,'u');
-	/*calculation of inv(gam1) */
+	/*computation of inv(gam1) */
 	sinverma(gam,sig1,cCov);
-	sinitTab(gam,cCov*cCov);
-	/*calculation of k1 = c1*r1*inv(gam1) */
+	/*computation of k1 = c1*r1*inv(gam1) */
 	smulma(tmp1,cCov,cCov,sig1,cCov,cCov,tmp2);
-	sinitTab(tmp1,n*cCov*cCov);
-	sinitTab(sig1,cCov*cCov);
-	/*calculation of k1*lb */
+	/*computation of k1*lb */
 	slevinmul2(tmp2,lb,0,n,cCov,tmp1);
-	sinitTab(tmp2,n*cCov*cCov);
-	/*calculation of k1*lb*z */
+	/*computation of k1*lb*z */
 	sdecalage(tmp1,0,n,cCov,tmp1);
-	/*calculation of la */
+	/*computation of la */
 	slevinsub(la,tmp1,n,cCov,0,0,la);
-	sinitTab(tmp1,n*cCov*cCov);
 
-	/*calculation of sig1 (we extract the value if sig at time 0)*/
+	/*computation of sig1 (we extract the value if sig at time 0)*/
 	slevinsig(sig,0,cCov,n*cCov,sig1);
-	/*calculation of c2*r3 */
+	/*computation of c2*r3 */
 	slevinmul(lb,R3,n,cCov,0,tmp1,cCov,0,'d');
-	/*calculation of inv(sig1)*/
+	/*computation of inv(sig1)*/
 	sinverma(sig1,gam,cCov);
-	sinitTab(sig1,cCov*cCov);
-	/*calculation of k2 = c2*r3*inv(sig1) */
+	/*computation of k2 = c2*r3*inv(sig1) */
 	smulma(tmp1,cCov,cCov,gam,cCov,cCov,tmp2);
-	sinitTab(tmp1,n*cCov*cCov);
-	sinitTab(gam,cCov*cCov);
-	/*calculation of k2*la (here it's lb cause la have been modified
+	/*computation of k2*la (here it's lb cause la have been modified
 	  and the precedent values hadn't been saved)*/
 	slevinmul2(tmp2,lb,0,n,cCov,tmp1);
-	sinitTab(tmp2,n*cCov*cCov);
-	/*calculation of lb*z */
+	/*computation of lb*z */
 	sdecalage(lb,0,n,cCov,lb);
-	/*calculation of lb */
+	/*computation of lb */
 	slevinsub(lb,tmp1,n,cCov,0,0,lb);
-	sinitTab(tmp1,n*cCov*cCov);
-	sinitTab(tmp2,n*cCov*cCov);
 
 
 	for (i=1;i<n;i++){
@@ -155,30 +157,21 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
 		slevinmul(lb,R2,n,cCov,i,gam,cCov,0,'u');
 		slevinmul(la,R1,n,cCov,i,tmp1,cCov,0,'u');
 		sinverma(gam,sig1,cCov);
-		sinitTab(gam,cCov*cCov);
 		smulma(tmp1,cCov,cCov,sig1,cCov,cCov,tmp2);
 
-		sinitTab(tmp1,n*cCov*cCov);
 		slevinmul2(tmp2,lb,i-1,n,cCov,tmp1);
-		sinitTab(tmp2,n*cCov*cCov);
 		sdecalage(tmp1,0,n,cCov,tmp1);
 		slevinsub(la,tmp1,n,cCov,i,i,la);/*a*/
-		sinitTab(tmp1,n*cCov*cCov);
 
-		/*calculation of sig1 (we extract the value if sig at time i)*/
+		/*computation of sig1 (we extract the value if sig at time i)*/
 		slevinsig(sig,i,cCov,n*cCov,sig1);		
 		slevinmul(lb,R3,n,cCov,i,tmp1,cCov,0,'d');
 		sinverma(sig1,gam,cCov);
-		sinitTab(sig1,cCov*cCov);
 		smulma(tmp1,cCov,cCov,gam,cCov,cCov,tmp2);
-		sinitTab(tmp1,n*cCov*cCov);
-		/*calculation of k2*la (now it's la at time (i-1))*/
+		/*computation of k2*la (now it's la at time (i-1))*/
 		slevinmul2(tmp2,la,i-1,n,cCov,tmp1);
-		sinitTab(tmp2,n*cCov*cCov);
 		sdecalage(lb,(i-1)*(n+1)*cCov*cCov,n,cCov,tmp2);
 		slevinsub(tmp2,tmp1,n,cCov,0,i,lb);
-		sinitTab(tmp1,n*cCov*cCov);
-		sinitTab(tmp2,n*cCov*cCov);
 	}