Index: trunk/psLib/src/math/psFunctions.h =================================================================== --- trunk/psLib/src/math/psFunctions.h (revision 4568) +++ trunk/psLib/src/math/psFunctions.h (revision 4581) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-16 00:06:32 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-20 01:21:13 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -74,8 +74,7 @@ { psPolynomialType type; ///< Polynomial type - psElemType ctype; ///< Polynomial precision int n; ///< Number of terms - psF32 *coeff; ///< Coefficients - psF32 *coeffErr; ///< Error in coefficients + psF64 *coeff; ///< Coefficients + psF64 *coeffErr; ///< Error in coefficients char *mask; ///< Coefficient mask } @@ -86,9 +85,8 @@ { psPolynomialType type; ///< Polynomial type - psElemType ctype; ///< Polynomial precision int nX; ///< Number of terms in x int nY; ///< Number of terms in y - psF32 **coeff; ///< Coefficients - psF32 **coeffErr; ///< Error in coefficients + psF64 **coeff; ///< Coefficients + psF64 **coeffErr; ///< Error in coefficients char **mask; ///< Coefficients mask } @@ -99,10 +97,9 @@ { psPolynomialType type; ///< Polynomial type - psElemType ctype; ///< Polynomial precision int nX; ///< Number of terms in x int nY; ///< Number of terms in y int nZ; ///< Number of terms in z - psF32 ***coeff; ///< Coefficients - psF32 ***coeffErr; ///< Error in coefficients + psF64 ***coeff; ///< Coefficients + psF64 ***coeffErr; ///< Error in coefficients char ***mask; ///< Coefficients mask } @@ -113,11 +110,10 @@ { psPolynomialType type; ///< Polynomial type - psElemType ctype; ///< Polynomial precision int nX; ///< Number of terms in x int nY; ///< Number of terms in y int nZ; ///< Number of terms in z int nT; ///< Number of terms in t - psF32 ****coeff; ///< Coefficients - psF32 ****coeffErr; ///< Error in coefficients + psF64 ****coeff; ///< Coefficients + psF64 ****coeffErr; ///< Error in coefficients char ****mask; ///< Coefficients mask } @@ -251,183 +247,4 @@ ); -/*****************************************************************************/ - -/* Double-precision polynomials, mainly for use in astrometry */ - -/** Double-precision one-dimensional polynomial */ -typedef struct -{ - psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms - psF64 *coeff; ///< Coefficients - psF64 *coeffErr; ///< Error in coefficients - char *mask; ///< Coefficient mask -} -psDPolynomial1D; - -/** Double-precision two-dimensional polynomial */ -typedef struct -{ - psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - psF64 **coeff; ///< Coefficients - psF64 **coeffErr; ///< Error in coefficients - char **mask; ///< Coefficients mask -} -psDPolynomial2D; - -/** Double-precision three-dimensional polynomial */ -typedef struct -{ - 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 - psF64 ***coeff; ///< Coefficients - psF64 ***coeffErr; ///< Error in coefficients - char ***mask; ///< Coefficient mask -} -psDPolynomial3D; - -/** Double-precision four-dimensional polynomial */ -typedef struct -{ - psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in w - int nY; ///< Number of terms in x - int nZ; ///< Number of terms in y - int nT; ///< Number of terms in z - psF64 ****coeff; ///< Coefficients - psF64 ****coeffErr; ///< Error in coefficients - char ****mask; ///< Coefficients mask -} -psDPolynomial4D; - -/** Allocates a double-precision 1-D polynomial structure with n terms - * - * @return psPolynomial1D* new double-precision 1-D polynomial struct - */ -psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms - psPolynomialType type ///< Polynomial Type -); - -/** Allocates a double-precision 2-D polynomial structure - * - * @return psPolynomial2D* new double-precision 2-D polynomial struct - */ -psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - psPolynomialType type ///< Polynomial Type -); - -/** Allocates a double-precision 3-D polynomial structure - * - * @return psPolynomial3D* new double-precision 3-D polynomial struct - */ -psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z - psPolynomialType type ///< Polynomial Type -); - -/** Allocates a double-precision 4-D polynomial structure - * - * @return psPolynomial4D* new double-precision 4-D polynomial struct - */ -psDPolynomial4D* psDPolynomial4DAlloc( - int nX, ///< Number of terms in w - int nY, ///< Number of terms in x - int nZ, ///< Number of terms in y - int nT, ///< Number of terms in z - psPolynomialType type ///< Polynomial Type -); - -/** Evaluates a double-precision 1-D polynomial at specific coordinates. - * - * @return psF32 result of polynomial at given location - */ -psF64 psDPolynomial1DEval( - const psDPolynomial1D* poly, ///< Coefficients for the polynomial - psF64 x ///< Value at which to evaluate -); - -/** Evaluates a double-precision 2-D polynomial at specific coordinates. - * - * @return psF32 result of polynomial at given location - */ -psF64 psDPolynomial2DEval( - const psDPolynomial2D* poly, ///< Coefficients for the polynomial - 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 psF64 result of polynomial at given location - */ -psF64 psDPolynomial3DEval( - const psDPolynomial3D* poly, ///< Coefficients for the polynomial - 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 psF64 result of polynomial at given location - */ -psF64 psDPolynomial4DEval( - const psDPolynomial4D* poly, ///< Coefficients for the polynomial - psF64 x, ///< Value w at which to evaluate - psF64 y, ///< Value x at which to evaluate - psF64 z, ///< Value y at which to evaluate - psF64 t ///< Value z at which to evaluate -); - -/** Evaluates a double-precision 1-D polynomial at specific sets of coordinates. - * - * @return psVector* results of polynomial at given locations - */ -psVector *psDPolynomial1DEvalVector( - const psDPolynomial1D *poly, ///< Coefficients for the polynomial - const psVector *x ///< x locations at which to evaluate -); - -/** Evaluates a double-precision 2-D polynomial at specific sets of coordinates. - * - * @return psVector* results of polynomial at given locations - */ -psVector *psDPolynomial2DEvalVector( - const psDPolynomial2D *poly, ///< Coefficients for the polynomial - const psVector *x, ///< x locations at which to evaluate - const psVector *y ///< y locations at which to evaluate -); - -/** Evaluates a double-precision 3-D polynomial at specific sets of coordinates. - * - * @return psVector* results of polynomial at given locations - */ -psVector *psDPolynomial3DEvalVector( - const psDPolynomial3D *poly, ///< Coefficients for the polynomial - const psVector *x, ///< x locations at which to evaluate - const psVector *y, ///< y locations at which to evaluate - const psVector *z ///< z locations at which to evaluate -); - -/** Evaluates a double-precision 4-D polynomial at specific sets of coordinates. - * - * @return psVector* results of polynomial at given locations - */ -psVector *psDPolynomial4DEvalVector( - const psDPolynomial4D *poly, ///< Coefficients for the polynomial - const psVector *x, ///< w locations at which to evaluate - const psVector *y, ///< x locations at which to evaluate - const psVector *z, ///< y locations at which to evaluate - const psVector *t ///< z locations at which to evaluate -); /** One-Dimensional Spline */