diff options
Diffstat (limited to 'src/matrixOperations/determ')
-rw-r--r-- | src/matrixOperations/determ/cdeterma.c | 8 | ||||
-rw-r--r-- | src/matrixOperations/determ/ddeterma.c | 6 | ||||
-rw-r--r-- | src/matrixOperations/determ/sdeterma.c | 6 | ||||
-rw-r--r-- | src/matrixOperations/determ/zdeterma.c | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/matrixOperations/determ/cdeterma.c b/src/matrixOperations/determ/cdeterma.c index 1696d45c..448da1b0 100644 --- a/src/matrixOperations/determ/cdeterma.c +++ b/src/matrixOperations/determ/cdeterma.c @@ -66,16 +66,16 @@ floatComplex cdeterma(floatComplex *in, int size){ zgetrf accept only double parameters*/ /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(doubleComplex)); + inCopy=(doubleComplex*)malloc((unsigned int)(size*size)*sizeof(doubleComplex)); for (i=0;i<size*size;i++){ inCopy[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i])); } - vectPivot=malloc((uint)size*sizeof(int)); + vectPivot=(int*)malloc((unsigned int)size*sizeof(int)); zgetrf_ ( &size, &size, inCopy, &size, vectPivot, &info); - + out_tmp=DoubleComplex(1,0); for (i=0;i<size;i++){ if (vectPivot[i]!=i+1) out_tmp=DoubleComplex(-zreals(out_tmp),-zimags(out_tmp)); @@ -123,7 +123,7 @@ floatComplex cdeterma(floatComplex *in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(floatComplex)); + inCopy=malloc((unsigned int)(size*size)*sizeof(floatComplex)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; for (i=0;i<size;i++){ diff --git a/src/matrixOperations/determ/ddeterma.c b/src/matrixOperations/determ/ddeterma.c index 4c1703e1..4f8046bb 100644 --- a/src/matrixOperations/determ/ddeterma.c +++ b/src/matrixOperations/determ/ddeterma.c @@ -38,10 +38,10 @@ double ddeterma(double * in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(double)); + inCopy=(double*)malloc((unsigned int)(size*size)*sizeof(double)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; - tmp=malloc((uint)size*sizeof(int)); + tmp=(int*)malloc((unsigned int)size*sizeof(int)); dgetrf_(&size, &size, inCopy, &size, tmp, &info); out=1; for (i=0;i<size;i++){ @@ -69,7 +69,7 @@ double ddeterma(double * in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(double)); + inCopy=malloc((unsigned int)(size*size)*sizeof(double)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; for (i=0;i<size;i++){ diff --git a/src/matrixOperations/determ/sdeterma.c b/src/matrixOperations/determ/sdeterma.c index cdb4d1f7..d7f31ab0 100644 --- a/src/matrixOperations/determ/sdeterma.c +++ b/src/matrixOperations/determ/sdeterma.c @@ -39,8 +39,8 @@ float sdeterma(float * in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(double)); - tmp=malloc((uint)size*sizeof(int)); + inCopy=(double*)malloc((unsigned int)(size*size)*sizeof(double)); + tmp=(int*)malloc((unsigned int)size*sizeof(int)); for (i=0;i<size*size;i++) inCopy[i]=(double)in[i]; dgetrf_(&size, &size, inCopy, &size, tmp, &info); @@ -69,7 +69,7 @@ float sdeterma(float * in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(float)); + inCopy=malloc((unsigned int)(size*size)*sizeof(float)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; for (i=0;i<size;i++){ diff --git a/src/matrixOperations/determ/zdeterma.c b/src/matrixOperations/determ/zdeterma.c index a1d8b879..ea7e98d0 100644 --- a/src/matrixOperations/determ/zdeterma.c +++ b/src/matrixOperations/determ/zdeterma.c @@ -10,7 +10,7 @@ * */ - +#include <stdlib.h> #ifndef WITHOUT_LAPACK #include "lapack.h" #else @@ -58,11 +58,11 @@ doubleComplex zdeterma(doubleComplex * in, int size){ default : /*Allocate inCopy and Copy in in inCopy*/ - inCopy=malloc((uint)(size*size)*sizeof(doubleComplex)); + inCopy=(doubleComplex*)malloc((unsigned int)(size*size)*sizeof(doubleComplex)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; /*Calculation of determinant*/ - vectPivot = malloc((uint)size*sizeof(int)); + vectPivot = (int*)malloc((unsigned int)size*sizeof(int)); zgetrf_ ( &size, &size, inCopy, &size, vectPivot, &info); out=DoubleComplex(1,0); @@ -112,7 +112,7 @@ doubleComplex zdeterma(doubleComplex * in, int size){ default : /*Copy the input matrix*/ - inCopy=malloc((uint)(size*size)*sizeof(doubleComplex)); + inCopy=malloc((unsigned int)(size*size)*sizeof(doubleComplex)); for (i=0;i<size*size;i++) inCopy[i]=in[i]; for (i=0;i<size;i++){ |