summaryrefslogtreecommitdiff
path: root/src/matrixOperations/spec2
diff options
context:
space:
mode:
Diffstat (limited to 'src/matrixOperations/spec2')
-rw-r--r--src/matrixOperations/spec2/cspec2a.c8
-rw-r--r--src/matrixOperations/spec2/dspec2a.c12
-rw-r--r--src/matrixOperations/spec2/sspec2a.c8
-rw-r--r--src/matrixOperations/spec2/zspec2a.c14
4 files changed, 21 insertions, 21 deletions
diff --git a/src/matrixOperations/spec2/cspec2a.c b/src/matrixOperations/spec2/cspec2a.c
index 094d99ac..d3a4312f 100644
--- a/src/matrixOperations/spec2/cspec2a.c
+++ b/src/matrixOperations/spec2/cspec2a.c
@@ -10,7 +10,7 @@
*
*/
-
+#include <stdlib.h>
#include "spec.h"
@@ -23,9 +23,9 @@ void cspec2a(floatComplex* in, int rows, floatComplex* eigenvalues,floatComplex*
doubleComplex* dblin;
doubleComplex* dbleigenvalues,*dbleigenvectors;
- dblin=malloc((uint)(rows*rows)*sizeof(doubleComplex));
- dbleigenvalues=malloc((uint)(rows*rows)*sizeof(doubleComplex));
- dbleigenvectors=malloc((uint)(rows*rows)*sizeof(doubleComplex));
+ dblin=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex));
+ dbleigenvalues=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex));
+ dbleigenvectors=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex));
for (i=0;i<rows*rows;i++) dblin[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i]));
diff --git a/src/matrixOperations/spec2/dspec2a.c b/src/matrixOperations/spec2/dspec2a.c
index ff4b0cb5..f1db6eca 100644
--- a/src/matrixOperations/spec2/dspec2a.c
+++ b/src/matrixOperations/spec2/dspec2a.c
@@ -10,7 +10,7 @@
*
*/
-
+#include <malloc.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
@@ -31,15 +31,15 @@ void dspec2a(double* in, int rows,double* eigenvalues,double* eigenvectors){
double* inCopy;
/* FIXME : malloc here */
- inCopy = malloc((uint)(rows*rows) * sizeof(double));
- outReal = malloc((uint)rows * sizeof(double));
+ inCopy = (double*)malloc((unsigned int)(rows*rows) * sizeof(double));
+ outReal = (double*)malloc((unsigned int)rows * sizeof(double));
outImag = NULL;
pdblLeftvectors=NULL;
pdblRightvectors=NULL;
iWorkSize = 4*rows;
- pdblWork = malloc((uint)iWorkSize * sizeof(double));
+ pdblWork = (double*)malloc((unsigned int)iWorkSize * sizeof(double));
for(i=0;i<rows*rows;i++) inCopy[i]=in[i];
@@ -65,8 +65,8 @@ void dspec2a(double* in, int rows,double* eigenvalues,double* eigenvectors){
for (i=0;i<rows*rows;i++) eigenvectors[i] = inCopy[i];
}
else {
- pdblRightvectors=malloc((uint)(rows*rows) * sizeof(double));
- outImag = malloc((uint)rows * sizeof(double));
+ pdblRightvectors=(double*)malloc((unsigned int)(rows*rows) * sizeof(double));
+ outImag = (double*)malloc((unsigned int)rows * sizeof(double));
C2F(dgeev)( "N", "V", &rows, inCopy, &rows, outReal, outImag,
pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, &INFO );
diff --git a/src/matrixOperations/spec2/sspec2a.c b/src/matrixOperations/spec2/sspec2a.c
index e168b540..d3ab00d5 100644
--- a/src/matrixOperations/spec2/sspec2a.c
+++ b/src/matrixOperations/spec2/sspec2a.c
@@ -10,7 +10,7 @@
*
*/
-
+#include <stdlib.h>
#include "spec.h"
@@ -23,9 +23,9 @@ void sspec2a(float* in, int rows, float* eigenvalues,float* eigenvectors){
double* dblin;
double *dbleigenvalues,*dbleigenvectors;
- dblin=malloc((uint)(rows*rows)*sizeof(double));
- dbleigenvalues=malloc((uint)(rows*rows)*sizeof(double));
- dbleigenvectors=malloc((uint)(rows*rows)*sizeof(double));
+ dblin=(double*)malloc((unsigned int)(rows*rows)*sizeof(double));
+ dbleigenvalues = (double*)malloc((unsigned int)(rows*rows)*sizeof(double));
+ dbleigenvectors = (double*)malloc((unsigned int)(rows*rows)*sizeof(double));
for (i=0;i<rows*rows;i++) dblin[i]=(double)in[i];
diff --git a/src/matrixOperations/spec2/zspec2a.c b/src/matrixOperations/spec2/zspec2a.c
index ae867012..37d99990 100644
--- a/src/matrixOperations/spec2/zspec2a.c
+++ b/src/matrixOperations/spec2/zspec2a.c
@@ -10,7 +10,7 @@
*
*/
-
+#include <malloc.h>
#include "spec.h"
#include "lapack.h"
#include "zeros.h"
@@ -32,14 +32,14 @@ void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues, doubleCompl
double* outImag;
doubleComplex* inCopy;
- inCopy = malloc((uint)(rows*rows) * sizeof(doubleComplex));
- outReal = malloc((uint)rows * sizeof(double));
- outImag = malloc((uint)rows * sizeof(double));
+ inCopy = (doubleComplex*)malloc((unsigned int)(rows*rows) * sizeof(doubleComplex));
+ outReal = (double*)malloc((unsigned int)rows * sizeof(double));
+ outImag = (double*)malloc((unsigned int)rows * sizeof(double));
pdblLeftvectors=NULL;
pdblRightvectors=NULL;
iWorkSize = 2*rows;
- pdblWork = malloc((uint)iWorkSize * sizeof(doubleComplex));
+ pdblWork = (doubleComplex*)malloc((unsigned int)iWorkSize * sizeof(doubleComplex));
pdblRWork = NULL;
pdblRWork2 = NULL;
@@ -67,13 +67,13 @@ void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues, doubleCompl
/* apply lapack function according to symmetry */
if(hermitian){
- pdblRWork2 = malloc((uint)(3*rows) * sizeof(double));
+ pdblRWork2 = (double*)malloc((unsigned int)(3*rows) * sizeof(double));
C2F(zheev)( "V", "U", &rows, eigenvectors, &rows, outReal, pdblWork, &iWorkSize, pdblRWork2, &INFO );
dzerosa(outImag,1,rows);
for (i=0;i<rows;i++) eigenvalues[i+i*rows]=DoubleComplex(outReal[i],outImag[i]);
}
else {
- pdblRWork = malloc((uint)(3*rows) * sizeof(doubleComplex));
+ pdblRWork = (doubleComplex*)malloc((unsigned int)(3*rows) * sizeof(doubleComplex));
C2F(zgeev)( "N", "V", &rows, inCopy, &rows, eigenvalues,
pdblLeftvectors, &rows, eigenvectors, &rows, pdblWork, &iWorkSize,
pdblRWork, &INFO );