Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 1405) +++ /trunk/psLib/src/astro/psCoord.c (revision 1406) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 19:38:51 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 1405) +++ /trunk/psLib/src/astro/psTime.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:51 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 1405) +++ /trunk/psLib/src/astro/psTime.h (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:51 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 1405) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 1406) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 19:38:51 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.h (revision 1405) +++ /trunk/psLib/src/astronomy/psAstrometry.h (revision 1406) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 1405) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 1406) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 19:38:51 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 1405) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 23:39:23 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -280,20 +280,21 @@ return false; } - } else if(value != NULL) { - - // The key was found and the new metadata item is a folder node. Don't add new metadata item, since - // it will wipe out existing node. - psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", - metadataItem->name ); - return false; - } else { - - // Duplicate key not found. Add new metadata item to metadata collection's hash - if(!psHashAdd( mdTable, key, metadataItem )) { - psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + } else + if(value != NULL) { + + // The key was found and the new metadata item is a folder node. Don't add new metadata item, since + // it will wipe out existing node. + psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", metadataItem->name ); return false; - } - } + } else { + + // Duplicate key not found. Add new metadata item to metadata collection's hash + if(!psHashAdd( mdTable, key, metadataItem )) { + psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + metadataItem->name ); + return false; + } + } // Add all items to metadata collection's list, even if they have the same metadata item names @@ -612,8 +613,9 @@ psError( __func__, "Null extName and extNum = 0 not allowed" ); return NULL; - } else if(extName && extNum) { - psError( __func__, "Both extName and extNum arguments should not have non zero values." ); - return NULL; - } + } else + if(extName && extNum) { + psError( __func__, "Both extName and extNum arguments should not have non zero values." ); + return NULL; + } // Allocate metadata if user didn't Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 1405) +++ /trunk/psLib/src/astronomy/psTime.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:51 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psTime.h =================================================================== --- /trunk/psLib/src/astronomy/psTime.h (revision 1405) +++ /trunk/psLib/src/astronomy/psTime.h (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:51 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psArray.c =================================================================== --- /trunk/psLib/src/collections/psArray.c (revision 1405) +++ /trunk/psLib/src/collections/psArray.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psBitSet.c =================================================================== --- /trunk/psLib/src/collections/psBitSet.c (revision 1405) +++ /trunk/psLib/src/collections/psBitSet.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psList.c =================================================================== --- /trunk/psLib/src/collections/psList.c (revision 1405) +++ /trunk/psLib/src/collections/psList.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 1405) +++ /trunk/psLib/src/collections/psMetadata.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 23:39:23 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -280,20 +280,21 @@ return false; } - } else if(value != NULL) { - - // The key was found and the new metadata item is a folder node. Don't add new metadata item, since - // it will wipe out existing node. - psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", - metadataItem->name ); - return false; - } else { - - // Duplicate key not found. Add new metadata item to metadata collection's hash - if(!psHashAdd( mdTable, key, metadataItem )) { - psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + } else + if(value != NULL) { + + // The key was found and the new metadata item is a folder node. Don't add new metadata item, since + // it will wipe out existing node. + psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", metadataItem->name ); return false; - } - } + } else { + + // Duplicate key not found. Add new metadata item to metadata collection's hash + if(!psHashAdd( mdTable, key, metadataItem )) { + psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + metadataItem->name ); + return false; + } + } // Add all items to metadata collection's list, even if they have the same metadata item names @@ -612,8 +613,9 @@ psError( __func__, "Null extName and extNum = 0 not allowed" ); return NULL; - } else if(extName && extNum) { - psError( __func__, "Both extName and extNum arguments should not have non zero values." ); - return NULL; - } + } else + if(extName && extNum) { + psError( __func__, "Both extName and extNum arguments should not have non zero values." ); + return NULL; + } // Allocate metadata if user didn't Index: /trunk/psLib/src/collections/psScalar.c =================================================================== --- /trunk/psLib/src/collections/psScalar.c (revision 1405) +++ /trunk/psLib/src/collections/psScalar.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psScalar.h =================================================================== --- /trunk/psLib/src/collections/psScalar.h (revision 1405) +++ /trunk/psLib/src/collections/psScalar.h (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 1405) +++ /trunk/psLib/src/collections/psVector.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/collections/psVector.h =================================================================== --- /trunk/psLib/src/collections/psVector.h (revision 1405) +++ /trunk/psLib/src/collections/psVector.h (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psFFT.c =================================================================== --- /trunk/psLib/src/dataManip/psFFT.c (revision 1405) +++ /trunk/psLib/src/dataManip/psFFT.c (revision 1406) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psFFT.h =================================================================== --- /trunk/psLib/src/dataManip/psFFT.h (revision 1405) +++ /trunk/psLib/src/dataManip/psFFT.h (revision 1406) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 1405) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 1406) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 1405) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 1406) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psMatrix.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.c (revision 1405) +++ /trunk/psLib/src/dataManip/psMatrix.c (revision 1406) @@ -20,6 +20,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1405) +++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1406) @@ -29,6 +29,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 1405) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 1405) +++ /trunk/psLib/src/dataManip/psStats.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 1405) +++ /trunk/psLib/src/dataManip/psStats.h (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psVectorFFT.c =================================================================== --- /trunk/psLib/src/dataManip/psVectorFFT.c (revision 1405) +++ /trunk/psLib/src/dataManip/psVectorFFT.c (revision 1406) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/dataManip/psVectorFFT.h =================================================================== --- /trunk/psLib/src/dataManip/psVectorFFT.h (revision 1405) +++ /trunk/psLib/src/dataManip/psVectorFFT.h (revision 1406) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/fft/psVectorFFT.c =================================================================== --- /trunk/psLib/src/fft/psVectorFFT.c (revision 1405) +++ /trunk/psLib/src/fft/psVectorFFT.c (revision 1406) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/fft/psVectorFFT.h =================================================================== --- /trunk/psLib/src/fft/psVectorFFT.h (revision 1405) +++ /trunk/psLib/src/fft/psVectorFFT.h (revision 1406) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 1405) +++ /trunk/psLib/src/image/psImage.c (revision 1406) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 1405) +++ /trunk/psLib/src/image/psImage.h (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/image/psImageExtraction.c =================================================================== --- /trunk/psLib/src/image/psImageExtraction.c (revision 1405) +++ /trunk/psLib/src/image/psImageExtraction.c (revision 1406) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -334,4 +334,7 @@ if ( delta < 0 ) { outData += numCols - 1; + if (outPosition != NULL) { + outPosition += numCols - 1; + } } @@ -362,5 +365,6 @@ *outData = statVal; \ if (outPosition != NULL) { \ - *(outPosition++) = col+c; \ + *outPosition = col+c; \ + outPosition += delta; \ } \ outData += delta; \ @@ -416,4 +420,7 @@ if ( delta < 0 ) { outData += numRows - 1; + if (outPosition != NULL) { + outPosition += numRows - 1; + } } @@ -428,5 +435,7 @@ *outData = statVal; if (outPosition != NULL) { - *(outPosition++) = row+r; + *outPosition = row+r; + outPosition += delta; + \ } outData += delta; Index: /trunk/psLib/src/image/psImageIO.c =================================================================== --- /trunk/psLib/src/image/psImageIO.c (revision 1405) +++ /trunk/psLib/src/image/psImageIO.c (revision 1406) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/image/psImageManip.c =================================================================== --- /trunk/psLib/src/image/psImageManip.c (revision 1405) +++ /trunk/psLib/src/image/psImageManip.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/image/psImageStats.c =================================================================== --- /trunk/psLib/src/image/psImageStats.c (revision 1405) +++ /trunk/psLib/src/image/psImageStats.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 19:38:52 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 1405) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 19:38:52 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psMatrix.c =================================================================== --- /trunk/psLib/src/math/psMatrix.c (revision 1405) +++ /trunk/psLib/src/math/psMatrix.c (revision 1406) @@ -20,6 +20,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 1405) +++ /trunk/psLib/src/math/psMinimize.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 1405) +++ /trunk/psLib/src/math/psPolynomial.c (revision 1406) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 1405) +++ /trunk/psLib/src/math/psPolynomial.h (revision 1406) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 1405) +++ /trunk/psLib/src/math/psSpline.c (revision 1406) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 1405) +++ /trunk/psLib/src/math/psSpline.h (revision 1406) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 1405) +++ /trunk/psLib/src/math/psStats.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 1405) +++ /trunk/psLib/src/math/psStats.h (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 1405) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 1406) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 1405) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.c (revision 1405) +++ /trunk/psLib/src/mathtypes/psScalar.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.h (revision 1405) +++ /trunk/psLib/src/mathtypes/psScalar.h (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 1405) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 21:50:13 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 1405) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psAbort.c =================================================================== --- /trunk/psLib/src/sys/psAbort.c (revision 1405) +++ /trunk/psLib/src/sys/psAbort.c (revision 1406) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 1405) +++ /trunk/psLib/src/sys/psError.c (revision 1406) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psLogMsg.c =================================================================== --- /trunk/psLib/src/sys/psLogMsg.c (revision 1405) +++ /trunk/psLib/src/sys/psLogMsg.c (revision 1406) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psLogMsg.h =================================================================== --- /trunk/psLib/src/sys/psLogMsg.h (revision 1405) +++ /trunk/psLib/src/sys/psLogMsg.h (revision 1406) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 1405) +++ /trunk/psLib/src/sys/psMemory.c (revision 1406) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 1405) +++ /trunk/psLib/src/sys/psMemory.h (revision 1406) @@ -14,6 +14,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psString.c =================================================================== --- /trunk/psLib/src/sys/psString.c (revision 1405) +++ /trunk/psLib/src/sys/psString.c (revision 1406) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 1405) +++ /trunk/psLib/src/sys/psTrace.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psAbort.c =================================================================== --- /trunk/psLib/src/sysUtils/psAbort.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psAbort.c (revision 1406) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psError.c =================================================================== --- /trunk/psLib/src/sysUtils/psError.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psError.c (revision 1406) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psHash.c =================================================================== --- /trunk/psLib/src/sysUtils/psHash.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psHash.c (revision 1406) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psHash.h =================================================================== --- /trunk/psLib/src/sysUtils/psHash.h (revision 1405) +++ /trunk/psLib/src/sysUtils/psHash.h (revision 1406) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 1406) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.h (revision 1405) +++ /trunk/psLib/src/sysUtils/psLogMsg.h (revision 1406) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 1406) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 23:37:39 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 1405) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 1406) @@ -14,6 +14,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psString.c =================================================================== --- /trunk/psLib/src/sysUtils/psString.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psString.c (revision 1406) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 1405) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 1406) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-05 19:38:52 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/types/psArray.c =================================================================== --- /trunk/psLib/src/types/psArray.c (revision 1405) +++ /trunk/psLib/src/types/psArray.c (revision 1406) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/types/psBitSet.c =================================================================== --- /trunk/psLib/src/types/psBitSet.c (revision 1405) +++ /trunk/psLib/src/types/psBitSet.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/types/psList.c =================================================================== --- /trunk/psLib/src/types/psList.c (revision 1405) +++ /trunk/psLib/src/types/psList.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-04 23:37:39 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 1405) +++ /trunk/psLib/src/types/psMetadata.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-05 23:39:23 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -280,20 +280,21 @@ return false; } - } else if(value != NULL) { - - // The key was found and the new metadata item is a folder node. Don't add new metadata item, since - // it will wipe out existing node. - psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", - metadataItem->name ); - return false; - } else { - - // Duplicate key not found. Add new metadata item to metadata collection's hash - if(!psHashAdd( mdTable, key, metadataItem )) { - psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + } else + if(value != NULL) { + + // The key was found and the new metadata item is a folder node. Don't add new metadata item, since + // it will wipe out existing node. + psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s", metadataItem->name ); return false; - } - } + } else { + + // Duplicate key not found. Add new metadata item to metadata collection's hash + if(!psHashAdd( mdTable, key, metadataItem )) { + psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s", + metadataItem->name ); + return false; + } + } // Add all items to metadata collection's list, even if they have the same metadata item names @@ -612,8 +613,9 @@ psError( __func__, "Null extName and extNum = 0 not allowed" ); return NULL; - } else if(extName && extNum) { - psError( __func__, "Both extName and extNum arguments should not have non zero values." ); - return NULL; - } + } else + if(extName && extNum) { + psError( __func__, "Both extName and extNum arguments should not have non zero values." ); + return NULL; + } // Allocate metadata if user didn't Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 1405) +++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 1406) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 20:32:58 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 1405) +++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 1406) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 20:32:44 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 1405) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 1406) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 19:45:58 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/astronomy/tst_psTime_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 1405) +++ /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 1406) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 21:26:59 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psArray.c =================================================================== --- /trunk/psLib/test/collections/tst_psArray.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psArray.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-15 22:17:03 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_01.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_01.c (revision 1406) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:56:15 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_02.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_02.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 23:09:53 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_03.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_03.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:56:15 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_04.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_04.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:56:15 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_05.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_05.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_05.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:56:15 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_06.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_06.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_06.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:56:15 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_07.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_07.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_07.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 18:57:30 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psBitSet_08.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet_08.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psBitSet_08.c (revision 1406) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-01 21:46:14 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psList.c =================================================================== --- /trunk/psLib/test/collections/tst_psList.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psList.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-15 22:17:03 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,13 +28,31 @@ testDescription tests[] = { - {testListAlloc,487,"psListAlloc",0,false}, - {testListAdd,488,"psListAdd",0,false}, - {testListGet,489,"psListGet",0,false}, - {testListRemove,490,"psListRemove",0,false}, - {testListConvert,491,"psListConvert",0,false}, - {testListIterator,494,"psListIterator",0,false}, - {testListFree,627,"psListFree",0,false}, - {testListSort,624,"psListSort",0,false}, - {NULL} + { + testListAlloc,487,"psListAlloc",0,false + }, + { + testListAdd,488,"psListAdd",0,false + }, + { + testListGet,489,"psListGet",0,false + }, + { + testListRemove,490,"psListRemove",0,false + }, + { + testListConvert,491,"psListConvert",0,false + }, + { + testListIterator,494,"psListIterator",0,false + }, + { + testListFree,627,"psListFree",0,false + }, + { + testListSort,624,"psListSort",0,false + }, + { + NULL + } }; Index: /trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 1406) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 20:32:58 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 1406) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 20:32:44 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psVector.c =================================================================== --- /trunk/psLib/test/collections/tst_psVector.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psVector.c (revision 1406) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-23 20:20:33 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psVectorSort_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-15 23:52:34 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psVectorSort_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 1406) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-28 00:05:19 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psVectorSort_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 1406) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-27 23:28:56 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/collections/tst_psVectorSort_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 1405) +++ /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 1406) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-27 22:48:19 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist02.c (revision 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 1405) +++ /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 Index: /trunk/psLib/test/image/tst_psImage.c =================================================================== --- /trunk/psLib/test/image/tst_psImage.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImage.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-13 01:37:58 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,10 +26,22 @@ testDescription tests[] = { - {testImageAlloc,546,"psImageAlloc",0,false}, - {testImageAlloc,548,"psImageFree",0,true}, - {testImageSubset,547,"psImageSubset",0,false}, - {testImageSubset,550,"psImageSubset",0,true}, - {testImageCopy,551,"psImageCopy",0,false}, - {NULL} + { + testImageAlloc,546,"psImageAlloc",0,false + }, + { + testImageAlloc,548,"psImageFree",0,true + }, + { + testImageSubset,547,"psImageSubset",0,false + }, + { + testImageSubset,550,"psImageSubset",0,true + }, + { + testImageCopy,551,"psImageCopy",0,false + }, + { + NULL + } }; @@ -49,6 +61,10 @@ psImage* image = NULL; unsigned int sizes = 6; - unsigned int numCols[] = {0,1,1,100,100,150}; - unsigned int numRows[] = {0,1,100,1,150,100}; + unsigned int numCols[] = { + 0,1,1,100,100,150 + }; + unsigned int numRows[] = { + 0,1,100,1,150,100 + }; unsigned int types = 12; psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64, Index: /trunk/psLib/test/image/tst_psImageExtraction.c =================================================================== --- /trunk/psLib/test/image/tst_psImageExtraction.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageExtraction.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:29:11 $ +* @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 Index: /trunk/psLib/test/image/tst_psImageFFT.c =================================================================== --- /trunk/psLib/test/image/tst_psImageFFT.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageFFT.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-08 01:05:01 $ + * @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 @@ -34,10 +34,22 @@ testDescription tests[] = { - {testImageFFT,600,"psImageFFT",0,false}, - {testImageRealImaginary,601,"psImageRealImaginary",0,false}, - {testImageComplex,602,"psImageComplex",0,false}, - {testImageConjugate,603,"psImageConjugate",0,false}, - {testImagePowerSpectrum,604,"psImagePowerSpectrum",0,false}, - {NULL} + { + testImageFFT,600,"psImageFFT",0,false + }, + { + testImageRealImaginary,601,"psImageRealImaginary",0,false + }, + { + testImageComplex,602,"psImageComplex",0,false + }, + { + testImageConjugate,603,"psImageConjugate",0,false + }, + { + testImagePowerSpectrum,604,"psImagePowerSpectrum",0,false + }, + { + NULL + } }; @@ -89,8 +101,9 @@ psError(__func__,"Result invalid at %d,%d (%.2f)",col,row,mag); } - } else if ( (col == 0 && (row == 1 || row == n-1)) + } else + if ( (col == 0 && (row == 1 || row == n-1)) || (row == 0 && (col==1 || col == n-1)) ) { - psError(__func__,"Result invalid at %d,%d (%.2f)",col,row,mag); - } + psError(__func__,"Result invalid at %d,%d (%.2f)",col,row,mag); + } } } Index: /trunk/psLib/test/image/tst_psImageIO.c =================================================================== --- /trunk/psLib/test/image/tst_psImageIO.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageIO.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-21 23:49:52 $ + * @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 @@ -35,7 +35,13 @@ testDescription tests[] = { - {testImageRead,567,"psImageReadSection",0,false}, - {testImageWrite,569,"psImageWriteSection",0,false}, - {NULL} + { + testImageRead,567,"psImageReadSection",0,false + }, + { + testImageWrite,569,"psImageWriteSection",0,false + }, + { + NULL + } }; @@ -291,5 +297,6 @@ mkdir("tmpImages",0777); remove - ("writeTest.fits"); + ("writeTest.fits") + ; if (! psImageWriteSection(img,0,0,0,NULL,0,"tmpImages/writeTest.fits")) { psError(__func__,"Couldn't write writeTest.fits."); Index: /trunk/psLib/test/image/tst_psImageManip.c =================================================================== --- /trunk/psLib/test/image/tst_psImageManip.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageManip.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-29 01:20:10 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,12 +33,28 @@ testDescription tests[] = { - {testImageClip,571,"psImageClip",0,false}, - {testImageClipNAN,572,"psImageClipNAN",0,false}, - {testImageClipComplexRegion,673,"psImageClipComplexRegion",0,false}, - {testImageOverlay,573,"psImageOverlay",0,false}, - {testImageRebin,559,"psImageRebin",0,false}, - {testImageRoll,562,"psImageRoll",0,false}, - {testImageRotate,560,"psImageRotate",0,false}, - {NULL} + { + testImageClip,571,"psImageClip",0,false + }, + { + testImageClipNAN,572,"psImageClipNAN",0,false + }, + { + testImageClipComplexRegion,673,"psImageClipComplexRegion",0,false + }, + { + testImageOverlay,573,"psImageOverlay",0,false + }, + { + testImageRebin,559,"psImageRebin",0,false + }, + { + testImageRoll,562,"psImageRoll",0,false + }, + { + testImageRotate,560,"psImageRotate",0,false + }, + { + NULL + } }; @@ -1117,7 +1133,9 @@ mkdir("temp",0777); remove - ("temp/fOut.fits"); + ("temp/fOut.fits") + ; remove - ("temp/sOut.fits"); + ("temp/sOut.fits") + ; int index = 0; bool fail = false; Index: /trunk/psLib/test/image/tst_psImageStats00.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats00.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageStats00.c (revision 1406) @@ -28,128 +28,128 @@ int IMAGE_Y_SIZE = 0; int currentId = 0; - + currentId = psMemGetId(); for ( nb = 0;nb < 6;nb++ ) { - if ( nb == 0 ) { - IMAGE_X_SIZE = 1; - IMAGE_Y_SIZE = 1; + if ( nb == 0 ) { + IMAGE_X_SIZE = 1; + IMAGE_Y_SIZE = 1; + } + if ( nb == 1 ) { + IMAGE_X_SIZE = 1; + IMAGE_Y_SIZE = N; + } + if ( nb == 2 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = 1; + } + if ( nb == 3 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = N; + } + if ( nb == 4 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = M; + } + if ( nb == 5 ) { + IMAGE_X_SIZE = M; + IMAGE_Y_SIZE = N; + } + printf( "*******************************\n" ); + printf( "* IMAGE SIZE is (%d by %d)\n", IMAGE_X_SIZE, IMAGE_Y_SIZE ); + printf( "*******************************\n" ); + /*********************************************************************/ + /* Allocate and initialize data structures */ + /*********************************************************************/ + tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); + + for ( i = 0;i < tmpImage->numRows;i++ ) { + for ( j = 0;j < tmpImage->numCols;j++ ) { + tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j + 0.1 ); + } + } + tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 ); + for ( i = 0;i < tmpMask->numRows;i++ ) { + for ( j = 0;j < tmpMask->numCols;j++ ) { + if ( ( i > ( tmpMask->numRows / 2 ) ) && + ( j > ( tmpMask->numCols / 2 ) ) ) { + tmpMask->data.U8[ i ][ j ] = 1; + } else { + tmpMask->data.U8[ i ][ j ] = 0; } - if ( nb == 1 ) { - IMAGE_X_SIZE = 1; - IMAGE_Y_SIZE = N; - } - if ( nb == 2 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = 1; - } - if ( nb == 3 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = N; - } - if ( nb == 4 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = M; - } - if ( nb == 5 ) { - IMAGE_X_SIZE = M; - IMAGE_Y_SIZE = N; - } - printf( "*******************************\n" ); - printf( "* IMAGE SIZE is (%d by %d)\n", IMAGE_X_SIZE, IMAGE_Y_SIZE ); - printf( "*******************************\n" ); - /*********************************************************************/ - /* Allocate and initialize data structures */ - /*********************************************************************/ - tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); - - for ( i = 0;i < tmpImage->numRows;i++ ) { - for ( j = 0;j < tmpImage->numCols;j++ ) { - tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j + 0.1 ); - } - } - tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 ); - for ( i = 0;i < tmpMask->numRows;i++ ) { - for ( j = 0;j < tmpMask->numCols;j++ ) { - if ( ( i > ( tmpMask->numRows / 2 ) ) && - ( j > ( tmpMask->numCols / 2 ) ) ) { - tmpMask->data.U8[ i ][ j ] = 1; - } else { - tmpMask->data.U8[ i ][ j ] = 0; - } - } - } - - /*************************************************************************/ - /* Calculate Histogram with no mask */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Calculate Histogram, no mask" ); - - myHist = psHistogramAlloc( 0.0, ( float ) ( IMAGE_X_SIZE + IMAGE_Y_SIZE ), - NUM_BINS ); - myHist = psImageHistogram( myHist, tmpImage, NULL, 0 ); - for ( i = 0;i < NUM_BINS;i++ ) { - printf( "Bin number %d bounds: (%.1f - %.1f) data (%d)\n", i, - myHist->bounds->data.F32[ i ], - myHist->bounds->data.F32[ i + 1 ], - myHist->nums->data.S32[ i ] ); - } - psFree( myHist ); - - psMemCheckCorruption( 1 ); - printFooter( stdout, - "psImageStats functions", - "Calculate Histogram, no mask", - testStatus ); - - /*************************************************************************/ - /* Calculate Histogram with mask */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Calculate Histogram with mask" ); - - myHist = psHistogramAlloc( 0.0, ( float ) ( IMAGE_X_SIZE + IMAGE_Y_SIZE ), - NUM_BINS ); - myHist = psImageHistogram( myHist, tmpImage, tmpMask, 1 ); - for ( i = 0;i < NUM_BINS;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.S32[ i ] ); - } - - psMemCheckCorruption( 1 ); - printFooter( stdout, - "psImageStats functions", - "Calculate Histogram with mask", - testStatus ); - - /*************************************************************************/ - /* Deallocate data structures */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Deallocate the psHistogram/psImage structure." ); - psFree( myHist ); - psFree( tmpImage ); - psFree( tmpMask ); - - psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); - if ( 0 != memLeaks ) { - psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); - } - - printFooter( stdout, - "psImageStats functions", - "Deallocate the psHistogram/psImage structure.", - testStatus ); + } } + + /*************************************************************************/ + /* Calculate Histogram with no mask */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Calculate Histogram, no mask" ); + + myHist = psHistogramAlloc( 0.0, ( float ) ( IMAGE_X_SIZE + IMAGE_Y_SIZE ), + NUM_BINS ); + myHist = psImageHistogram( myHist, tmpImage, NULL, 0 ); + for ( i = 0;i < NUM_BINS;i++ ) { + printf( "Bin number %d bounds: (%.1f - %.1f) data (%d)\n", i, + myHist->bounds->data.F32[ i ], + myHist->bounds->data.F32[ i + 1 ], + myHist->nums->data.S32[ i ] ); + } + psFree( myHist ); + + psMemCheckCorruption( 1 ); + printFooter( stdout, + "psImageStats functions", + "Calculate Histogram, no mask", + testStatus ); + + /*************************************************************************/ + /* Calculate Histogram with mask */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Calculate Histogram with mask" ); + + myHist = psHistogramAlloc( 0.0, ( float ) ( IMAGE_X_SIZE + IMAGE_Y_SIZE ), + NUM_BINS ); + myHist = psImageHistogram( myHist, tmpImage, tmpMask, 1 ); + for ( i = 0;i < NUM_BINS;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.S32[ i ] ); + } + + psMemCheckCorruption( 1 ); + printFooter( stdout, + "psImageStats functions", + "Calculate Histogram with mask", + testStatus ); + + /*************************************************************************/ + /* Deallocate data structures */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Deallocate the psHistogram/psImage structure." ); + psFree( myHist ); + psFree( tmpImage ); + psFree( tmpMask ); + + psMemCheckCorruption( 1 ); + memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); + if ( 0 != memLeaks ) { + psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); + } + + printFooter( stdout, + "psImageStats functions", + "Deallocate the psHistogram/psImage structure.", + testStatus ); + } printPositiveTestHeader( stdout, "psImageStats functions", "Calling psImageHistogram() with NULL parameters" ); - + tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); myHist = psHistogramAlloc( 0.0, ( float ) ( IMAGE_X_SIZE + IMAGE_Y_SIZE ), @@ -157,13 +157,13 @@ myHist2 = psImageHistogram( NULL, tmpImage, NULL, 0 ); if ( myHist2 != NULL ) { - printf( "ERROR: myHist2 not equal to NULL\n" ); - } - + printf( "ERROR: myHist2 not equal to NULL\n" ); + } + myHist2 = psImageHistogram( myHist, NULL, NULL, 0 ); myHist2 = psImageHistogram( NULL, tmpImage, NULL, 0 ); if ( myHist2 != NULL ) { - printf( "ERROR: myHist2 not equal to NULL\n" ); - } - + printf( "ERROR: myHist2 not equal to NULL\n" ); + } + psMemCheckCorruption( 1 ); psFree( myHist ); @@ -172,12 +172,12 @@ memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); if ( 0 != memLeaks ) { - psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); - } - + psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); + } + printFooter( stdout, "psImageStats functions", "Calling psImageHistogram() with NULL parameters", testStatus ); - + return ( !testStatus ); } Index: /trunk/psLib/test/image/tst_psImageStats01.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats01.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageStats01.c (revision 1406) @@ -29,114 +29,114 @@ int IMAGE_Y_SIZE = 0; int currentId = 0; - + currentId = psMemGetId(); for ( nb = 0;nb < 6;nb++ ) { - if ( nb == 0 ) { - IMAGE_X_SIZE = 1; - IMAGE_Y_SIZE = 1; + if ( nb == 0 ) { + IMAGE_X_SIZE = 1; + IMAGE_Y_SIZE = 1; + } + if ( nb == 1 ) { + IMAGE_X_SIZE = 1; + IMAGE_Y_SIZE = N; + } + if ( nb == 2 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = 1; + } + if ( nb == 3 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = N; + } + if ( nb == 4 ) { + IMAGE_X_SIZE = N; + IMAGE_Y_SIZE = M; + } + if ( nb == 5 ) { + IMAGE_X_SIZE = M; + IMAGE_Y_SIZE = N; + } + printf( "*******************************\n" ); + printf( "* IMAGE SIZE is (%d by %d)\n", IMAGE_X_SIZE, IMAGE_Y_SIZE ); + printf( "*******************************\n" ); + + /*************************************************************************/ + /* Allocate and initialize data structures */ + /*************************************************************************/ + tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); + + for ( i = 0;i < tmpImage->numRows;i++ ) { + for ( j = 0;j < tmpImage->numCols;j++ ) { + tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ); + } + } + tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 ); + for ( i = 0;i < tmpMask->numRows;i++ ) { + for ( j = 0;j < tmpMask->numCols;j++ ) { + if ( ( i > ( tmpMask->numRows / 2 ) ) && + ( j > ( tmpMask->numCols / 2 ) ) ) { + tmpMask->data.U8[ i ][ j ] = 1; + } else { + tmpMask->data.U8[ i ][ j ] = 0; } - if ( nb == 1 ) { - IMAGE_X_SIZE = 1; - IMAGE_Y_SIZE = N; - } - if ( nb == 2 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = 1; - } - if ( nb == 3 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = N; - } - if ( nb == 4 ) { - IMAGE_X_SIZE = N; - IMAGE_Y_SIZE = M; - } - if ( nb == 5 ) { - IMAGE_X_SIZE = M; - IMAGE_Y_SIZE = N; - } - printf( "*******************************\n" ); - printf( "* IMAGE SIZE is (%d by %d)\n", IMAGE_X_SIZE, IMAGE_Y_SIZE ); - printf( "*******************************\n" ); - - /*************************************************************************/ - /* Allocate and initialize data structures */ - /*************************************************************************/ - tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); - - for ( i = 0;i < tmpImage->numRows;i++ ) { - for ( j = 0;j < tmpImage->numCols;j++ ) { - tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ); - } - } - tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 ); - for ( i = 0;i < tmpMask->numRows;i++ ) { - for ( j = 0;j < tmpMask->numCols;j++ ) { - if ( ( i > ( tmpMask->numRows / 2 ) ) && - ( j > ( tmpMask->numCols / 2 ) ) ) { - tmpMask->data.U8[ i ][ j ] = 1; - } else { - tmpMask->data.U8[ i ][ j ] = 0; - } - } - } - - myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN ); - /*************************************************************************/ - /* Calculate Sample Mean with no mask */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Calculate Sample Mean, no mask %d" ); - - myStats = psImageStats( myStats, tmpImage, NULL, 0 ); - printf( "The sample mean was %.2f\n", myStats->sampleMean ); - - psMemCheckCorruption( 1 ); - - printFooter( stdout, - "psImageStats functions", - "Calculate Sample Mean, no mask", - testStatus ); - - /*************************************************************************/ - /* Calculate Sample Mean with mask */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Calculate Sample Mean with mask" ); - - myStats = psImageStats( myStats, tmpImage, tmpMask, 1 ); - printf( "The sample mean was %.2f\n", myStats->sampleMean ); - - psMemCheckCorruption( 1 ); - - printFooter( stdout, - "psImageStats functions", - "Calculate Sample Mean with mask", - testStatus ); - - /*************************************************************************/ - /* Deallocate data structures */ - /*************************************************************************/ - printPositiveTestHeader( stdout, - "psImageStats functions", - "Deallocate the psStats/psImage structure." ); - psFree( myStats ); - psFree( tmpImage ); - psFree( tmpMask ); - - psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); - if ( 0 != memLeaks ) { - psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); - } - - printFooter( stdout, - "psImageStats functions", - "Deallocate the psStats/psImage structure.", - testStatus ); + } } - + + myStats = psStatsAlloc( PS_STAT_SAMPLE_MEAN ); + /*************************************************************************/ + /* Calculate Sample Mean with no mask */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Calculate Sample Mean, no mask %d" ); + + myStats = psImageStats( myStats, tmpImage, NULL, 0 ); + printf( "The sample mean was %.2f\n", myStats->sampleMean ); + + psMemCheckCorruption( 1 ); + + printFooter( stdout, + "psImageStats functions", + "Calculate Sample Mean, no mask", + testStatus ); + + /*************************************************************************/ + /* Calculate Sample Mean with mask */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Calculate Sample Mean with mask" ); + + myStats = psImageStats( myStats, tmpImage, tmpMask, 1 ); + printf( "The sample mean was %.2f\n", myStats->sampleMean ); + + psMemCheckCorruption( 1 ); + + printFooter( stdout, + "psImageStats functions", + "Calculate Sample Mean with mask", + testStatus ); + + /*************************************************************************/ + /* Deallocate data structures */ + /*************************************************************************/ + printPositiveTestHeader( stdout, + "psImageStats functions", + "Deallocate the psStats/psImage structure." ); + psFree( myStats ); + psFree( tmpImage ); + psFree( tmpMask ); + + psMemCheckCorruption( 1 ); + memLeaks = psMemCheckLeaks( currentId, NULL, NULL ); + if ( 0 != memLeaks ) { + psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); + } + + printFooter( stdout, + "psImageStats functions", + "Deallocate the psStats/psImage structure.", + testStatus ); + } + /*************************************************************************/ /* Test With Various Null Inputs */ @@ -145,31 +145,31 @@ "psImageStats functions", "Test With Various Null Inputs" ); - + tmpImage = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_F32 ); tmpMask = psImageAlloc( IMAGE_X_SIZE, IMAGE_Y_SIZE, PS_TYPE_U8 ); myStats = psStatsAlloc( 0 ); - + myStats2 = psImageStats( myStats, NULL, NULL, 0 ); if ( myStats2 != NULL ) { - printf( "ERROR: myStats2 = psImageStats(myStats, NULL, NULL, 0) != NULL\n" ); - } - + printf( "ERROR: myStats2 = psImageStats(myStats, NULL, NULL, 0) != NULL\n" ); + } + myStats2 = psImageStats( NULL, tmpImage, NULL, 0 ); if ( myStats2 != NULL ) { - printf( "ERROR: myStats2 = psImageStats(NULL, tmpImage, NULL, 0) != NULL\n" ); - } - + printf( "ERROR: myStats2 = psImageStats(NULL, tmpImage, NULL, 0) != NULL\n" ); + } + myStats2 = psImageStats( myStats, tmpImage, NULL, 0 ); - + psFree( myStats ); psFree( tmpImage ); psFree( tmpMask ); - + 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, "psImageStats functions", Index: /trunk/psLib/test/image/tst_psImageStats02.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats02.c (revision 1405) +++ /trunk/psLib/test/image/tst_psImageStats02.c (revision 1406) @@ -4,5 +4,5 @@ thouroughly tested elsewhere, we will only test psImageStats() with the PS_STAT_SAMPLE_MEAN here. - + NOTE: After you debug, set CHEBY_X_DIM != CHEBY_Y_DIM. Also, uses non-square images. @@ -32,5 +32,5 @@ int rc = 0; int currentId = 0; - + currentId = psMemGetId(); /*************************************************************************/ @@ -40,11 +40,11 @@ outImage = psImageAlloc( IMAGE_SIZE, IMAGE_SIZE, PS_TYPE_F32 ); for ( i = 0;i < IMAGE_SIZE;i++ ) { - for ( j = 0;j < IMAGE_SIZE;j++ ) { - tmpImage->data.F32[ i ][ j ] = 4.0; - tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ); - tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ) + ( 4.0 * ( float ) i ); - outImage->data.F32[ i ][ j ] = 0.0; - } + for ( j = 0;j < IMAGE_SIZE;j++ ) { + tmpImage->data.F32[ i ][ j ] = 4.0; + tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ); + tmpImage->data.F32[ i ][ j ] = ( float ) ( i + j ) + ( 4.0 * ( float ) i ); + outImage->data.F32[ i ][ j ] = 0.0; } + } my2DPoly = psPolynomial2DAlloc( CHEBY_X_DIM, CHEBY_Y_DIM ); /*************************************************************************/ @@ -54,12 +54,12 @@ "psImageStats functions", "Calculate Chebyshev Polynomials, no mask" ); - + my2DPoly = psImageFitPolynomial( tmpImage, my2DPoly ); for ( i = 0;i < CHEBY_X_DIM;i++ ) { - for ( j = 0;j < CHEBY_Y_DIM;j++ ) { - printf( "Cheby Polynomial (%d, %d) coefficient is %.2f\n", i, j, my2DPoly->coeff[ i ][ j ] ); - } + for ( j = 0;j < CHEBY_Y_DIM;j++ ) { + printf( "Cheby Polynomial (%d, %d) coefficient is %.2f\n", i, j, my2DPoly->coeff[ i ][ j ] ); } - + } + psMemCheckCorruption( 1 ); printFooter( stdout, @@ -73,21 +73,21 @@ "psImageStats functions", "Calculate Chebyshev Polynomials, no mask" ); - + rc = psImageEvalPolynomial( outImage, my2DPoly ); for ( i = 0;i < IMAGE_SIZE;i++ ) { - for ( j = 0;j < IMAGE_SIZE;j++ ) { - - // printf("pixel[%d][%d] is (%f, %f)\n", i, j, - // tmpImage->data.F32[i][j], - // outImage->data.F32[i][j]); - if ( fabs( outImage->data.F32[ i ][ j ] - tmpImage->data.F32[ i ][ j ] ) > THRESHOLD ) { - printf( "Pixel (%d, %d) is %.2f, should be %.2f\n", i, j, - outImage->data.F32[ i ][ j ], - tmpImage->data.F32[ i ][ j ] ); - } - - } + for ( j = 0;j < IMAGE_SIZE;j++ ) { + + // printf("pixel[%d][%d] is (%f, %f)\n", i, j, + // tmpImage->data.F32[i][j], + // outImage->data.F32[i][j]); + if ( fabs( outImage->data.F32[ i ][ j ] - tmpImage->data.F32[ i ][ j ] ) > THRESHOLD ) { + printf( "Pixel (%d, %d) is %.2f, should be %.2f\n", i, j, + outImage->data.F32[ i ][ j ], + tmpImage->data.F32[ i ][ j ] ); + } + } - + } + psMemCheckCorruption( 1 ); printFooter( stdout, @@ -95,5 +95,5 @@ "Calculate Chebyshev Polynomials, no mask", testStatus ); - + /*************************************************************************/ /* Deallocate data structures */ @@ -106,16 +106,16 @@ psFree( outImage ); psFree( my2DPoly ); - + 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, "psImageStats functions", "Deallocate the psStats/psImage structure.", testStatus ); - + return ( !testStatus ); } Index: /trunk/psLib/test/psTest.c =================================================================== --- /trunk/psLib/test/psTest.c (revision 1405) +++ /trunk/psLib/test/psTest.c (revision 1406) @@ -37,99 +37,99 @@ int n; extern char *optarg; - + if ( argc > 0 ) { - while ( ( c = getopt( argc, argv, "lhn:dt:" ) ) != -1 ) { - switch ( c ) { - case 'h': - printf( "Usage: %s [-l] [-d] [-h] [-n=Testpoint#] [-t=TestpointName]\n" - " where:\n" - " -l : lists the testpoints contained in this test driver executable\n" - " -d : turns on debugger-friendly mode (no forking, aborts/signals are not handled)\n" - " -h : prints this help\n" - " -n : specifies a particular testpoint by number to run\n" - " -t : specifies a particular testpoint by name to run\n" - " (if no -l, -n or -t options are given, all testpoints are run)\n", - argv[ 0 ] ); - runAll = false; - break; - case 'd': - useFork = false; - break; - case 'l': - printf( "Test Driver: %s\n", testPointFile ); - printf( "Package Name: %s\n", packageName ); - printf( "Testpoints:\n" ); - runAll = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { - printf( " %6d - %s \n", tests[ index ].testPointNumber, - tests[ index ].testPointName ); - } - printf( "\n" ); - break; - case 't': - runAll = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { - if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) { - success = p_runTest( fp, - testPointFile, - packageName, - tests[ index ].testPointName, - tests[ index ].fcn, - tests[ index ].expectedReturn, - useFork ) && success; - } - } - break; - case 'n': - runAll = false; - if ( sscanf( optarg, "%i", &n ) != 1 ) { - psError( __func__, "Failed to parse the testpoint number (%s).", - optarg ); - break; - } - found = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { - if ( n == tests[ index ].testPointNumber ) { - found = true; - success = p_runTest( fp, - testPointFile, - packageName, - tests[ index ].testPointName, - tests[ index ].fcn, - tests[ index ].expectedReturn, - useFork ) && success; - } - } - if ( ! found ) { - psError( __func__, "The specified testpoint number (%d) doesn't exist in this test driver.", - n ); - break; - } - break; - case '?': - psError( __func__, "Option %s is not recognized and is ignored.", optarg ); - break; - } - } - } - + while ( ( c = getopt( argc, argv, "lhn:dt:" ) ) != -1 ) { + switch ( c ) { + case 'h': + printf( "Usage: %s [-l] [-d] [-h] [-n=Testpoint#] [-t=TestpointName]\n" + " where:\n" + " -l : lists the testpoints contained in this test driver executable\n" + " -d : turns on debugger-friendly mode (no forking, aborts/signals are not handled)\n" + " -h : prints this help\n" + " -n : specifies a particular testpoint by number to run\n" + " -t : specifies a particular testpoint by name to run\n" + " (if no -l, -n or -t options are given, all testpoints are run)\n", + argv[ 0 ] ); + runAll = false; + break; + case 'd': + useFork = false; + break; + case 'l': + printf( "Test Driver: %s\n", testPointFile ); + printf( "Package Name: %s\n", packageName ); + printf( "Testpoints:\n" ); + runAll = false; + for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + printf( " %6d - %s \n", tests[ index ].testPointNumber, + tests[ index ].testPointName ); + } + printf( "\n" ); + break; + case 't': + runAll = false; + for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) { + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + break; + case 'n': + runAll = false; + if ( sscanf( optarg, "%i", &n ) != 1 ) { + psError( __func__, "Failed to parse the testpoint number (%s).", + optarg ); + break; + } + found = false; + for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( n == tests[ index ].testPointNumber ) { + found = true; + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + if ( ! found ) { + psError( __func__, "The specified testpoint number (%d) doesn't exist in this test driver.", + n ); + break; + } + break; + case '?': + psError( __func__, "Option %s is not recognized and is ignored.", optarg ); + break; + } + } + } + if ( runAll ) { - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { - if ( ! tests[ index ].isDuplicateEntry ) { - success = p_runTest( fp, - testPointFile, - packageName, - tests[ index ].testPointName, - tests[ index ].fcn, - tests[ index ].expectedReturn, - useFork ) && success; - } - } - } - + for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( ! tests[ index ].isDuplicateEntry ) { + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + } + if ( ! success ) { - psError( testPointFile, "One or more tests failed" ); - } - + psError( testPointFile, "One or more tests failed" ); + } + return success; } @@ -140,53 +140,54 @@ int childReturn = 0; pid_t child; - + p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName ); - + if ( useFork ) { - child = fork(); - if ( child == 0 ) { // I am the child process, run the test - int currentId = psMemGetId(); - int retVal = fcn(); - if ( retVal == 0 ) { // only bother checking memory if test executed to end. - if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { - psError( __func__, "Memory Leaks Detected" ); - retVal = 64; - } - psMemCheckCorruption( 1 ); - } - exit( retVal ); - } else if ( child < 0 ) { - fprintf( fp, "Couldn't fork a process to run a negative test (%s|%s)", - packageName, testPointName ); - abort(); - } - - waitpid( child, &childReturn, 0 ); - if ( WIFSIGNALED( childReturn ) ) { - childReturn = -WTERMSIG( childReturn ); - } else { - childReturn = WEXITSTATUS( childReturn ); - } + child = fork(); + if ( child == 0 ) { // I am the child process, run the test + int currentId = psMemGetId(); + int retVal = fcn(); + if ( retVal == 0 ) { // only bother checking memory if test executed to end. + if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { + psError( __func__, "Memory Leaks Detected" ); + retVal = 64; + } + psMemCheckCorruption( 1 ); + } + exit( retVal ); + } else + if ( child < 0 ) { + fprintf( fp, "Couldn't fork a process to run a negative test (%s|%s)", + packageName, testPointName ); + abort(); + } + + waitpid( child, &childReturn, 0 ); + if ( WIFSIGNALED( childReturn ) ) { + childReturn = -WTERMSIG( childReturn ); } else { - int currentId = psMemGetId(); - childReturn = fcn(); - if ( childReturn == 0 ) { // only bother checking memory if test executed to end. - if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { - psError( __func__, "Memory Leaks Detected" ); - childReturn = 64; - } - psMemCheckCorruption( 1 ); - } - } - - + childReturn = WEXITSTATUS( childReturn ); + } + } else { + int currentId = psMemGetId(); + childReturn = fcn(); + if ( childReturn == 0 ) { // only bother checking memory if test executed to end. + if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { + psError( __func__, "Memory Leaks Detected" ); + childReturn = 64; + } + psMemCheckCorruption( 1 ); + } + } + + if ( childReturn != expectedReturn ) { - fprintf( fp, "Return value mismatch: expected %d, got %d", - expectedReturn, childReturn ); - } - + fprintf( fp, "Return value mismatch: expected %d, got %d", + expectedReturn, childReturn ); + } + p_printFooter( fp, testPointFile, packageName, testPointName, ( childReturn == expectedReturn ) ); - + return ( childReturn == expectedReturn ); } @@ -198,7 +199,7 @@ { char TP[ 80 ]; - + snprintf( TP, 80, "%s{%s}", packageName, testPointName ); - + fprintf( fp, HEADER_TOP ); fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile ); @@ -216,7 +217,7 @@ { char TP[ 80 ]; - + snprintf( TP, 80, "%s{%s}", packageName, testPointName ); - + fprintf( fp, HEADER_TOP ); fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile ); @@ -236,7 +237,7 @@ { if ( success ) { - fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); - } else { - fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); - } -} + fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); + } else { + fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); + } +} Index: /trunk/psLib/test/sysUtils/atst_psAbort_01.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_01.c (revision 1405) +++ /trunk/psLib/test/sysUtils/atst_psAbort_01.c (revision 1406) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @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 Index: /trunk/psLib/test/sysUtils/atst_psAbort_02.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_02.c (revision 1405) +++ /trunk/psLib/test/sysUtils/atst_psAbort_02.c (revision 1406) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @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 Index: /trunk/psLib/test/sysUtils/atst_psAbort_03.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_03.c (revision 1405) +++ /trunk/psLib/test/sysUtils/atst_psAbort_03.c (revision 1406) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @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 Index: /trunk/psLib/test/sysUtils/tst_psError.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psError.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psError.c (revision 1406) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @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 Index: /trunk/psLib/test/sysUtils/tst_psHash02.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psHash02.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psHash02.c (revision 1406) @@ -42,6 +42,8 @@ int i = 0; ID *id = NULL; - char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL}; - char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL}; + char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL + }; + char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL + }; int currentId = psMemGetId(); int memLeaks = 0; Index: /trunk/psLib/test/sysUtils/tst_psHash03.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psHash03.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psHash03.c (revision 1406) @@ -70,6 +70,8 @@ bool retVal = false; ID *id = NULL; - char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL}; - char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL}; + char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL + }; + char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL + }; int memLeaks = 0; Index: /trunk/psLib/test/sysUtils/tst_psHash04.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psHash04.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psHash04.c (revision 1406) @@ -37,6 +37,8 @@ int testStatus = true; int i = 0; - char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL}; - char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL}; + char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL + }; + char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL + }; int currentId = psMemGetId(); int memLeaks = 0; Index: /trunk/psLib/test/sysUtils/tst_psMemory.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 1406) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-02 19:43:23 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -80,9 +80,9 @@ } }; - + int main( int argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); - + return ( ! runTestSuite( stderr, "psMemory", tests, argc, argv ) ); } @@ -94,25 +94,25 @@ const int size = 100; int failed = 0; - + psLogMsg( __func__, PS_LOG_INFO, "psAlloc shall allocate memory blocks writeable by caller.\n" ); - + mem = ( int* ) psAlloc( size * sizeof( int ) ); if ( mem == NULL ) { - psError( __FILE__, "psAlloc returned a NULL value in %s!", __func__ ); - return 1; + psError( __FILE__, "psAlloc returned a NULL value in %s!", __func__ ); + return 1; + } + + for ( int index = 0;index < size;index++ ) { + mem[ index ] = index; + } + + for ( int index = 0;index < size;index++ ) { + if ( mem[ index ] != index ) { + failed++; } - - for ( int index = 0;index < size;index++ ) { - mem[ index ] = index; - } - - for ( int index = 0;index < size;index++ ) { - if ( mem[ index ] != index ) { - failed++; - } - } - + } + psFree( mem ); - + return failed; } @@ -123,46 +123,46 @@ int * mem; int ref = 0; - + psLogMsg( __func__, PS_LOG_INFO, "memory reference count shall be incrementable/decrementable" ); - + mem = ( int* ) psAlloc( 100 * sizeof( int ) ); - + ref = psMemGetRefCounter( mem ); if ( ref != 1 ) { - psError( __func__, "Expected to buffer reference count to be initially 1, but it was %d.", ref ); - return 1; - } - + psError( __func__, "Expected to buffer reference count to be initially 1, but it was %d.", ref ); + return 1; + } + psMemIncrRefCounter( mem ); psMemIncrRefCounter( mem ); psMemIncrRefCounter( mem ); - + ref = psMemGetRefCounter( mem ); if ( ref != 4 ) { - psError( __func__, "Expected to find buffer reference count to be 4, but it was %d.", ref ); - return 1; - } - + psError( __func__, "Expected to find buffer reference count to be 4, but it was %d.", ref ); + return 1; + } + psMemDecrRefCounter( mem ); psMemDecrRefCounter( mem ); - + ref = psMemGetRefCounter( mem ); if ( ref != 2 ) { - psError( __func__, "Expected to find buffer reference count to be 2, but it was %d.", ref ); - return 1; - } - + psError( __func__, "Expected to find buffer reference count to be 2, but it was %d.", ref ); + return 1; + } + psLogMsg( __func__, PS_LOG_INFO, "psFree shall be just decrement a multiple refererenced pointer." ); - + psFree( mem ); - + ref = psMemGetRefCounter( mem ); if ( ref != 1 ) { - psError( __func__, "Expected to find buffer reference count to be 1, but it was %d.", ref ); - return 1; - } - + psError( __func__, "Expected to find buffer reference count to be 1, but it was %d.", ref ); + return 1; + } + psFree( mem ); - + return 0; } @@ -174,35 +174,35 @@ int * mem[ 100 ]; psMemExhaustedCallback cb; - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = NULL; - } - + + for ( int lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = NULL; + } + psLogMsg( __func__, PS_LOG_INFO, "Upon requesting more memory than is available, psRealloc shall call " "the psMemExhaustedCallback.\n" ); - + exhaustedCallbackCalled = 0; - + cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psAlloc( 10 ); - } - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psRealloc( mem[ lcv ], SIZE_MAX - 1000 ); - } - + + for ( int lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( int* ) psAlloc( 10 ); + } + + for ( int lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( int* ) psRealloc( mem[ lcv ], SIZE_MAX - 1000 ); + } + psMemExhaustedCallbackSet( cb ); - + if ( exhaustedCallbackCalled == 0 ) { - psError( __FILE__, "Called psRealloc with HUGE memory requirement and survived in %s!", __func__ ); - return 1; - } - - for ( int lcv = 0; lcv < 100; lcv++ ) { - psFree( mem[ lcv ] ); - } - + psError( __FILE__, "Called psRealloc with HUGE memory requirement and survived in %s!", __func__ ); + return 1; + } + + for ( int lcv = 0; lcv < 100; lcv++ ) { + psFree( mem[ lcv ] ); + } + return 0; } @@ -213,31 +213,31 @@ int * mem[ 100 ]; psMemExhaustedCallback cb; - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = NULL; - } - + + for ( int lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = NULL; + } + psLogMsg( __func__, PS_LOG_INFO, "Upon requesting more memory than is available, psalloc shall call " "the psMemExhaustedCallback.\n" ); - + exhaustedCallbackCalled = 0; - + cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psAlloc( SIZE_MAX - 1000 ); - } - + + for ( int lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( int* ) psAlloc( SIZE_MAX - 1000 ); + } + psMemExhaustedCallbackSet( cb ); - + if ( exhaustedCallbackCalled == 0 ) { - psError( __FILE__, "Called psAlloc with HUGE memory requirement and survived in %s!", __func__ ); - return 1; - } - - for ( int lcv = 0; lcv < 100; lcv++ ) { - psFree( mem[ lcv ] ); - } - + psError( __FILE__, "Called psAlloc with HUGE memory requirement and survived in %s!", __func__ ); + return 1; + } + + for ( int lcv = 0; lcv < 100; lcv++ ) { + psFree( mem[ lcv ] ); + } + return 0; } @@ -250,8 +250,8 @@ int* mem3; const int initialSize = 100; - + psLogMsg( __func__, PS_LOG_INFO, "psRealloc shall increase/decrease memory buffer while " "preserving contents" ); - + // allocate buffer with known values. mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); @@ -259,45 +259,45 @@ mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) ); for ( int lcv = 0;lcv < initialSize;lcv++ ) { - mem1[ lcv ] = mem2[ lcv ] = mem3[ lcv ] = lcv; - } - + mem1[ lcv ] = mem2[ lcv ] = mem3[ lcv ] = lcv; + } + psMemCheckCorruption( 1 ); psLogMsg( __func__, PS_LOG_INFO, "Expanding memory buffer." ); - + // realloc to 2x mem1 = ( int* ) psRealloc( mem1, 2 * initialSize * sizeof( int ) ); mem2 = ( int* ) psRealloc( mem2, 2 * initialSize * sizeof( int ) ); mem3 = ( int* ) psRealloc( mem3, 2 * initialSize * sizeof( int ) ); - + // check values of initial block for ( int i = 0;i < initialSize;i++ ) { - if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { - psError( __FILE__, "Realloc didn't preserve the contents with expanding buffer in %s.", - __func__ ); - break; - } + if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { + psError( __FILE__, "Realloc didn't preserve the contents with expanding buffer in %s.", + __func__ ); + break; } - + } + psMemCheckCorruption( 1 ); psLogMsg( __func__, PS_LOG_INFO, "Shrinking memory buffer." ); - + // realloc to 1/2 initial value. mem1 = ( int* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( int ) ); mem2 = ( int* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( int ) ); mem3 = ( int* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( int ) ); - + // check values of initial block for ( int i = 0;i < initialSize / 2;i++ ) { - if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { - psError( __FILE__, "Realloc didn't preserve the contents with shrinking buffer in %s.", - __func__ ); - break; - } + if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { + psError( __FILE__, "Realloc didn't preserve the contents with shrinking buffer in %s.", + __func__ ); + break; } - + } + psFree( mem1 ); psFree( mem2 ); psFree( mem3 ); - + return 0; } @@ -311,52 +311,52 @@ const int initialSize = 100; int mark; - + allocCallbackCalled = 0; freeCallbackCalled = 0; psMemAllocateCallbackSet( memAllocateCallback ); psMemFreeCallbackSet( memFreeCallback ); - + psMemAllocateCallbackSetID( currentId + 1 ); psMemFreeCallbackSetID( currentId + 1 ); - + psLogMsg( __func__, PS_LOG_INFO, "call to psAlloc/psRealloc shall generate a callback if specified " "memory ID is allocated." ); - + // allocate buffer with known values. mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); mem2 = ( int* ) psAlloc( initialSize * sizeof( int ) ); mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - + psFree( mem1 ); psFree( mem2 ); psFree( mem3 ); - + if ( allocCallbackCalled != 2 || freeCallbackCalled != 2 ) { - psError( __FILE__, "alloc/free callbacks were not called the proper number of times in %s", - __func__ ); - return 1; - } - + psError( __FILE__, "alloc/free callbacks were not called the proper number of times in %s", + __func__ ); + return 1; + } + allocCallbackCalled = 0; freeCallbackCalled = 0; - + mark = psMemGetId(); - + mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - + psMemAllocateCallbackSetID( mark ); - + mem1 = ( int* ) psRealloc( mem1, initialSize * 2 * sizeof( int ) ); - + psFree( mem1 ); - + if ( allocCallbackCalled != 2 ) { - psError( __FILE__, "realloc callbacks were not called the proper number of times in %s", - __func__ ); - return 1; - } - - return 0; - + psError( __FILE__, "realloc callbacks were not called the proper number of times in %s", + __func__ ); + return 1; + } + + return 0; + } @@ -370,95 +370,95 @@ int nLeaks = 0; int lineMark = 0; - + psLogMsg( __func__, PS_LOG_INFO, "psMemCheckLeaks shall return the number of blocks above an ID " "that are still allocated" ); - + for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); - } - + lineMark = __LINE__ + 1; + buffers[ lcv ] = psAlloc( sizeof( int ) ); + } + for ( lcv = 1;lcv < numBuffers;lcv++ ) { + psFree( buffers[ lcv ] ); + } + + psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one instance." ); + + nLeaks = psMemCheckLeaks( currentId, &blks, stderr ); + + if ( nLeaks != 1 ) { + psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); + return 1; + } + + if ( blks[ 0 ] ->lineno != lineMark ) { + psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one (line %d vs %d) in %s.", + lineMark, blks[ 0 ] ->lineno, __func__ ); + return 1; + } + + psFree( buffers[ 0 ] ); + psFree( blks ); + + psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with a different leak location" ); + psMemCheckLeaks( currentId, NULL, stderr ); + + for ( lcv = 0;lcv < numBuffers;lcv++ ) { + lineMark = __LINE__ + 1; + buffers[ lcv ] = psAlloc( sizeof( int ) ); + } + + for ( lcv = 0;lcv < numBuffers - 1;lcv++ ) { + psFree( buffers[ lcv ] ); + } + + psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one error." ); + + nLeaks = psMemCheckLeaks( currentId, &blks, stderr ); + + if ( nLeaks != 1 ) { + psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); + return 1; + } + + if ( blks[ 0 ] ->lineno != lineMark ) { + psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); + return 1; + } + + psFree( buffers[ 4 ] ); + psFree( blks ); + + psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with multiple leak locations." ); + + for ( lcv = 0;lcv < numBuffers;lcv++ ) { + lineMark = __LINE__ + 1; + buffers[ lcv ] = psAlloc( sizeof( int ) ); + } + + for ( lcv = 0;lcv < numBuffers;lcv++ ) { + if ( lcv % 2 == 0 ) { psFree( buffers[ lcv ] ); } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one instance." ); - + } + + psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce two errors." ); + nLeaks = psMemCheckLeaks( currentId, &blks, stderr ); - - if ( nLeaks != 1 ) { - psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - + + if ( nLeaks != 2 ) { + psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); + return 1; + } + if ( blks[ 0 ] ->lineno != lineMark ) { - psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one (line %d vs %d) in %s.", - lineMark, blks[ 0 ] ->lineno, __func__ ); - return 1; - } - - psFree( buffers[ 0 ] ); - psFree( blks ); - - psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with a different leak location" ); - psMemCheckLeaks( currentId, NULL, stderr ); - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); - } - - for ( lcv = 0;lcv < numBuffers - 1;lcv++ ) { - psFree( buffers[ lcv ] ); - } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one error." ); - - nLeaks = psMemCheckLeaks( currentId, &blks, stderr ); - - if ( nLeaks != 1 ) { - psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - - if ( blks[ 0 ] ->lineno != lineMark ) { - psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); - return 1; - } - - psFree( buffers[ 4 ] ); - psFree( blks ); - - psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with multiple leak locations." ); - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); - } - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - if ( lcv % 2 == 0 ) { - psFree( buffers[ lcv ] ); - } - } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce two errors." ); - - nLeaks = psMemCheckLeaks( currentId, &blks, stderr ); - - if ( nLeaks != 2 ) { - psError( __FILE__, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - - if ( blks[ 0 ] ->lineno != lineMark ) { - psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); - return 1; - } - + psError( __FILE__, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); + return 1; + } + psFree( blks ); psFree( buffers[ 1 ] ); psFree( buffers[ 3 ] ); - + return 0; } @@ -470,9 +470,9 @@ int corruptions = 0; psMemProblemCallback cb; - + psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption shall detect memory corruptions" ); - + buffer = psAlloc( sizeof( int ) ); - + // cause memory corruption via buffer underflow *buffer = 1; @@ -480,36 +480,36 @@ oldValue = *buffer; *buffer = 2; - + problemCallbackCalled = 0; cb = psMemProblemCallbackSet( memProblemCallback ); - + psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption should output an error message and " "memProblemCallback callback should be called." ); - + corruptions = psMemCheckCorruption( 0 ); - + // restore the memory problem callback psMemProblemCallbackSet( cb ); - + // restore the value, 'uncorrupting' the buffer *buffer = oldValue; buffer++; - + psFree( buffer ); - + if ( corruptions != 1 ) { - psError( __FILE__, "Expected one memory corruption but found %d in %s.", - corruptions, __func__ ); - return 1; - } - + psError( __FILE__, "Expected one memory corruption but found %d in %s.", + corruptions, __func__ ); + return 1; + } + if ( problemCallbackCalled != 1 ) { - psError( __FILE__, "The memProblemCallback was not invoked but should have been in %s", - __func__ ); - return 1; - } - - return 0; - + psError( __FILE__, "The memProblemCallback was not invoked but should have been in %s", + __func__ ); + return 1; + } + + return 0; + } @@ -547,10 +547,10 @@ void * buffer = psAlloc( 1024 ); - + psFree( buffer ); - + psLogMsg( __func__, PS_LOG_INFO, "Next should be an error about multiple freeing." ); psFree( buffer ); - - return 0; -} + + return 0; +} Index: /trunk/psLib/test/sysUtils/tst_psString.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psString.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psString.c (revision 1406) @@ -17,6 +17,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @version $Revision: 1.7 $ $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/sysUtils/tst_psStringCopy.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psStringCopy.c (revision 1405) +++ /trunk/psLib/test/sysUtils/tst_psStringCopy.c (revision 1406) @@ -17,6 +17,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-18 19:22:35 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-06 22:34:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii