Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 4446) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 4447) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.114 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 03:23:19 $ + * @version $Revision: 1.115 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-01 22:01:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1084,5 +1084,5 @@ newPoly->coeff = (psF32 *)psAlloc(n * sizeof(psF32)); newPoly->coeffErr = (psF32 *)psAlloc(n * sizeof(psF32)); - newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8)); + newPoly->mask = (char *)psAlloc(n * sizeof(char)); for (i = 0; i < n; i++) { newPoly->coeff[i] = 0.0; @@ -1113,9 +1113,9 @@ newPoly->coeff = (psF32 **)psAlloc(nX * sizeof(psF32 *)); newPoly->coeffErr = (psF32 **)psAlloc(nX * sizeof(psF32 *)); - newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *)); + newPoly->mask = (char **)psAlloc(nX * sizeof(char *)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF32 *)psAlloc(nY * sizeof(psF32)); newPoly->coeffErr[x] = (psF32 *)psAlloc(nY * sizeof(psF32)); - newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8)); + newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char)); } for (x = 0; x < nX; x++) { @@ -1152,13 +1152,13 @@ newPoly->coeff = (psF32 ***)psAlloc(nX * sizeof(psF32 **)); newPoly->coeffErr = (psF32 ***)psAlloc(nX * sizeof(psF32 **)); - newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **)); + newPoly->mask = (char ***)psAlloc(nX * sizeof(char **)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *)); newPoly->coeffErr[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *)); - newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *)); + newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *)); for (y = 0; y < nY; y++) { newPoly->coeff[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32)); newPoly->coeffErr[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32)); - newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8)); + newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char)); } } @@ -1201,17 +1201,17 @@ newPoly->coeff = (psF32 ****)psAlloc(nX * sizeof(psF32 ***)); newPoly->coeffErr = (psF32 ****)psAlloc(nX * sizeof(psF32 ***)); - newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***)); + newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **)); newPoly->coeffErr[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **)); - newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **)); + newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **)); for (y = 0; y < nY; y++) { newPoly->coeff[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *)); newPoly->coeffErr[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *)); - newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *)); + newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *)); for (z = 0; z < nZ; z++) { newPoly->coeff[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32)); newPoly->coeffErr[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32)); - newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8)); + newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char)); } } @@ -1446,5 +1446,5 @@ newPoly->coeff = (psF64 *)psAlloc(n * sizeof(psF64)); newPoly->coeffErr = (psF64 *)psAlloc(n * sizeof(psF64)); - newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8)); + newPoly->mask = (char *)psAlloc(n * sizeof(char)); for (i = 0; i < n; i++) { newPoly->coeff[i] = 0.0; @@ -1475,9 +1475,9 @@ newPoly->coeff = (psF64 **)psAlloc(nX * sizeof(psF64 *)); newPoly->coeffErr = (psF64 **)psAlloc(nX * sizeof(psF64 *)); - newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *)); + newPoly->mask = (char **)psAlloc(nX * sizeof(char *)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF64 *)psAlloc(nY * sizeof(psF64)); newPoly->coeffErr[x] = (psF64 *)psAlloc(nY * sizeof(psF64)); - newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8)); + newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char)); } for (x = 0; x < nX; x++) { @@ -1514,13 +1514,13 @@ newPoly->coeff = (psF64 ***)psAlloc(nX * sizeof(psF64 **)); newPoly->coeffErr = (psF64 ***)psAlloc(nX * sizeof(psF64 **)); - newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **)); + newPoly->mask = (char ***)psAlloc(nX * sizeof(char **)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *)); newPoly->coeffErr[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *)); - newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *)); + newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *)); for (y = 0; y < nY; y++) { newPoly->coeff[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64)); newPoly->coeffErr[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64)); - newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8)); + newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char)); } } @@ -1563,17 +1563,17 @@ newPoly->coeff = (psF64 ****)psAlloc(nX * sizeof(psF64 ***)); newPoly->coeffErr = (psF64 ****)psAlloc(nX * sizeof(psF64 ***)); - newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***)); + newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***)); for (x = 0; x < nX; x++) { newPoly->coeff[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **)); newPoly->coeffErr[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **)); - newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **)); + newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **)); for (y = 0; y < nY; y++) { newPoly->coeff[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *)); newPoly->coeffErr[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *)); - newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *)); + newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *)); for (z = 0; z < nZ; z++) { newPoly->coeff[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64)); newPoly->coeffErr[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64)); - newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8)); + newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char)); } } @@ -1822,6 +1822,6 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(int numSplines, - int order, +psSpline1D *psSpline1DAlloc(unsigned int numSplines, + unsigned int order, float min, float max) @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order) + unsigned int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -1874,6 +1874,6 @@ psSpline1D *tmp = NULL; - psS32 i; - psS32 numSplines; + unsigned int i; + unsigned int numSplines; tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D)); @@ -2045,5 +2045,5 @@ psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - psS32 order, + unsigned int order, psScalar *x) { @@ -2134,6 +2134,6 @@ PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN); - psS32 binNum; - psS32 n; + unsigned int binNum; + unsigned int n; n = spline->n; @@ -2171,5 +2171,5 @@ PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); - psS32 i; + unsigned int i; psVector *tmpVector; Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 4446) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 4447) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 03:23:19 $ + * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-01 22:01:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -74,8 +74,9 @@ { psPolynomialType type; ///< Polynomial type - unsigned int n; ///< Number of terms + psElemType ctype; ///< Polynomial precision + unsigned int n; ///< Number of terms psF32 *coeff; ///< Coefficients psF32 *coeffErr; ///< Error in coefficients - psU8 *mask; ///< Coefficient mask + char *mask; ///< Coefficient mask } psPolynomial1D; @@ -85,9 +86,10 @@ { psPolynomialType type; ///< Polynomial type + psElemType ctype; ///< Polynomial precision unsigned int nX; ///< Number of terms in x unsigned int nY; ///< Number of terms in y psF32 **coeff; ///< Coefficients psF32 **coeffErr; ///< Error in coefficients - psU8 **mask; ///< Coefficients mask + char **mask; ///< Coefficients mask } psPolynomial2D; @@ -97,4 +99,5 @@ { psPolynomialType type; ///< Polynomial type + psElemType ctype; ///< Polynomial precision unsigned int nX; ///< Number of terms in x unsigned int nY; ///< Number of terms in y @@ -102,5 +105,5 @@ psF32 ***coeff; ///< Coefficients psF32 ***coeffErr; ///< Error in coefficients - psU8 ***mask; ///< Coefficients mask + char ***mask; ///< Coefficients mask } psPolynomial3D; @@ -110,4 +113,5 @@ { psPolynomialType type; ///< Polynomial type + psElemType ctype; ///< Polynomial precision unsigned int nX; ///< Number of terms in x unsigned int nY; ///< Number of terms in y @@ -116,5 +120,5 @@ psF32 ****coeff; ///< Coefficients psF32 ****coeffErr; ///< Error in coefficients - psU8 ****mask; ///< Coefficients mask + char ****mask; ///< Coefficients mask } psPolynomial4D; @@ -206,5 +210,5 @@ /** Evaluates a 1-D polynomial at specific sets of coordinates - * + * * @return psVector* results of polynomials at given locations */ @@ -215,5 +219,5 @@ /** Evaluates a 2-D polynomial at specific sets of coordinates - * + * * @return psVector* results of polynomial at given locations */ @@ -225,5 +229,5 @@ /** Evaluates a 3-D polynomial at specific sets of coordinates - * + * * @return psVector* results of polynomial at given locations */ @@ -236,5 +240,5 @@ /** Evaluates a 4-D polynomial at specific sets of coordinates - * + * * @return psVector* results of polynomial at given locations */ @@ -258,5 +262,5 @@ psF64 *coeff; ///< Coefficients psF64 *coeffErr; ///< Error in coefficients - psU8 *mask; ///< Coefficient mask + char *mask; ///< Coefficient mask } psDPolynomial1D; @@ -270,5 +274,5 @@ psF64 **coeff; ///< Coefficients psF64 **coeffErr; ///< Error in coefficients - psU8 **mask; ///< Coefficients mask + char **mask; ///< Coefficients mask } psDPolynomial2D; @@ -283,5 +287,5 @@ psF64 ***coeff; ///< Coefficients psF64 ***coeffErr; ///< Error in coefficients - psU8 ***mask; ///< Coefficient mask + char ***mask; ///< Coefficient mask } psDPolynomial3D; @@ -297,5 +301,5 @@ psF64 ****coeff; ///< Coefficients psF64 ****coeffErr; ///< Error in coefficients - psU8 ****mask; ///< Coefficients mask + char ****mask; ///< Coefficients mask } psDPolynomial4D; @@ -386,5 +390,5 @@ /** Evaluates a double-precision 1-D polynomial at specific sets of coordinates. - * + * * @return psVector* results of polynomial at given locations */ @@ -395,5 +399,5 @@ /** Evaluates a double-precision 2-D polynomial at specific sets of coordinates. - * + * * @return psVector* results of polynomial at given locations */ @@ -405,5 +409,5 @@ /** Evaluates a double-precision 3-D polynomial at specific sets of coordinates. - * + * * @return psVector* results of polynomial at given locations */ @@ -416,5 +420,5 @@ /** Evaluates a double-precision 4-D polynomial at specific sets of coordinates. - * + * * @return psVector* results of polynomial at given locations */ @@ -430,5 +434,5 @@ typedef struct { - psS32 n; ///< The number of spline polynomials + unsigned int n; ///< The number of spline polynomials psPolynomial1D **spline; ///< An array of n pointers to the spline polynomials psF32 *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. @@ -439,5 +443,5 @@ /** Allocates a psSpline1D structure - * + * * Allocator for psSpline1D where the bounds are implicitly specified through specifying * min and max values along with the number of splines. @@ -446,6 +450,6 @@ */ psSpline1D *psSpline1DAlloc( - int n, ///< Number of spline polynomials - int order, ///< Order of spline polynomials + unsigned int n, ///< Number of spline polynomials + unsigned int order, ///< Order of spline polynomials float min, ///< Lower boundary value of spline polynomials float max ///< Upper boundary value of spline polynomials @@ -453,6 +457,6 @@ /** Allocates a psSpline1D structure - * - * Allocator for psSpline1D where the bounds are explicitly specified. + * + * Allocator for psSpline1D where the bounds are explicitly specified. * * @return psSpline1D* new 1-D spline struct @@ -460,9 +464,9 @@ psSpline1D *psSpline1DAllocGeneric( const psVector *bounds, ///< Bounds for spline polynomials - int order ///< Order of spline polynomials + unsigned int order ///< Order of spline polynomials ); /** Evaluates 1-D spline polynomials at a specific coordinate. - * + * * @return float result of spline polynomials evaluated at given location */ @@ -473,5 +477,5 @@ /** Evaluates 1-D spline polynomials at a set of specific coordinates. - * + * * @return psVector* results of spline polynomials evaluated at given locations */ @@ -483,5 +487,5 @@ /** Performs a binary disection on a given vector. * Searches through an array of data for a specified value. - * + * * @return psS32 corresponding index number of specified value */ @@ -499,5 +503,5 @@ psVector *domain, ///< Domain (x coords) for interpolation psVector *range, ///< Range (y coords) for interpolation - psS32 order, ///< Order of interpolation function + unsigned int order, ///< Order of interpolation function psScalar *x ///< Location at which to evaluate ); Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 4446) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 4447) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-01 03:57:39 $ +* @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-01 22:01:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 4446) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 4447) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-01 03:57:39 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-01 22:01:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/test/dataManip/tst_psFunc02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 4446) +++ /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 4447) @@ -360,31 +360,34 @@ /****************************************************************************/ /****************************************************************************/ - testStatus = true; - printPositiveTestHeader(stdout, - "psFunction functions", - "psSpline1DAllocGeneric(): negative order"); - - bounds = psVectorAlloc(5,PS_TYPE_F32); - bounds->n = bounds->nalloc; - for(psU32 n = 0; n < 5; n++ ) { - bounds->data.F32[n] = (n+1) * 2; - } - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message."); - tmpSpline = psSpline1DAllocGeneric(bounds, -1); - if (tmpSpline != NULL) { - psError(PS_ERR_UNKNOWN,true,"Did not return null for negative order"); - return 10; - } + ///XXX: REMOVED FOLLOWING TEST AFTER CHANGING TO UNSIGNED INT/// + /* testStatus = true; + printPositiveTestHeader(stdout, + "psFunction functions", + "psSpline1DAllocGeneric(): negative order"); + + bounds = psVectorAlloc(5,PS_TYPE_F32); + bounds->n = bounds->nalloc; + for(psU32 n = 0; n < 5; n++ ) { + bounds->data.F32[n] = (n+1) * 2; + } + psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message."); + tmpSpline = psSpline1DAllocGeneric(bounds, -1); + if (tmpSpline != NULL) { + psError(PS_ERR_UNKNOWN,true,"Did not return null for negative order"); + return 10; + } + psFree(bounds); + psMemCheckCorruption(1); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); + if (0 != memLeaks) { + psError(PS_ERR_UNKNOWN,true,"Memory Leaks! (%d leaks)", memLeaks); + testStatus = false; + } + printFooter(stdout, + "psFunctions functions", + "psSpline1DAllocGeneric(): negative order", + testStatus); + */ psFree(bounds); - psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); - if (0 != memLeaks) { - psError(PS_ERR_UNKNOWN,true,"Memory Leaks! (%d leaks)", memLeaks); - testStatus = false; - } - printFooter(stdout, - "psFunctions functions", - "psSpline1DAllocGeneric(): negative order", - testStatus); /****************************************************************************/ Index: /trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr (revision 4446) +++ /trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr (revision 4447) @@ -10,8 +10,4 @@ Following should generate an error message.