Index: trunk/psLib/src/math/psSpline.h =================================================================== --- trunk/psLib/src/math/psSpline.h (revision 2431) +++ trunk/psLib/src/math/psSpline.h (revision 2433) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 20:34:13 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-24 21:59:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -163,6 +163,6 @@ */ float psPolynomial1DEval( - float x, ///< location at which to evaluate - const psPolynomial1D* myPoly ///< Coefficients for the polynomial + const psPolynomial1D* myPoly, ///< Coefficients for the polynomial + float x ///< location at which to evaluate ); @@ -172,18 +172,18 @@ */ float psPolynomial2DEval( + const psPolynomial2D* myPoly, ///< Coefficients for the polynomial + float x, ///< x location at which to evaluate + float 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( + const psPolynomial3D* myPoly, ///< Coefficients for the polynomial float x, ///< x location at which to evaluate float y, ///< y location at which to evaluate - const psPolynomial2D* myPoly ///< Coefficients for the polynomial -); - -/** Evaluates a 3-D polynomial at specific coordinates. - * - * @return float result of polynomial at given location - */ -float psPolynomial3DEval( - float x, ///< x location at which to evaluate - float y, ///< y location at which to evaluate - float z, ///< z location at which to evaluate - const psPolynomial3D* myPoly ///< Coefficients for the polynomial + float z ///< z location at which to evaluate ); @@ -193,32 +193,36 @@ */ float 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 - const psPolynomial4D* myPoly ///< Coefficients for the polynomial -); - -psVector *psPolynomial1DEvalVector(const psVector *x, ///< x locations at which to evaluate - const psPolynomial1D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psPolynomial2DEvalVector(const psVector *x, ///< x locations at which to evaluate - const psVector *y, ///< y locations at which to evaluate - const psPolynomial2D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psPolynomial3DEvalVector(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 - const psPolynomial3D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psPolynomial4DEvalVector(const psVector *w, ///< w locations at which to evaluate - 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 - const psPolynomial4D *myPoly ///< Coefficients for the polynomial - ); + float z ///< z location at which to evaluate +); + +psVector *psPolynomial1DEvalVector( + const psPolynomial1D *myPoly, ///< Coefficients for the polynomial + const psVector *x ///< x locations at which to evaluate +); + +psVector *psPolynomial2DEvalVector( + const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psVector *x, ///< x locations at which to evaluate + const psVector *y ///< y locations at which to evaluate +); + +psVector *psPolynomial3DEvalVector( + const psPolynomial3D *myPoly, ///< 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 +); + +psVector *psPolynomial4DEvalVector( + const psPolynomial4D *myPoly, ///< Coefficients for the polynomial + const psVector *w, ///< w locations at which to evaluate + 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 +); /*****************************************************************************/ @@ -323,6 +327,6 @@ */ double psDPolynomial1DEval( - double x, ///< Value at which to evaluate - const psDPolynomial1D* myPoly ///< Coefficients for the polynomial + const psDPolynomial1D* myPoly, ///< Coefficients for the polynomial + double x ///< Value at which to evaluate ); @@ -332,7 +336,7 @@ */ double psDPolynomial2DEval( + const psDPolynomial2D* myPoly, ///< Coefficients for the polynomial double x, ///< Value x at which to evaluate - double y, ///< Value y at which to evaluate - const psDPolynomial2D* myPoly ///< Coefficients for the polynomial + double y ///< Value y at which to evaluate ); @@ -342,8 +346,8 @@ */ double 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 - const psDPolynomial3D* myPoly ///< Coefficients for the polynomial + double z ///< Value z at which to evaluate ); @@ -353,32 +357,36 @@ */ double 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 - const psDPolynomial4D* myPoly ///< Coefficients for the polynomial -); - -psVector *psDPolynomial1DEvalVector(const psVector *x, ///< x locations at which to evaluate - const psDPolynomial1D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psDPolynomial2DEvalVector(const psVector *x, ///< x locations at which to evaluate - const psVector *y, ///< y locations at which to evaluate - const psDPolynomial2D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psDPolynomial3DEvalVector(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 - const psDPolynomial3D *myPoly ///< Coefficients for the polynomial - ); - -psVector *psDPolynomial4DEvalVector(const psVector *w, ///< w locations at which to evaluate - 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 - const psDPolynomial4D *myPoly ///< Coefficients for the polynomial - ); + double z ///< Value z at which to evaluate +); + +psVector *psDPolynomial1DEvalVector( + const psDPolynomial1D *myPoly, ///< Coefficients for the polynomial + const psVector *x ///< x locations at which to evaluate +); + +psVector *psDPolynomial2DEvalVector( + const psDPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psVector *x, ///< x locations at which to evaluate + const psVector *y ///< y locations at which to evaluate +); + +psVector *psDPolynomial3DEvalVector( + const psDPolynomial3D *myPoly, ///< 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 +); + +psVector *psDPolynomial4DEvalVector( + const psDPolynomial4D *myPoly, ///< Coefficients for the polynomial + const psVector *w, ///< w locations at which to evaluate + 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 +);