diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/matrixOperations/dist/ddista.c | 7 | ||||
| -rw-r--r-- | src/matrixOperations/dist/sdista.c | 7 | ||||
| -rw-r--r-- | src/matrixOperations/logm/testDoubleLogm.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/matrixOperations/dist/ddista.c b/src/matrixOperations/dist/ddista.c index cd06310a..6bdee84e 100644 --- a/src/matrixOperations/dist/ddista.c +++ b/src/matrixOperations/dist/ddista.c @@ -21,7 +21,7 @@ double ddista(double* in1,double* in2, int lines, int columns){ int i=0; double out=0; double *a, *at, *mul; - doubleComplex *eigenvalues; + doubleComplex *eigenvalues,*mulCpx; /* FIXME : malloc here*/ @@ -29,11 +29,13 @@ double ddista(double* in1,double* in2, int lines, int columns){ at=malloc((uint)(lines*columns)*sizeof(double)); mul=malloc((uint)(lines*lines)*sizeof(double)); eigenvalues=malloc((uint)(lines)*sizeof(doubleComplex)); + mulCpx=malloc((uint)(lines*lines)*sizeof(doubleComplex)); for (i=0;i<lines*columns;i++) a[i]=in1[i]-in2[i]; dtransposea(a,lines, columns,at); dmulma(a,lines,columns,at,columns,lines,mul); - dspeca(mul,lines,eigenvalues); + for (i=0;i<lines*lines;i++) mulCpx[i]=DoubleComplex(mul[i],0); + zspeca(mulCpx,lines,eigenvalues); zsqrta(eigenvalues,lines,eigenvalues); /* Research of the higher value of eigenvalues*/ @@ -45,6 +47,7 @@ double ddista(double* in1,double* in2, int lines, int columns){ free(at); free(mul); free(eigenvalues); + free(mulCpx); return out; } diff --git a/src/matrixOperations/dist/sdista.c b/src/matrixOperations/dist/sdista.c index 5199ead7..f4e3958d 100644 --- a/src/matrixOperations/dist/sdista.c +++ b/src/matrixOperations/dist/sdista.c @@ -21,7 +21,7 @@ float sdista(float* in1,float* in2, int lines, int columns){ int i=0; float out=0; float *a, *at, *mul; - floatComplex *eigenvalues; + floatComplex *eigenvalues,*mulCpx; /* FIXME : malloc here*/ @@ -29,11 +29,13 @@ float sdista(float* in1,float* in2, int lines, int columns){ at=malloc((uint)(lines*columns)*sizeof(float)); mul=malloc((uint)(lines*lines)*sizeof(float)); eigenvalues=malloc((uint)(lines)*sizeof(floatComplex)); + mulCpx=malloc((uint)(lines*lines)*sizeof(floatComplex)); for (i=0;i<lines*columns;i++) a[i]=in1[i]-in2[i]; stransposea(a,lines, columns,at); smulma(a,lines,columns,at,columns,lines,mul); - sspeca(mul,lines,eigenvalues); + for (i=0;i<lines*lines;i++) mulCpx[i]=FloatComplex(mul[i],0); + cspeca(mulCpx,lines,eigenvalues); csqrta(eigenvalues,lines,eigenvalues); /* Research of the higher value of eigenvalues*/ @@ -45,6 +47,7 @@ float sdista(float* in1,float* in2, int lines, int columns){ free(at); free(mul); free(eigenvalues); + free(mulCpx); return out; } diff --git a/src/matrixOperations/logm/testDoubleLogm.c b/src/matrixOperations/logm/testDoubleLogm.c index ec191cc9..fd4a6ab9 100644 --- a/src/matrixOperations/logm/testDoubleLogm.c +++ b/src/matrixOperations/logm/testDoubleLogm.c @@ -166,7 +166,7 @@ static void zlogmaTest(void){ fabs(zimags(out16[i])-result16I[i]) / fabs(zimags(out16[i]))); assert( fabs(zreals(out16[i])-result16R[i]) / fabs(zreals(out16[i])) <1e-13); - + assert( fabs(zimags(out16[i])-result16I[i]) / fabs(zimags(out16[i])) <1); } for(i=0;i<16;i++) { |