Index: trunk/psLib/src/math/psPolynomial.h =================================================================== --- trunk/psLib/src/math/psPolynomial.h (revision 2600) +++ trunk/psLib/src/math/psPolynomial.h (revision 2788) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-02 21:12:51 $ +* @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-22 05:09:32 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -39,10 +39,10 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return float value on the gaussian curve given the input parameters - */ -float psGaussian( - float x, ///< Value at which to evaluate - float mean, ///< Mean for the Gaussian - float stddev, ///< Standard deviation for the Gaussian + * @return psF32 value on the gaussian curve given the input parameters + */ +psF32 psGaussian( + psF32 x, ///< Value at which to evaluate + psF32 mean, ///< Mean for the Gaussian + psF32 stddev, ///< Standard deviation for the Gaussian psBool normal ///< Indicates whether result should be normalized ); @@ -55,6 +55,6 @@ */ psVector* p_psGaussianDev( - float mean, ///< The mean of the Gaussian - float sigma, ///< The sigma of the Gaussian + psF32 mean, ///< The mean of the Gaussian + psF32 sigma, ///< The sigma of the Gaussian psS32 Npts ///< The size of the vector ); @@ -70,7 +70,7 @@ psPolynomialType type; ///< Polynomial type psS32 n; ///< Number of terms - float *coeff; ///< Coefficients - float *coeffErr; ///< Error in coefficients - char *mask; ///< Coefficient mask + psF32 *coeff; ///< Coefficients + psF32 *coeffErr; ///< Error in coefficients + psU8 *mask; ///< Coefficient mask } psPolynomial1D; @@ -82,7 +82,7 @@ psS32 nX; ///< Number of terms in x psS32 nY; ///< Number of terms in y - float **coeff; ///< Coefficients - float **coeffErr; ///< Error in coefficients - char **mask; ///< Coefficients mask + psF32 **coeff; ///< Coefficients + psF32 **coeffErr; ///< Error in coefficients + psU8 **mask; ///< Coefficients mask } psPolynomial2D; @@ -95,7 +95,7 @@ psS32 nY; ///< Number of terms in y psS32 nZ; ///< Number of terms in z - float ***coeff; ///< Coefficients - float ***coeffErr; ///< Error in coefficients - char ***mask; ///< Coefficients mask + psF32 ***coeff; ///< Coefficients + psF32 ***coeffErr; ///< Error in coefficients + psU8 ***mask; ///< Coefficients mask } psPolynomial3D; @@ -109,7 +109,7 @@ psS32 nY; ///< Number of terms in y psS32 nZ; ///< Number of terms in z - float ****coeff; ///< Coefficients - float ****coeffErr; ///< Error in coefficients - char ****mask; ///< Coefficients mask + psF32 ****coeff; ///< Coefficients + psF32 ****coeffErr; ///< Error in coefficients + psU8 ****mask; ///< Coefficients mask } psPolynomial4D; @@ -160,42 +160,42 @@ /** Evaluates a 1-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -float psPolynomial1DEval( + * @return psF32 result of polynomial at given location + */ +psF32 psPolynomial1DEval( const psPolynomial1D* myPoly, ///< Coefficients for the polynomial - float x ///< location at which to evaluate + psF32 x ///< location at which to evaluate ); /** Evaluates a 2-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -float psPolynomial2DEval( + * @return psF32 result of polynomial at given location + */ +psF32 psPolynomial2DEval( const psPolynomial2D* myPoly, ///< Coefficients for the polynomial - float x, ///< x location at which to evaluate - float y ///< y location at which to evaluate + psF32 x, ///< x location at which to evaluate + psF32 y ///< y location at which to evaluate ); /** Evaluates a 3-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -float psPolynomial3DEval( + * @return psF32 result of polynomial at given location + */ +psF32 psPolynomial3DEval( const psPolynomial3D* myPoly, ///< Coefficients for the polynomial - float x, ///< x location at which to evaluate - float y, ///< y location at which to evaluate - float z ///< z location at which to evaluate + psF32 x, ///< x location at which to evaluate + psF32 y, ///< y location at which to evaluate + psF32 z ///< z location at which to evaluate ); /** Evaluates a 4-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -float psPolynomial4DEval( + * @return psF32 result of polynomial at given location + */ +psF32 psPolynomial4DEval( const psPolynomial4D* myPoly, ///< Coefficients for the polynomial - float w, ///< w location at which to evaluate - float x, ///< x location at which to evaluate - float y, ///< y location at which to evaluate - float z ///< z location at which to evaluate + psF32 w, ///< w location at which to evaluate + psF32 x, ///< x location at which to evaluate + psF32 y, ///< y location at which to evaluate + psF32 z ///< z location at which to evaluate ); @@ -235,7 +235,7 @@ psPolynomialType type; ///< Polynomial type psS32 n; ///< Number of terms - double *coeff; ///< Coefficients - double *coeffErr; ///< Error in coefficients - char *mask; ///< Coefficient mask + psF64 *coeff; ///< Coefficients + psF64 *coeffErr; ///< Error in coefficients + psU8 *mask; ///< Coefficient mask } psDPolynomial1D; @@ -247,7 +247,7 @@ psS32 nX; ///< Number of terms in x psS32 nY; ///< Number of terms in y - double **coeff; ///< Coefficients - double **coeffErr; ///< Error in coefficients - char **mask; ///< Coefficients mask + psF64 **coeff; ///< Coefficients + psF64 **coeffErr; ///< Error in coefficients + psU8 **mask; ///< Coefficients mask } psDPolynomial2D; @@ -260,7 +260,7 @@ psS32 nY; ///< Number of terms in y psS32 nZ; ///< Number of terms in z - double ***coeff; ///< Coefficients - double ***coeffErr; ///< Error in coefficients - char ***mask; ///< Coefficient mask + psF64 ***coeff; ///< Coefficients + psF64 ***coeffErr; ///< Error in coefficients + psU8 ***mask; ///< Coefficient mask } psDPolynomial3D; @@ -274,7 +274,7 @@ psS32 nY; ///< Number of terms in y psS32 nZ; ///< Number of terms in z - double ****coeff; ///< Coefficients - double ****coeffErr; ///< Error in coefficients - char ****mask; ///< Coefficients mask + psF64 ****coeff; ///< Coefficients + psF64 ****coeffErr; ///< Error in coefficients + psU8 ****mask; ///< Coefficients mask } psDPolynomial4D; @@ -324,42 +324,42 @@ /** Evaluates a double-precision 1-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -double psDPolynomial1DEval( + * @return psF32 result of polynomial at given location + */ +psF64 psDPolynomial1DEval( const psDPolynomial1D* myPoly, ///< Coefficients for the polynomial - double x ///< Value at which to evaluate + psF64 x ///< Value at which to evaluate ); /** Evaluates a double-precision 2-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -double psDPolynomial2DEval( + * @return psF32 result of polynomial at given location + */ +psF64 psDPolynomial2DEval( const psDPolynomial2D* myPoly, ///< Coefficients for the polynomial - double x, ///< Value x at which to evaluate - double y ///< Value y at which to evaluate + psF64 x, ///< Value x at which to evaluate + psF64 y ///< Value y at which to evaluate ); /** Evaluates a double-precision 3-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -double psDPolynomial3DEval( + * @return psF32 result of polynomial at given location + */ +psF64 psDPolynomial3DEval( const psDPolynomial3D* myPoly, ///< Coefficients for the polynomial - double x, ///< Value x at which to evaluate - double y, ///< Value y at which to evaluate - double z ///< Value z at which to evaluate + psF64 x, ///< Value x at which to evaluate + psF64 y, ///< Value y at which to evaluate + psF64 z ///< Value z at which to evaluate ); /** Evaluates a double-precision 4-D polynomial at specific coordinates. * - * @return float result of polynomial at given location - */ -double psDPolynomial4DEval( + * @return psF32 result of polynomial at given location + */ +psF64 psDPolynomial4DEval( const psDPolynomial4D* myPoly, ///< Coefficients for the polynomial - double w, ///< Value w at which to evaluate - double x, ///< Value x at which to evaluate - double y, ///< Value y at which to evaluate - double z ///< Value z at which to evaluate + psF64 w, ///< Value w at which to evaluate + psF64 x, ///< Value x at which to evaluate + psF64 y, ///< Value y at which to evaluate + psF64 z ///< Value z at which to evaluate ); @@ -396,6 +396,6 @@ 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. - float *domains; ///< The boundaries between each spline piece. Size is n+1. + psF32 *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. + psF32 *domains; ///< The boundaries between each spline piece. Size is n+1. } psSpline1D; @@ -403,12 +403,12 @@ psSpline1D *psSpline1DAlloc(psS32 n, psS32 order, - float min, - float max); + psF32 min, + psF32 max); psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, psS32 order); -float psSpline1DEval( - float x, +psF32 psSpline1DEval( + psF32 x, const psSpline1D *spline ); @@ -427,8 +427,8 @@ psScalar *x); -float p_psNRSpline1DEval(psSpline1D *spline, +psF32 p_psNRSpline1DEval(psSpline1D *spline, const psVector* restrict x, const psVector* restrict y, - float X); + psF32 X); /* \} */// End of MathGroup Functions