Changeset 2204 for trunk/psLib/src/fft/psVectorFFT.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/src/fft/psVectorFFT.c (modified) (18 diffs)

trunk/psLib/src/fft/psVectorFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-13 20:46:57 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
 
-static bool p_fftwWisdomImported = false;
+static psBool p_fftwWisdomImported = false;
 
 psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction)
 {
-    unsigned int numElements;
+    psU32 numElements;
     psElemType type;
     fftwf_plan plan;
@@ -85 +85 @@
 
     if ((direction & PS_FFT_REAL_RESULT) != 0) {
-        for (int i = 0; i < numElements; i++) {
+        for (psS32 i = 0; i < numElements; i++) {
             out->data.F32[i] = out->data.C32[i];
         }
@@ -98 +98 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -127 +127 @@
         outVec = out->data.F32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = crealf(inVec[i]);
         }
@@ -138 +138 @@
         outVec = out->data.F64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = creal(inVec[i]);
         }
@@ -158 +158 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -187 +187 @@
         outVec = out->data.F32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = cimagf(inVec[i]);
         }
@@ -198 +198 @@
         outVec = out->data.F64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = cimag(inVec[i]);
         }
@@ -218 +218 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (real == NULL || imag == NULL) {
@@ -254 +254 @@
         outVec = out->data.C32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = realVec[i] + I * imagVec[i];
         }
@@ -266 +266 @@
         outVec = out->data.C64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = realVec[i] + I * imagVec[i];
         }
@@ -286 +286 @@
 {
     psElemType type;
-    unsigned int numElements;
+    psU32 numElements;
 
     if (in == NULL) {
@@ -316 +316 @@
         outVec = out->data.C32;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = crealf(inVec[i]) - I * cimagf(inVec[i]);
         }
@@ -327 +327 @@
         outVec = out->data.C64;
 
-        for (unsigned int i = 0; i < numElements; i++) {
+        for (psU32 i = 0; i < numElements; i++) {
             outVec[i] = creal(inVec[i]) - I * cimag(inVec[i]);
         }
@@ -347 +347 @@
 {
     psElemType type;
-    unsigned int outNumElements;
-    unsigned int inNumElements;
-    unsigned int inHalfNumElements;
-    unsigned int inNumElementsSquared;
+    psU32 outNumElements;
+    psU32 inNumElements;
+    psU32 inHalfNumElements;
+    psU32 inNumElementsSquared;
 
     if (in == NULL) {
@@ -378 +378 @@
 
         // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1)
-        for (unsigned int i = 1; i < inHalfNumElements; i++) {
+        for (psU32 i = 1; i < inHalfNumElements; i++) {
             inAbs1 = cabsf(inVec[i]);
             inAbs2 = cabsf(inVec[inNumElements - i]);
@@ -402 +402 @@
 
         // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1)
-        for (unsigned int i = 1; i < inHalfNumElements; i++) {
+        for (psU32 i = 1; i < inHalfNumElements; i++) {
             inAbs1 = cabs(inVec[i]);
             inAbs2 = cabs(inVec[inNumElements - i]);