Changeset 1404 for trunk/psLib/test/dataManip

Timestamp:

Aug 6, 2004, 11:50:14 AM (22 years ago)

Author:

desonia

Message:

modified runTest / FullUnitTest to suppress line numbers in messages.

Location:

trunk/psLib/test/dataManip

Files:

• tst_psVectorFFT.c (modified) (16 diffs)
• verified/tst_psMatrix02.stderr (modified) (1 diff)
• verified/tst_psMatrix03.stderr (modified) (1 diff)
• verified/tst_psMatrix04.stderr (modified) (1 diff)
• verified/tst_psMatrix07.stderr (modified) (1 diff)
• verified/tst_psMatrixVectorArithmetic02.stdout (modified) (6 diffs)
• verified/tst_psMatrixVectorArithmetic03.stderr (modified) (1 diff)
• verified/tst_psVectorFFT.stderr (modified) (1 diff)

trunk/psLib/test/dataManip/tst_psVectorFFT.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-02 19:43:23 $
+*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 21:50:13 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 img = psImageAlloc(c,r,PS_TYPE_##TYP); \
 for (unsigned int row=0;row<r;row++) { \
-        ps##TYP* imgRow = img->data.TYP[row]; \
-        for (unsigned int col=0;col<c;col++) { \
-                imgRow[col] = (ps##TYP)(valueFcn); \
-            } \
-    }
-    
+    ps##TYP* imgRow = img->data.TYP[row]; \
+    for (unsigned int col=0;col<c;col++) { \
+        imgRow[col] = (ps##TYP)(valueFcn); \
+    } \
+}
+
 static int testVectorFFT( void );
 static int testVectorRealImaginary( void );
@@ -53 +53 @@
                               }
                           };
-                          
+
 int main( int argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
-    
+
     return ( ! runTestSuite( stderr, "psFFT", tests, argc, argv ) );
 }
@@ -66 +66 @@
     psVector* vec2 = NULL;
     psVector* vec3 = NULL;
-    
+
     /*
     1. assign a vector to a sinisoid
@@ -74 +74 @@
     5. compare to original (should be equal to within a reasonable error)
     */
-    
+
     // 1. assign a vector to a sinisoid
     vec = psVectorAlloc( 100, PS_TYPE_F32 );
     vec->n = vec->nalloc;
     for ( unsigned int n = 0; n < 100; n++ ) {
-            vec->data.F32[ n ] = sinf( ( psF32 ) n / 50.0f * M_PI );
-        }
-        
+        vec->data.F32[ n ] = sinf( ( psF32 ) n / 50.0f * M_PI );
+    }
+
     // 2. perform a forward transform
     vec2 = psVectorFFT( NULL, vec, PS_FFT_FORWARD );
     if ( vec2->type.type != PS_TYPE_C32 ) {
-            psError( __func__, "FFT didn't produce complex values?" );
-            return 1;
+        psError( __func__, "FFT didn't produce complex values?" );
+        return 1;
+    }
+
+
+    // 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++ ) {
+        if ( n == 1 || n == 99 ) {
+            if ( fabsf( cabsf( vec2->data.C32[ n ] ) - 50.0f ) > 0.1f ) {
+                psError( __func__, "FFT didn't work for vector (n=%d)", n );
+                return 2;
+            }
+        } else {
+            if ( fabsf( cabsf( vec2->data.C32[ n ] ) ) > 0.1f ) {
+                psError( __func__, "FFT didn't work for vector (n=%d)", n );
+                return 3;
+            }
         }
-        
-        
-    // 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++ ) {
-            if ( n == 1 || n == 99 ) {
-                    if ( fabsf( cabsf( vec2->data.C32[ n ] ) - 50.0f ) > 0.1f ) {
-                            psError( __func__, "FFT didn't work for vector (n=%d)", n );
-                            return 2;
-                        }
-                } else {
-                    if ( fabsf( cabsf( vec2->data.C32[ n ] ) ) > 0.1f ) {
-                            psError( __func__, "FFT didn't work for vector (n=%d)", n );
-                            return 3;
-                        }
-                }
-        }
-        
+    }
+
     // 4. perform a reverse transform
     vec3 = psVectorFFT( NULL, vec2, PS_FFT_REVERSE );
     if ( vec3->type.type != PS_TYPE_C32 ) {
-            psError( __func__, "FFT didn't produce complex values?" );
-            return 4;
+        psError( __func__, "FFT didn't produce complex values?" );
+        return 4;
+    }
+    for ( unsigned int n = 0; n < 100; n++ ) {
+        psF32 val = sinf( ( psF32 ) n / 50.0f * M_PI );
+        psF32 vecVal = crealf( vec3->data.C32[ n ] ) / 100;
+        if ( fabsf( vecVal - val ) > 0.1f ) {
+            psError( __func__, "Reverse FFT didn't give me the original vector back (n=%d) (%.2f vs %.2f)",
+                     n, vecVal, val );
+            return 5;
         }
-    for ( unsigned int n = 0; n < 100; n++ ) {
-            psF32 val = sinf( ( psF32 ) n / 50.0f * M_PI );
-            psF32 vecVal = crealf( vec3->data.C32[ n ] ) / 100;
-            if ( fabsf( vecVal - val ) > 0.1f ) {
-                    psError( __func__, "Reverse FFT didn't give me the original vector back (n=%d) (%.2f vs %.2f)",
-                             n, vecVal, val );
-                    return 5;
-                }
-        }
-        
+    }
+
     psFree( vec );
     psFree( vec2 );
     psFree( vec3 );
-    
+
     return 0;
 }
@@ -133 +133 @@
     psVector* vec2 = NULL;
     psVector* vec3 = NULL;
-    
+
     /*
     1. create a C32 complex vector with distinctly different real and imaginary parts.
@@ -139 +139 @@
     3. compare results to the real/imaginary components of input
     */
-    
+
     // 1. create a C32 complex vector with distinctly different real and imaginary parts.
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
     for ( unsigned int n = 0; n < 100; n++ ) {
-            vec->data.C32[ n ] = n + I * ( n * 2 );
-        }
-        
+        vec->data.C32[ n ] = n + I * ( n * 2 );
+    }
+
     // 2. call psVectorReal and psVectorImaginary
     vec2 = psVectorReal( vec2, vec );
     if ( vec2 == NULL ) {
-            psError( __func__, "psVectorReal returned a NULL?" );
-            return 1;
-        }
+        psError( __func__, "psVectorReal returned a NULL?" );
+        return 1;
+    }
     if ( vec2->type.type != PS_TYPE_F32 ) {
-            psError( __func__, "psVectorReal returned a wrong type (%d)?",
-                     vec2->type.type );
-            return 2;
-        }
-        
+        psError( __func__, "psVectorReal returned a wrong type (%d)?",
+                 vec2->type.type );
+        return 2;
+    }
+
     vec3 = psVectorImaginary( vec3, vec );
     if ( vec3 == NULL ) {
-            psError( __func__, "psVectorImaginary returned a NULL?" );
-            return 3;
+        psError( __func__, "psVectorImaginary returned a NULL?" );
+        return 3;
+    }
+    if ( vec3->type.type != PS_TYPE_F32 ) {
+        psError( __func__, "psVectorImaginary returned a wrong type (%d)?",
+                 vec3->type.type );
+        return 4;
+    }
+
+    // 3. compare results to the real/imaginary components of input
+    for ( unsigned int n = 0; n < 100; n++ ) {
+        psF32 r = n;
+        psF32 i = ( n * 2 );
+        if ( fabsf( vec2->data.F32[ n ] - r ) > FLT_EPSILON ) {
+            psError( __func__, "psVectorReal didn't return the real portion at n=%d",
+                     n );
+            return 5;
         }
-    if ( vec3->type.type != PS_TYPE_F32 ) {
-            psError( __func__, "psVectorImaginary returned a wrong type (%d)?",
-                     vec3->type.type );
-            return 4;
+        if ( fabsf( vec3->data.F32[ n ] - i ) > FLT_EPSILON ) {
+            psError( __func__, "psVectorImaginary didn't return the real portion at n=%d",
+                     n );
+            return 6;
         }
-        
-    // 3. compare results to the real/imaginary components of input
-    for ( unsigned int n = 0; n < 100; n++ ) {
-            psF32 r = n;
-            psF32 i = ( n * 2 );
-            if ( fabsf( vec2->data.F32[ n ] - r ) > FLT_EPSILON ) {
-                    psError( __func__, "psVectorReal didn't return the real portion at n=%d",
-                             n );
-                    return 5;
-                }
-            if ( fabsf( vec3->data.F32[ n ] - i ) > FLT_EPSILON ) {
-                    psError( __func__, "psVectorImaginary didn't return the real portion at n=%d",
-                             n );
-                    return 6;
-                }
-        }
-        
+    }
+
     psFree( vec );
     psFree( vec2 );
     psFree( vec3 );
-    
+
     return 0;
 }
@@ -198 +198 @@
     psVector* vec2 = NULL;
     psVector* vec3 = NULL;
-    
+
     /*
     1. create two unique psF32 vectors of the same size
@@ -205 +205 @@
     4. call psVectorReal and psVectorImaginary on step 2 results
     5. compare step 4 results to input.
-    
+
     6. create a psF32 and a psF64 vector of the same size
     7. call psVectorComplex
     8. verify that an appropriate error occurred.
-    
+
     9. create two psf32 vectors of different sizes
     10. call psVectorComplex
     11. verify thet an appropriate error occurred.
     */
-    
+
     // 1. create two unique psF32 vectors of the same size
     vec = psVectorAlloc( 100, PS_TYPE_F32 );
@@ -221 +221 @@
     vec2->n = vec2->nalloc;
     for ( unsigned int n = 0; n < 100; n++ ) {
-            vec->data.F32[ n ] = n;
-            vec2->data.F32[ n ] = ( n * 2 );
-        }
-        
+        vec->data.F32[ n ] = n;
+        vec2->data.F32[ n ] = ( n * 2 );
+    }
+
     // 2. call psVectorComplex
     vec3 = psVectorComplex( vec3, vec, vec2 );
-    
+
     // 3. verify that the result is a psC32
     if ( vec3->type.type != PS_TYPE_C32 ) {
-            psError( __func__, "Vector Type from psVectorComplex is not complex? (%d)",
-                     vec3->type.type );
-            return 1;
-        }
-        
+        psError( __func__, "Vector Type from psVectorComplex is not complex? (%d)",
+                 vec3->type.type );
+        return 1;
+    }
+
     // 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++ ) {
-            if ( fabsf( crealf( vec3->data.C32[ n ] ) - n ) > FLT_EPSILON ||
-                    fabsf( cimagf( vec3->data.C32[ n ] ) - ( n * 2 ) ) > FLT_EPSILON ) {
-                    psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
-                             n, crealf( vec3->data.C32[ n ] ), cimagf( vec3->data.C32[ n ] ) );
-                    return 2;
-                };
-        }
-        
-        
+        if ( fabsf( crealf( vec3->data.C32[ n ] ) - n ) > FLT_EPSILON ||
+                fabsf( cimagf( vec3->data.C32[ n ] ) - ( n * 2 ) ) > FLT_EPSILON ) {
+            psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
+                     n, crealf( vec3->data.C32[ n ] ), cimagf( vec3->data.C32[ n ] ) );
+            return 2;
+        };
+    }
+
+
     // 6. create a psF32 and a psF64 vector of the same size
-    vec2 = psVectorRecycle( vec2, PS_TYPE_F64, 100 );
-    
+    vec2 = psVectorRecycle( vec2, 100, PS_TYPE_F64 );
+
     // 7. call psVectorComplex
     psLogMsg( __func__, PS_LOG_INFO, "Following should be an error (type mismatch)." );
@@ -255 +255 @@
     // 8. verify that an appropriate error occurred. (this partially has to be done via inspection)
     if ( vec3 != NULL ) {
-            psError( __func__, "psVectorComplex returned a vector though input types mismatched." );
-            return 3;
-        }
-        
+        psError( __func__, "psVectorComplex returned a vector though input types mismatched." );
+        return 3;
+    }
+
     // 9. create two psf32 vectors of different sizes
-    vec2 = psVectorRecycle( vec2, PS_TYPE_F32, 200 );
-    
+    vec2 = psVectorRecycle( vec2, 200, PS_TYPE_F32 );
+
     // 10. call psVectorComplex
     vec3 = psVectorComplex( vec3, vec, vec2 );
-    
+
     // 11. verify thet an appropriate error occurred. (actually, it isn't an error...)
     if ( vec3->n != 100 ) {
-            psError( __func__, "psVectorComplex returned a larger vector than the input supported (%d).", vec3->n );
-            return 4;
-        }
-        
+        psError( __func__, "psVectorComplex returned a larger vector than the input supported (%d).", vec3->n );
+        return 4;
+    }
+
     psFree( vec );
     psFree( vec2 );
     psFree( vec3 );
-    
+
     return 0;
 }
@@ -282 +282 @@
     psVector * vec = NULL;
     psVector* vec2 = NULL;
-    
+
     /*
     1. create a psC32 with unique real and imaginary values.
@@ -289 +289 @@
     4. verify each value is conjugate of input (a+bi -> a-bi)
     */
-    
+
     // 1. create a psC32 with unique real and imaginary values.
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
     for ( unsigned int n = 0; n < 100; n++ ) {
-            vec->data.C32[ n ] = n + I * ( n * 2 );
-        }
-        
+        vec->data.C32[ n ] = n + I * ( n * 2 );
+    }
+
     // 2. call psVectorConjugate
     vec2 = psVectorConjugate( vec2, vec );
-    
+
     // 3. verify result is psC32
     if ( vec2->type.type != PS_TYPE_C32 ) {
-            psError( __func__, "the psVectorConjugate didn't return a C32 vector" );
-            return 1;
-        }
-        
+        psError( __func__, "the psVectorConjugate didn't return a C32 vector" );
+        return 1;
+    }
+
     // 4. verify each value is conjugate of input (a+bi -> a-bi)
     for ( unsigned int 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 ) {
-                    psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
-                             n, crealf( vec2->data.C32[ n ] ), cimagf( vec2->data.C32[ n ] ) );
-                    return 2;
-                };
-        }
-        
-    psFree( vec );
-    psFree( vec2 );
-    
+        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 ) {
+            psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
+                     n, crealf( vec2->data.C32[ n ] ), cimagf( vec2->data.C32[ n ] ) );
+            return 2;
+        };
+    }
+
+    psFree( vec );
+    psFree( vec2 );
+
     return 0;
 }
@@ -327 +327 @@
     psVector* vec2 = NULL;
     psF32 val;
-    
+
     /*
     1. create a psC32 vector with unique real and imaginary components
@@ -334 +334 @@
     4. verify the values are the square of the absolute values of the original
     */
-    
+
     // 1. create a psC32 vector with unique real and imaginary components
     vec = psVectorAlloc( 100, PS_TYPE_C32 );
     vec->n = vec->nalloc;
     for ( unsigned int n = 0; n < 100; n++ ) {
-            vec->data.C32[ n ] = n + I * sinf( ( ( psF32 ) n ) / 50.f * M_PI );
-        }
-        
+        vec->data.C32[ n ] = n + I * sinf( ( ( psF32 ) n ) / 50.f * M_PI );
+    }
+
     // 2. call psVectorPowerSpectrum
     vec2 = psVectorPowerSpectrum( vec2, vec );
-    
+
     // 3. verify result is psF32
     if ( vec2->type.type != PS_TYPE_F32 ) {
-            psError( __func__, "the type was not PS_TYPE_F32." );
-            return 1;
-        }
-        
+        psError( __func__, "the type was not PS_TYPE_F32." );
+        return 1;
+    }
+
     // 4. verify the values are the square of the absolute values of the original
     //   (ADD specifies something else)
@@ -357 +357 @@
     //   P_N/2 = |C_N/2|^2/N^2
     //  where j = 1,2,...,(N/2-1)
-    
+
     val = cabsf( vec->data.C32[ 0 ] ) * cabsf( vec->data.C32[ 0 ] ) / 100 / 100;
     if ( fabsf( vec2->data.F32[ 0 ] - val ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorPowerSpectrum result is invalid (n=0, %.2f %.2f)",
-                     vec2->data.F32[ 0 ], val );
+        psError( __func__, "psVectorPowerSpectrum result is invalid (n=0, %.2f %.2f)",
+                 vec2->data.F32[ 0 ], val );
+        return 2;
+    };
+
+    for ( unsigned int 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;
+
+        if ( fabsf( val - vec2->data.F32[ n ] ) > FLT_EPSILON ) {
+            psError( __func__, "psVectorPowerSpectrum result is invalid (n=%d, %.2f %.2f)",
+                     n, vec2->data.F32[ n ], val );
             return 2;
         };
-        
-    for ( unsigned int 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;
-                    
-            if ( fabsf( val - vec2->data.F32[ n ] ) > FLT_EPSILON ) {
-                    psError( __func__, "psVectorPowerSpectrum result is invalid (n=%d, %.2f %.2f)",
-                             n, vec2->data.F32[ n ], val );
-                    return 2;
-                };
-        }
-        
+    }
+
     val = cabsf( vec->data.C32[ 50 ] ) * cabsf( vec->data.C32[ 50 ] ) / 100 / 100;
     if ( fabsf( vec2->data.F32[ 50 ] - val ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorPowerSpectrum result is invalid (n=50, %.2f %.2f)",
-                     vec2->data.F32[ 0 ], val );
-            return 2;
-        };
-        
-    psFree( vec );
-    psFree( vec2 );
-    
-    return 0;
-}
+        psError( __func__, "psVectorPowerSpectrum result is invalid (n=50, %.2f %.2f)",
+                 vec2->data.F32[ 0 ], val );
+        return 2;
+    };
+
+    psFree( vec );
+    psFree( vec2 );
+
+    return 0;
+}

trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: Pointer to inImage is same as outImage.
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: inImage or its data is NULL.
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: inImage not PS_TYPE_F64.
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: inImage not square array.
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: outImage not PS_TYPE_F64.
- <DATE> <TIME> |<HOST>|E|psMatrixTranspo|Invalid operation: outImage not square array.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: Pointer to inImage is same as outImage.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: inImage not square array.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: outImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|psMatrixTranspo|Invalid operation: outImage not square array.

trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E|    psMatrixLUD|Invalid operation: inImage or its data is NULL.
- <DATE> <TIME> |<HOST>|E|psMatrixLUSolve|Invalid operation: inVector or its data is NULL.
- <DATE> <TIME> |<HOST>|E|psMatrixLUSolve|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|    psMatrixLUD|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve|Invalid operation: inVector or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve|Invalid operation: inImage or its data is NULL.

trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E| psMatrixInvert|Invalid operation: inImage or its data is NULL.
- <DATE> <TIME> |<HOST>|E| psMatrixInvert|Invalid operation: determinant argument is NULL.
+<DATE><TIME>|<HOST>|E| psMatrixInvert|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E| psMatrixInvert|Invalid operation: determinant argument is NULL.

trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E|psMatrixToVecto|Invalid operation: inImage or its data is NULL.
- <DATE> <TIME> |<HOST>|E|psMatrixToVecto|Image does not have dim with 1 col or 1 row: (2 x 2).
- <DATE> <TIME> |<HOST>|E|psVectorToMatri|Invalid operation: inVector or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixToVecto|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixToVecto|Image does not have dim with 1 col or 1 row: (2 x 2).
+<DATE><TIME>|<HOST>|E|psVectorToMatri|Invalid operation: inVector or its data is NULL.

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic02.stdout

@@ -664 +664 @@
 
 Output:
-2.51+0.00i 2.51+0.00i 
-2.51+0.00i 2.51+0.00i 
-2.51+0.00i 2.51+0.00i 
+2.51-0.00i 2.51-0.00i 
+2.51-0.00i 2.51-0.00i 
+2.51-0.00i 2.51-0.00i 
 
 
@@ -1168 +1168 @@
 
 Output:
-89 89 
-89 89 
-89 89 
+90 90 
+90 90 
+90 90 
 
 
@@ -1360 +1360 @@
 
 Output:
-89 89 
-89 89 
-89 89 
+90 90 
+90 90 
+90 90 
 
 
@@ -2296 +2296 @@
 
 Output:
-2.51+0.00i
-2.51+0.00i
-2.51+0.00i
+2.51-0.00i
+2.51-0.00i
+2.51-0.00i
 
 
@@ -2800 +2800 @@
 
 Output:
-89
-89
-89
+90
+90
+90
 
 
@@ -2992 +2992 @@
 
 Output:
-89
-89
-89
+90
+90
+90
 
 

trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr

@@ -1 @@
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 403 - Null out argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 409 - Null in1 argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 415 - Null in2 argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 420 - Null op argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 718 - Null out argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 724 - Null in argument
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 729 - Null op argument
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Line 432 - Element types for arguments inconsistent: (1028, 1032, 1032)
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 739 - Element types for arguments inconsistent: (1028, 1032)
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Line 745 - Dimensionality for arguments inconsistent: (1, 3)
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|       psNanDiv|: Divide by zero
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Minimum operation not supported for complex numbers
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Maximum operation not supported for complex numbers
- <DATE> <TIME> |<HOST>|E|     psBinaryOp|: Invalid operation: yarg
- <DATE> <TIME> |<HOST>|E|      psUnaryOp|: Invalid operation: yarg
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null out argument
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null in1 argument
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null in2 argument
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null op argument
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null out argument
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null in argument
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null op argument
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Element types for arguments inconsistent: (1028, 1032, 1032)
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Element types for arguments inconsistent: (1028, 1032)
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Dimensionality for arguments inconsistent: (1, 3)
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Minimum operation not supported for complex numbers
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Maximum operation not supported for complex numbers
+<DATE><TIME>|<HOST>|E|     psBinaryOp|: Invalid operation: yarg
+<DATE><TIME>|<HOST>|E|      psUnaryOp|: Invalid operation: yarg

trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr

@@ -23 +23 @@
 \**********************************************************************************/
 
- <DATE> <TIME> |<HOST>|I|testVectorCompl|Following should be an error (type mismatch).
- <DATE> <TIME> |<HOST>|E|psVectorComplex|The inputs to psVectorComplex must be the same type.
+<DATE><TIME>|<HOST>|I|testVectorCompl|Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|E|psVectorComplex|The inputs to psVectorComplex must be the same type.
 
 ---> TESTPOINT PASSED (psFFT{psVectorComplex} | tst_psVectorFFT.c)