Index: trunk/psLib/src/math/psPolynomial.h =================================================================== --- trunk/psLib/src/math/psPolynomial.h (revision 1968) +++ trunk/psLib/src/math/psPolynomial.h (revision 2204) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 00:48:15 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ float mean, ///< Mean for the Gaussian float stddev, ///< Standard deviation for the Gaussian - bool normal ///< Indicates whether result should be normalized + psBool normal ///< Indicates whether result should be normalized ); @@ -57,5 +57,5 @@ float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian - int Npts ///< The size of the vector + psS32 Npts ///< The size of the vector ); @@ -69,5 +69,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms float *coeff; ///< Coefficients float *coeffErr; ///< Error in coefficients @@ -80,6 +80,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y float **coeff; ///< Coefficients float **coeffErr; ///< Error in coefficients @@ -92,7 +92,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ***coeff; ///< Coefficients float ***coeffErr; ///< Error in coefficients @@ -105,8 +105,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ****coeff; ///< Coefficients float ****coeffErr; ///< Error in coefficients @@ -121,5 +121,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -130,6 +130,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -140,7 +140,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -151,8 +151,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -230,5 +230,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms double *coeff; ///< Coefficients double *coeffErr; ///< Error in coefficients @@ -241,6 +241,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y double **coeff; ///< Coefficients double **coeffErr; ///< Error in coefficients @@ -253,7 +253,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ***coeff; ///< Coefficients double ***coeffErr; ///< Error in coefficients @@ -266,8 +266,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ****coeff; ///< Coefficients double ****coeffErr; ///< Error in coefficients @@ -281,5 +281,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -290,6 +290,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -300,7 +300,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -311,8 +311,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -386,5 +386,5 @@ typedef struct { - int n; ///< The number of spline polynomials + psS32 n; ///< The number of spline polynomials psPolynomial1D **spline; ///< An array of n pointers to the spline polynomials float *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. @@ -393,13 +393,13 @@ psSpline1D; -psSpline1D *psSpline1DAlloc(int n, - int order, +psSpline1D *psSpline1DAlloc(psS32 n, + psS32 order, float min, float max); -int p_psSpline1DFree(psSpline1D *tmpSpline); +psS32 p_psSpline1DFree(psSpline1D *tmpSpline); psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order); + psS32 order); float psSpline1DEval(const psSpline1D *spline, @@ -409,18 +409,18 @@ const psSpline1D *spline); -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x); - -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x); - -int p_psVectorBinDisect(psVector *bins, - psScalar *x); +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x); + +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x); + +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x); psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x);