Changeset 2204 for trunk/psLib/test/dataManip/tst_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/test/dataManip/tst_psVectorFFT.c (modified) (19 diffs)

trunk/psLib/test/dataManip/tst_psVectorFFT.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-06 22:34:06 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #define GENIMAGE(img,c,r,TYP, valueFcn) \
 img = psImageAlloc(c,r,PS_TYPE_##TYP); \
-for (unsigned int row=0;row<r;row++) { \
+for (psU32 row=0;row<r;row++) { \
     ps##TYP* imgRow = img->data.TYP[row]; \
-    for (unsigned int col=0;col<c;col++) { \
+    for (psU32 col=0;col<c;col++) { \
         imgRow[col] = (ps##TYP)(valueFcn); \
     } \
 }
 
-static int testVectorFFT( void );
-static int testVectorRealImaginary( void );
-static int testVectorComplex( void );
-static int testVectorConjugate( void );
-static int testVectorPowerSpectrum( void );
+static psS32 testVectorFFT( void );
+static psS32 testVectorRealImaginary( void );
+static psS32 testVectorComplex( void );
+static psS32 testVectorConjugate( void );
+static psS32 testVectorPowerSpectrum( void );
 
 testDescription tests[] = {
@@ -54 +54 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -61 +61 @@
 }
 
-int testVectorFFT( void )
+psS32 testVectorFFT( void )
 {
     psVector * vec = NULL;
@@ -78 +78 @@
     vec = psVectorAlloc( 100, PS_TYPE_F32 );
     vec->n = vec->nalloc;
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         vec->data.F32[ n ] = sinf( ( psF32 ) n / 50.0f * M_PI );
     }
@@ -91 +91 @@
 
     // 3. verify that the only significant component cooresponds to the freqency of the input in step 1.
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         if ( n == 1 || n == 99 ) {
             if ( fabsf( cabsf( vec2->data.C32[ n ] ) - 50.0f ) > 0.1f ) {
@@ -111 +111 @@
         return 4;
     }
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         psF32 val = sinf( ( psF32 ) n / 50.0f * M_PI );
         psF32 vecVal = crealf( vec3->data.C32[ n ] ) / 100;
@@ -128 +128 @@
 }
 
-int testVectorRealImaginary( void )
+psS32 testVectorRealImaginary( void )
 {
     psVector * vec = NULL;
@@ -143 +143 @@
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         vec->data.C32[ n ] = n + I * ( n * 2 );
     }
@@ -171 +171 @@
 
     // 3. compare results to the real/imaginary components of input
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         psF32 r = n;
         psF32 i = ( n * 2 );
@@ -193 +193 @@
 }
 
-int testVectorComplex( void )
+psS32 testVectorComplex( void )
 {
     psVector * vec = NULL;
@@ -220 +220 @@
     vec->n = vec->nalloc;
     vec2->n = vec2->nalloc;
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         vec->data.F32[ n ] = n;
         vec2->data.F32[ n ] = ( n * 2 );
@@ -237 +237 @@
     // 4. call psVectorReal and psVectorImaginary on step 2 results (not needed, just use crealf/cimagf)
     // 5. compare step 4 results to input.
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         if ( fabsf( crealf( vec3->data.C32[ n ] ) - n ) > FLT_EPSILON ||
                 fabsf( cimagf( vec3->data.C32[ n ] ) - ( n * 2 ) ) > FLT_EPSILON ) {
@@ -278 +278 @@
 }
 
-int testVectorConjugate( void )
+psS32 testVectorConjugate( void )
 {
     psVector * vec = NULL;
@@ -293 +293 @@
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         vec->data.C32[ n ] = n + I * ( n * 2 );
     }
@@ -307 +307 @@
 
     // 4. verify each value is conjugate of input (a+bi -> a-bi)
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         if ( fabsf( crealf( vec->data.C32[ n ] ) - crealf( vec2->data.C32[ n ] ) ) > FLT_EPSILON ||
                 fabsf( cimagf( vec->data.C32[ n ] ) + cimagf( vec2->data.C32[ n ] ) ) > FLT_EPSILON ) {
@@ -322 +322 @@
 }
 
-int testVectorPowerSpectrum( void )
+psS32 testVectorPowerSpectrum( void )
 {
     psVector * vec = NULL;
@@ -338 +338 @@
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
-    for ( unsigned int n = 0; n < 100; n++ ) {
+    for ( psU32 n = 0; n < 100; n++ ) {
         vec->data.C32[ n ] = n + I * sinf( ( ( psF32 ) n ) / 50.f * M_PI );
     }
@@ -365 +365 @@
     };
 
-    for ( unsigned int n = 1; n < 50; n++ ) {
+    for ( psU32 n = 1; n < 50; n++ ) {
         val = ( cabsf( vec->data.C32[ n ] ) * cabsf( vec->data.C32[ n ] ) +
                 cabsf( vec->data.C32[ 100 - n ] ) * cabsf( vec->data.C32[ 100 - n ] ) ) / 100 / 100;