Index: trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist02.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psHist02.c (revision 1406) @@ -2,5 +2,5 @@ This routine must ensure that the psHistogram structure is correctly populated by the procedure psGetArrayHistogram(). - + *****************************************************************************/ #include @@ -26,7 +26,7 @@ int i = 0; int currentId = 0; - + currentId = psMemGetId(); - + /*********************************************************************/ /* Allocate and initialize data structures */ @@ -35,107 +35,107 @@ myData->n = myData->nalloc; for ( i = 0;i < NUM_DATA;i++ ) { - myData->data.F32[ i ] = LOWER + ( ( UPPER - LOWER ) / ( float ) NUM_DATA ) * ( float ) i; - } - + myData->data.F32[ i ] = LOWER + ( ( UPPER - LOWER ) / ( float ) NUM_DATA ) * ( float ) i; + } + myMask = psVectorAlloc( NUM_DATA, PS_TYPE_U8 ); myMask->n = myMask->nalloc; for ( i = 0;i < NUM_DATA;i++ ) { - if ( i >= ( NUM_DATA / 2 ) ) { - myMask->data.U8[ i ] = 1; - } else { - myMask->data.U8[ i ] = 0; - } + if ( i >= ( NUM_DATA / 2 ) ) { + myMask->data.U8[ i ] = 1; + } else { + myMask->data.U8[ i ] = 0; } - + } + for ( nb = 0;nb < 4;nb++ ) { - if ( nb == 0 ) - numBins = 1; - if ( nb == 1 ) - numBins = 2; - if ( nb == 2 ) - numBins = 10; - if ( nb == 3 ) - numBins = 20; - - /*********************************************************************/ - /* Allocate and Perform Histogram, no mask */ - /*********************************************************************/ - printPositiveTestHeader( stdout, - "psStats functions", - "Allocate and Perform Histogram, no mask" ); - - myHist = psHistogramAlloc( LOWER, UPPER, numBins ); - myHist = psVectorHistogram( myHist, myData, NULL, 0 ); - - for ( i = 0;i < numBins;i++ ) { - printf( "Bin number %d bounds: (%.2f - %.2f) data (%d)\n", i, - myHist->bounds->data.F32[ i ], - myHist->bounds->data.F32[ i + 1 ], - myHist->nums->data.U32[ i ] ); - } - psMemCheckCorruption( 1 ); - psFree( myHist ); - psMemCheckCorruption( 1 ); - - printFooter( stdout, - "psStats functions", - "Allocate and Perform Histogram, no mask", - testStatus ); - - /*********************************************************************/ - /* Allocate and Perform Histogram with mask */ - /*********************************************************************/ - printPositiveTestHeader( stdout, - "psStats functions", - "Allocate and Perform Histogram with mask" ); - - myHist = psHistogramAlloc( LOWER, UPPER, numBins ); - myHist = psVectorHistogram( myHist, myData, myMask, 1 ); - - for ( i = 0;i < numBins;i++ ) { - printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%d)\n", i, - myHist->bounds->data.F32[ i ], - myHist->bounds->data.F32[ i + 1 ], - myHist->nums->data.U32[ i ] ); - } - psMemCheckCorruption( 1 ); - psFree( myHist ); - psMemCheckCorruption( 1 ); - - printFooter( stdout, - "psStats functions", - "Allocate and Perform Histogram with mask", - testStatus ); + if ( nb == 0 ) + numBins = 1; + if ( nb == 1 ) + numBins = 2; + if ( nb == 2 ) + numBins = 10; + if ( nb == 3 ) + numBins = 20; + + /*********************************************************************/ + /* Allocate and Perform Histogram, no mask */ + /*********************************************************************/ + printPositiveTestHeader( stdout, + "psStats functions", + "Allocate and Perform Histogram, no mask" ); + + myHist = psHistogramAlloc( LOWER, UPPER, numBins ); + myHist = psVectorHistogram( myHist, myData, NULL, 0 ); + + for ( i = 0;i < numBins;i++ ) { + printf( "Bin number %d bounds: (%.2f - %.2f) data (%d)\n", i, + myHist->bounds->data.F32[ i ], + myHist->bounds->data.F32[ i + 1 ], + myHist->nums->data.U32[ i ] ); } + psMemCheckCorruption( 1 ); + psFree( myHist ); + psMemCheckCorruption( 1 ); + + printFooter( stdout, + "psStats functions", + "Allocate and Perform Histogram, no mask", + testStatus ); + + /*********************************************************************/ + /* Allocate and Perform Histogram with mask */ + /*********************************************************************/ + printPositiveTestHeader( stdout, + "psStats functions", + "Allocate and Perform Histogram with mask" ); + + myHist = psHistogramAlloc( LOWER, UPPER, numBins ); + myHist = psVectorHistogram( myHist, myData, myMask, 1 ); + + for ( i = 0;i < numBins;i++ ) { + printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%d)\n", i, + myHist->bounds->data.F32[ i ], + myHist->bounds->data.F32[ i + 1 ], + myHist->nums->data.U32[ i ] ); + } + psMemCheckCorruption( 1 ); + psFree( myHist ); + psMemCheckCorruption( 1 ); + + printFooter( stdout, + "psStats functions", + "Allocate and Perform Histogram with mask", + testStatus ); + } psFree( myMask ); - + printPositiveTestHeader( stdout, "psStats functions", "Calling psVectorHistogram() with various NULL inputs." ); - + // Verify the return value is null and program execution doesn't stop, // if input parameter myHist is null. - + myHist2 = psVectorHistogram( NULL, myData, NULL, 0 ); if ( myHist2 != NULL ) { - printf( "ERROR: myHist2!=NULL\n" ); - testStatus = false; - } + printf( "ERROR: myHist2!=NULL\n" ); + testStatus = false; + } psFree( myData ); - - + + // Verify the retrun value is the same as the input parameter myHist and // program execution doesn't stop, if the input parameter myArray is // null. - + myHist = psHistogramAlloc( LOWER, UPPER, numBins ); myHist = psVectorHistogram( myHist, NULL, NULL, 0 ); if ( myHist == NULL ) { - printf( "ERROR: myHist==NULL\n" ); - testStatus = false; - } + printf( "ERROR: myHist==NULL\n" ); + testStatus = false; + } psFree( myHist ); - - + + // Verify the return value is the same as the input parameter myHist and // program execution doesn't stop, if the input parameter myArray has no @@ -159,5 +159,5 @@ "Calling psVectorHistogram() with various NULL inputs.", testStatus ); - + /*************************************************************************/ /* Deallocate data structures */ @@ -166,17 +166,17 @@ "psStats functions", "Deallocate the psHistogram structure." ); - + psMemCheckCorruption( 1 ); memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); if ( 0 != memLeaks ) { - psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); - } + psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); + } psMemCheckCorruption( 1 ); - + printFooter( stdout, "psStats functions", "Deallocate the psHistogram structure.", testStatus ); - + return ( !testStatus ); } Index: trunk/psLib/test/dataManip/tst_psMatrix01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-07-30 02:55:47 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,16 +23,16 @@ #define PRINT_MATRIX(IMAGE) \ for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - printf("%f ", IMAGE->data.F64[i][j]); \ - } \ - printf("\n"); \ - } - + for(int j=0; jnumCols; j++) { \ + printf("%f ", IMAGE->data.F64[i][j]); \ + } \ + printf("\n"); \ +} + int main( int argc, char* argv[] ) { psImage * tempImage = NULL; - - + + // Test A - Create input and output images printPositiveTestHeader( stdout, "psMatrix", "Create input and output images" ); @@ -50,6 +50,6 @@ PRINT_MATRIX( inImage ); printFooter( stdout, "psMatrix", "Create input and output images", true ); - - + + // Test B - Transpose input image into output image printPositiveTestHeader( stdout, "psMatrix", "Transpose input image into output image" ); @@ -58,11 +58,12 @@ PRINT_MATRIX( outImage ); if ( outImage->type.dimen != PS_DIMEN_IMAGE ) { - printf( "Error: Resulting image is not PS_DIMEN_IMAGE\n" ); - } else if ( outImage != tempImage ) { + printf( "Error: Resulting image is not PS_DIMEN_IMAGE\n" ); + } else + if ( outImage != tempImage ) { printf( "Error: Return pointer not equal to output argument pointer\n" ); } printFooter( stdout, "psMatrix", "Transpose input image into output image", true ); - - + + // Test C - Transpose input image into auto allocated NULL output image printPositiveTestHeader( stdout, "psMatrix", "ranspose input image into auto allocated NULL output image" ); @@ -71,6 +72,6 @@ PRINT_MATRIX( outImageNull ); printFooter( stdout, "psMatrix", "ranspose input image into auto allocated NULL output image", true ); - - + + // Test D - Free images and check for leaks printPositiveTestHeader( stdout, "psMatrix", "Free images and check for leaks" ); @@ -80,12 +81,12 @@ int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { - printf( "ERROR: Found %d memory leaks\n", nLeaks ); - } + printf( "ERROR: Found %d memory leaks\n", nLeaks ); + } int nBad = psMemCheckCorruption( 0 ); if ( nBad ) { - printf( "ERROR: Found %d bad memory blocks\n", nBad ); - } + printf( "ERROR: Found %d bad memory blocks\n", nBad ); + } printFooter( stdout, "psMatrix" , "Free images and check for leaks", true ); - + return 0; } Index: trunk/psLib/test/dataManip/tst_psMatrix02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 1406) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-28 02:52:23 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: trunk/psLib/test/dataManip/tst_psMatrix03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 1406) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 23:29:34 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -83,7 +83,8 @@ if(luImage->type.dimen != PS_DIMEN_IMAGE) { printf("Error: Resulting image is not PS_DIMEN_IMAGE\n"); - } else if(luImage != tempImage) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(luImage != tempImage) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Calculate LU matrix", true); @@ -96,7 +97,8 @@ if(outVector->type.dimen != PS_DIMEN_VECTOR) { printf("Error: Resulting image is not PS_DIMEN_VECTOR\n"); - } else if(outVector != tempVector) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(outVector != tempVector) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Determine solution to matrix equation", true); Index: trunk/psLib/test/dataManip/tst_psMatrix04.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 1406) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-23 23:00:17 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,7 +67,8 @@ if(outImage->type.dimen != PS_DIMEN_IMAGE) { printf("Error: Resulting image is not PS_DIMEN_IMAGE\n"); - } else if(outImage != tempImage) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(outImage != tempImage) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Invert matrix and calculate determinant", true); Index: trunk/psLib/test/dataManip/tst_psMatrix05.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-07-30 03:13:08 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,11 +22,11 @@ #define PRINT_MATRIX(IMAGE) \ for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - printf("%f ", IMAGE->data.F64[i][j]); \ - } \ - printf("\n"); \ - } - - + for(int j=0; jnumCols; j++) { \ + printf("%f ", IMAGE->data.F64[i][j]); \ + } \ + printf("\n"); \ +} + + int main( int argc, char* argv[] ) @@ -35,6 +35,6 @@ psImage *inImage1 = NULL; psImage *inImage2 = NULL; - - + + // Test A - Create input and output images printPositiveTestHeader( stdout, "psMatrix", "Create input and output images" ); @@ -54,6 +54,6 @@ PRINT_MATRIX( inImage2 ); printFooter( stdout, "psMatrix", "Create input and output images", true ); - - + + // Test B - Multiply images printPositiveTestHeader( stdout, "psMatrix", "Multiply images" ); @@ -61,6 +61,6 @@ PRINT_MATRIX( outImage ); printFooter( stdout, "psMatrix", "Multiply images", true ); - - + + // Test C - Free input and output images printPositiveTestHeader( stdout, "psMatrix", "Free input and output images" ); @@ -70,12 +70,12 @@ int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { - printf( "ERROR: Found %d memory leaks\n", nLeaks ); - } + printf( "ERROR: Found %d memory leaks\n", nLeaks ); + } int nBad = psMemCheckCorruption( 0 ); if ( nBad ) { - printf( "ERROR: Found %d bad memory blocks\n", nBad ); - } + printf( "ERROR: Found %d bad memory blocks\n", nBad ); + } printFooter( stdout, "psMatrix" , "Free input and output images", true ); - + return 0; } Index: trunk/psLib/test/dataManip/tst_psMatrix06.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-07-30 03:48:15 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,11 +22,11 @@ #define PRINT_MATRIX(IMAGE) \ for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - printf("%f ", IMAGE->data.F64[i][j]); \ - } \ - printf("\n"); \ - } - - + for(int j=0; jnumCols; j++) { \ + printf("%f ", IMAGE->data.F64[i][j]); \ + } \ + printf("\n"); \ +} + + int main( int argc, char* argv[] ) @@ -34,35 +34,35 @@ psImage * outImage = NULL; psImage *inImage = NULL; - - + + // Test A - Create input and output images printPositiveTestHeader( stdout, "psMatrix", "Create input and output images" ); outImage = ( psImage* ) psImageAlloc( 4, 4, PS_TYPE_F64 ); inImage = ( psImage* ) psImageAlloc( 4, 4, PS_TYPE_F64 ); - + inImage->data.F64[ 0 ][ 0 ] = 1. / 1.; inImage->data.F64[ 0 ][ 1 ] = 1. / 2.; inImage->data.F64[ 0 ][ 2 ] = 1. / 3.; inImage->data.F64[ 0 ][ 3 ] = 1. / 4.; - + inImage->data.F64[ 1 ][ 0 ] = 1. / 2.; inImage->data.F64[ 1 ][ 1 ] = 1. / 3.; inImage->data.F64[ 1 ][ 2 ] = 1. / 4.; inImage->data.F64[ 1 ][ 3 ] = 1. / 5.; - + inImage->data.F64[ 2 ][ 0 ] = 1. / 3.; inImage->data.F64[ 2 ][ 1 ] = 1. / 4.; inImage->data.F64[ 2 ][ 2 ] = 1. / 5.; inImage->data.F64[ 2 ][ 3 ] = 1. / 6.; - + inImage->data.F64[ 3 ][ 0 ] = 1. / 4.; inImage->data.F64[ 3 ][ 1 ] = 1. / 5.; inImage->data.F64[ 3 ][ 2 ] = 1. / 6.; inImage->data.F64[ 3 ][ 3 ] = 1. / 7.; - + PRINT_MATRIX( inImage ); printFooter( stdout, "psMatrix", "Create input and output images", true ); - - + + // Test B - Calculate Eigenvectors printPositiveTestHeader( stdout, "psMatrix", "Calculate Eigenvectors" ); @@ -70,6 +70,6 @@ PRINT_MATRIX( outImage ); printFooter( stdout, "psMatrix", "Calculate Eigenvectors", true ); - - + + // Test C - Free input and output images printPositiveTestHeader( stdout, "psMatrix", "Free input and output images" ); @@ -78,12 +78,12 @@ int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { - printf( "ERROR: Found %d memory leaks\n", nLeaks ); - } + printf( "ERROR: Found %d memory leaks\n", nLeaks ); + } int nBad = psMemCheckCorruption( 0 ); if ( nBad ) { - printf( "ERROR: Found %d bad memory blocks\n", nBad ); - } + printf( "ERROR: Found %d bad memory blocks\n", nBad ); + } printFooter( stdout, "psMatrix" , "Free input and output images", true ); - + return 0; } Index: trunk/psLib/test/dataManip/tst_psMatrix07.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 1406) @@ -16,6 +16,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-23 23:00:17 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,7 +88,8 @@ if(v1->type.dimen != PS_DIMEN_VECTOR) { printf("Error: Resulting image is not PS_DIMEN_VECTOR\n"); - } else if(v1 != tempVector) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(v1 != tempVector) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Convert matrix to PS_DIMEN_VECTOR vector", true); @@ -108,7 +109,8 @@ if(v1->type.dimen != PS_DIMEN_TRANSV) { printf("Error: Resulting image is not PS_DIMEN_TRANSV\n"); - } else if(v1 != tempVector) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(v1 != tempVector) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Convert matrix to PS_DIMEN_TRANSV vector", true); @@ -128,7 +130,8 @@ if(m2->type.dimen != PS_DIMEN_IMAGE) { printf("Error: Resulting image is not PS_DIMEN_IMAGE\n"); - } else if(m2 != tempImage) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(m2 != tempImage) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Convert PS_DIMEN_VECTOR vector to matrix", true); @@ -149,7 +152,8 @@ if(m3->type.dimen != PS_DIMEN_IMAGE) { printf("Error: Resulting image is not PS_DIMEN_IMAGE\n"); - } else if(m3 != tempImage) { - printf("Error: Return pointer not equal to output argument pointer\n"); - } + } else + if(m3 != tempImage) { + printf("Error: Return pointer not equal to output argument pointer\n"); + } printFooter(stdout, "psMatrix", "Convert PS_DIMEN_TRANSV vector to matrix", true); Index: trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-29 01:52:19 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-02 19:43:23 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,10 +25,10 @@ #define PRINT_SCALAR(SCALAR,TYPE) \ if(PS_IS_PSELEMTYPE_COMPLEX(SCALAR->type.type)) { \ - printf("%.2f%f+.2i ", creal(SCALAR->data.TYPE), cimag(SCALAR->data.TYPE)); \ - } else if(PS_IS_PSELEMTYPE_INT(SCALAR->type.type)) { \ - printf("%d", (int)SCALAR->data.TYPE); \ - } else { \ - printf("%.2f", (double)SCALAR->data.TYPE); \ - } \ + printf("%.2f%f+.2i ", creal(SCALAR->data.TYPE), cimag(SCALAR->data.TYPE)); \ +} else if(PS_IS_PSELEMTYPE_INT(SCALAR->type.type)) { \ + printf("%d", (int)SCALAR->data.TYPE); \ +} else { \ + printf("%.2f", (double)SCALAR->data.TYPE); \ +} \ printf("\n\n"); @@ -36,12 +36,12 @@ #define PRINT_VECTOR(VECTOR,TYPE) \ for(int i=0; in; i++) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) { \ - printf("%.2f%+.2fi\n", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i])); \ - } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ - printf("%d\n", (int)VECTOR->data.TYPE[i]); \ - } else { \ - printf("%.2f\n", (double)VECTOR->data.TYPE[i]); \ - } \ - } \ + if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) { \ + printf("%.2f%+.2fi\n", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i])); \ + } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ + printf("%d\n", (int)VECTOR->data.TYPE[i]); \ + } else { \ + printf("%.2f\n", (double)VECTOR->data.TYPE[i]); \ + } \ +} \ printf("\n"); @@ -49,15 +49,15 @@ #define PRINT_MATRIX(IMAGE,TYPE) \ for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ - printf("%.2f%+.2fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ - } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ - } else { \ - printf("%.2f ", (double)IMAGE->data.TYPE[i][j]); \ - } \ - } \ - printf("\n"); \ - } \ + for(int j=0; jnumCols; j++) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ + printf("%.2f%+.2fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ + } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ + printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ + } else { \ + printf("%.2f ", (double)IMAGE->data.TYPE[i][j]); \ + } \ + } \ + printf("\n"); \ +} \ printf("\n"); @@ -66,6 +66,6 @@ psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE); \ for(int i=0; idata.TYPE[i] = VALUE; \ - } \ + NAME->data.TYPE[i] = VALUE; \ +} \ NAME->n = SIZE; @@ -74,18 +74,18 @@ psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - NAME->data.TYPE[i][j] = VALUE; \ - } \ - } - - + for(int j=0; jnumCols; j++) { \ + NAME->data.TYPE[i][j] = VALUE; \ + } \ +} + + #define CHECK_MEMORY \ psMemCheckLeaks(0, NULL, stdout); \ int nBad = psMemCheckCorruption(0); \ if(nBad) { \ - printf("ERROR: Found %d bad memory blocks\n", nBad); \ - } - - + printf("ERROR: Found %d bad memory blocks\n", nBad); \ +} + + int main( int argc, char* argv[] ) { @@ -109,5 +109,5 @@ printFooter(stdout, "psMatrixVectorArithmetic", "Test matrix psUnaryOp", true); \ } - + testBinaryOpM( abs, S32, -10, 0, 3, 2 ); testBinaryOpM( abs, F32, -10.0, 0.0, 3, 2 ); @@ -178,6 +178,6 @@ testBinaryOpM( datan, F64, 1.0, 0.0, 3, 2 ); testBinaryOpM( datan, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2 ); - - + + // Test vector unary operations #define testBinaryOpV(OP,TYPE,VALUE1,VALUE2,SIZE) \ @@ -198,5 +198,5 @@ printFooter(stdout, "psMatrixVectorArithmetic", "Test vector psUnaryOp", true); \ } - + testBinaryOpV( abs, S32, -10, 0, 3 ); testBinaryOpV( abs, F32, -10.0, 0.0, 3 ); @@ -267,5 +267,5 @@ testBinaryOpV( datan, F64, 1.0, 0.0, 3 ); testBinaryOpV( datan, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3 ); - + return 0; } Index: trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 1406) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-30 20:07:07 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: trunk/psLib/test/dataManip/tst_psMinimize00.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 1406) @@ -45,13 +45,16 @@ tmp = 1.0; tmp = x; - } else if (whichParamDeriv == 1) { - tmp = x; - tmp = x*x; - } else if (whichParamDeriv == 2) { - tmp = y; - tmp = y*y; - } else if (whichParamDeriv == 3) { - tmp = x * x * y; - } + } else + if (whichParamDeriv == 1) { + tmp = x; + tmp = x*x; + } else + if (whichParamDeriv == 2) { + tmp = y; + tmp = y*y; + } else + if (whichParamDeriv == 3) { + tmp = x * x * y; + } // printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n", Index: trunk/psLib/test/dataManip/tst_psMinimize01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 1406) @@ -44,9 +44,11 @@ if (whichParamDeriv == 0) { tmp = exp(-lambda * x); - } else if (whichParamDeriv == 1) { - tmp = -x * A * exp(-lambda * x); - } else if (whichParamDeriv == 2) { - tmp = 1.0; - } + } else + if (whichParamDeriv == 1) { + tmp = -x * A * exp(-lambda * x); + } else + if (whichParamDeriv == 2) { + tmp = 1.0; + } // printf("--------- myFuncDeriv((%.1f) %.1f %.1f %.1f, %d) is %.1f ---------\n", Index: trunk/psLib/test/dataManip/tst_psMinimize02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 1406) @@ -44,7 +44,8 @@ if (whichParamDeriv == 0) { tmp = 20.0 * (x - P0); - } else if (whichParamDeriv == 1) { - tmp = 40.0 * (y - P1); - } + } else + if (whichParamDeriv == 1) { + tmp = 40.0 * (y - P1); + } // printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f (%d)) is %.1f ---------\n", @@ -83,13 +84,16 @@ tmp = 1.0; tmp = x; - } else if (whichParamDeriv == 1) { - tmp = x; - tmp = x*x; - } else if (whichParamDeriv == 2) { - tmp = y; - tmp = y*y; - } else if (whichParamDeriv == 3) { - tmp = x * x * y; - } + } else + if (whichParamDeriv == 1) { + tmp = x; + tmp = x*x; + } else + if (whichParamDeriv == 2) { + tmp = y; + tmp = y*y; + } else + if (whichParamDeriv == 3) { + tmp = x * x * y; + } printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n", Index: trunk/psLib/test/dataManip/tst_psMinimize03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 1406) @@ -44,7 +44,8 @@ if (whichParamDeriv == 0) { tmp = 20.0 * (x - P0); - } else if (whichParamDeriv == 1) { - tmp = 40.0 * (y - P1); - } + } else + if (whichParamDeriv == 1) { + tmp = 40.0 * (y - P1); + } // printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f (%d)) is %.1f ---------\n", @@ -83,13 +84,16 @@ tmp = 1.0; tmp = x; - } else if (whichParamDeriv == 1) { - tmp = x; - tmp = x*x; - } else if (whichParamDeriv == 2) { - tmp = y; - tmp = y*y; - } else if (whichParamDeriv == 3) { - tmp = x * x * y; - } + } else + if (whichParamDeriv == 1) { + tmp = x; + tmp = x*x; + } else + if (whichParamDeriv == 2) { + tmp = y; + tmp = y*y; + } else + if (whichParamDeriv == 3) { + tmp = x * x * y; + } printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n", Index: trunk/psLib/test/dataManip/tst_psStats07.c =================================================================== --- trunk/psLib/test/dataManip/tst_psStats07.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psStats07.c (revision 1406) @@ -45,6 +45,6 @@ float realN50WithMask = ( float ) N / 4; float realNfitWithMask = ( float ) N / 4; - - + + /*************************************************************************/ /* Allocate and initialize data structures */ @@ -55,5 +55,5 @@ PS_STAT_ROBUST_STDEV | PS_STAT_ROBUST_QUARTILE ); - + maskVector = psVectorAlloc( N, PS_TYPE_U8 ); maskVector->n = N; @@ -61,11 +61,11 @@ // Set the mask vector and calculate the expected maximum. for ( i = 0;i < N;i++ ) { - if ( i < ( N / 2 ) ) { - maskVector->data.U8[ i ] = 0; - count++; - } else { - maskVector->data.U8[ i ] = 1; - } + if ( i < ( N / 2 ) ) { + maskVector->data.U8[ i ] = 0; + count++; + } else { + maskVector->data.U8[ i ] = 1; } + } /*************************************************************************/ /* Call psVectorStats() with no vector mask. */ @@ -74,162 +74,162 @@ "psStats functions", "PS_STAT_ROBUST_STATS: robust mean: no vector mask" ); - + myStats = psVectorStats( myStats, myVector, NULL, 0 ); - + printf( "The expected Mean was %.2f; the calculated Mean was %.2f\n", realMeanNoMask, myStats->robustMean ); - + if ( fabs( myStats->robustMean - realMeanNoMask ) < ( ERROR_TOLERANCE * realMeanNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust mean: no vector mask", testStatus ); - - + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Median: no vector mask" ); - + printf( "The expected Median was %.2f; the calculated Median was %.2f\n", realMedianNoMask, myStats->robustMedian ); if ( fabs( myStats->robustMedian - realMedianNoMask ) < ( ERROR_TOLERANCE * realMedianNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Median: no vector mask", testStatus ); - + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Mode: no vector mask" ); - - + + printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n", realModeNoMask, myStats->robustMode ); if ( fabs( myStats->robustMode - realModeNoMask ) < ( ERROR_TOLERANCE * realModeNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Mode: no vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Stdev: no vector mask" ); - + printf( "The expected Stdev was %.2f; the calculated Stdev was %.2f\n", realStdevNoMask, myStats->robustStdev ); if ( fabs( myStats->robustStdev - realStdevNoMask ) < ( ERROR_TOLERANCE * realStdevNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Stdev: no vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: lower quartile: no vector mask" ); - + printf( "The expected LQ was %.2f; the calculated LQ was %.2f\n", realLQNoMask, myStats->robustLQ ); - + if ( fabs( myStats->robustLQ - realLQNoMask ) < ( ERROR_TOLERANCE * realLQNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: lower quartile: no vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: upper quartile: no vector mask" ); - + printf( "The expected UQ was %.2f; the calculated UQ was %.2f\n", realUQNoMask, myStats->robustUQ ); if ( fabs( myStats->robustUQ - realUQNoMask ) < ( ERROR_TOLERANCE * realUQNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: lower quartile: no vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust N50: no vector mask" ); - + // XXX: realN50NoMask = myStats->robustN50; - + printf( "The expected N50 was %.2f; the calculated N50 was %.2f\n", realN50NoMask, myStats->robustN50 ); if ( fabs( myStats->robustN50 - realN50NoMask ) < ( ERROR_TOLERANCE * realN50NoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust N50: no vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Nfit: no vector mask" ); - + // XXX: realNfitNoMask = myStats->robustNfit; - + printf( "The expected Nfit was %.2f; the calculated Nfit was %.2f\n", realNfitNoMask, myStats->robustNfit ); if ( fabs( myStats->robustNfit - realNfitNoMask ) < ( ERROR_TOLERANCE * realNfitNoMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Nfit: no vector mask", testStatus ); - - + + return ( 0 ); - + /*************************************************************************/ /* Call psVectorStats() with vector mask. */ @@ -238,5 +238,5 @@ "psStats functions", "PS_STAT_ROBUST_STATS: robust mean: with vector mask" ); - + printf( "Calling psVectorStats() on a vector with elements masked.\n" ); myStats = psVectorStats( myStats, myVector, maskVector, 1 ); @@ -245,149 +245,149 @@ realMeanWithMask, myStats->robustMean ); if ( fabs( myStats->robustMean - realMeanWithMask ) < ( ERROR_TOLERANCE * realMeanWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust mean: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Median: with vector mask" ); - + printf( "The expected Median was %.2f; the calculated Median was %.2f\n", realMedianWithMask, myStats->robustMedian ); if ( fabs( myStats->robustMedian - realMedianWithMask ) < ( ERROR_TOLERANCE * realMedianWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Median: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Mode: with vector mask" ); - + printf( "The expected Mode was %.2f; the calculated Mode was %.2f\n", realModeWithMask, myStats->robustMode ); if ( fabs( myStats->robustMode - realModeWithMask ) < ( ERROR_TOLERANCE * realModeWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Mode: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Stdev: with vector mask" ); - + printf( "The expected Stdev was %.2f; the calculated Stdev was %.2f\n", realStdevWithMask, myStats->robustStdev ); if ( fabs( myStats->robustStdev - realStdevWithMask ) < ( ERROR_TOLERANCE * realStdevWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Stdev: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: lower quartile: with vector mask" ); - + printf( "The expected LQ was %.2f; the calculated LQ was %.2f\n", realLQWithMask, myStats->robustLQ ); if ( fabs( myStats->robustLQ - realLQWithMask ) < ( ERROR_TOLERANCE * realLQWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: lower quartile: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: upper quartile: with vector mask" ); - + printf( "The expected UQ was %.2f; the calculated UQ was %.2f\n", realUQWithMask, myStats->robustUQ ); if ( fabs( myStats->robustUQ - realUQWithMask ) < ( ERROR_TOLERANCE * realUQWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: lower quartile: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust N50: with vector mask" ); - + printf( "The expected N50 was %.2f; the calculated N50 was %.2f\n", realN50WithMask, myStats->robustN50 ); if ( fabs( myStats->robustN50 - realN50WithMask ) < ( ERROR_TOLERANCE * realN50WithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust N50: with vector mask", testStatus ); - - - + + + printPositiveTestHeader( stdout, "psStats functions", "PS_STAT_ROBUST_STATS: robust Nfit: with vector mask" ); - + printf( "The expected Nfit was %.2f; the calculated Nfit was %.2f\n", realNfitWithMask, myStats->robustNfit ); if ( fabs( myStats->robustNfit - realNfitWithMask ) < ( ERROR_TOLERANCE * realNfitWithMask ) ) { - testStatus = true; - } else { - testStatus = false; - globalTestStatus = false; - } + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } printFooter( stdout, "psVector functions", "PS_STAT_ROBUST_STATS: robust Nfit: with vector mask", testStatus ); - - - + + + /*************************************************************************/ /* Deallocate data structures */ @@ -396,20 +396,20 @@ "psStats functions", "psStats(): deallocating memory" ); - + psFree( myStats ); psFree( myVector ); psFree( maskVector ); - + psMemCheckCorruption( 1 ); memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); if ( 0 != memLeaks ) { - psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); - } - + psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); + } + printFooter( stdout, "psVector functions", "psStats(): deallocating memory", testStatus ); - + return ( !globalTestStatus ); } Index: trunk/psLib/test/dataManip/tst_psVectorFFT.c =================================================================== --- trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 1404) +++ trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii