Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 1340) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 1341) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 23:45:16 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -344,5 +344,5 @@ *****************************************************************************/ float -psEvalPolynomial1D(float x, +psPolynomial1DEval(float x, const psPolynomial1D *myPoly) { @@ -352,5 +352,5 @@ if (NULL == myPoly) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n"); } @@ -362,5 +362,5 @@ if (NULL == myPoly->coeff) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n"); } @@ -375,5 +375,5 @@ float -psEvalPolynomial2D(float x, +psPolynomial2DEval(float x, float y, const psPolynomial2D *myPoly) @@ -398,5 +398,5 @@ float -psEvalPolynomial3D(float x, +psPolynomial3DEval(float x, float y, float z, @@ -428,5 +428,5 @@ float -psEvalPolynomial4D(float w, +psPolynomial4DEval(float w, float x, float y, @@ -678,5 +678,5 @@ *****************************************************************************/ double -psDEvalPolynomial1D(double x, +psDPolynomial1DEval(double x, const psDPolynomial1D *myPoly) { @@ -700,5 +700,5 @@ double -psDEvalPolynomial2D(double x, +psDPolynomial2DEval(double x, double y, const psDPolynomial2D *myPoly) @@ -723,5 +723,5 @@ double -psDEvalPolynomial3D(double x, +psDPolynomial3DEval(double x, double y, double z, @@ -753,5 +753,5 @@ double -psDEvalPolynomial4D(double w, +psDPolynomial4DEval(double w, double x, double y, Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 1340) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 1341) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-27 19:51:55 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -106,5 +106,5 @@ /** Evaluate 1D polynomial */ float -psEvalPolynomial1D(float x, ///< Value at which to evaluate +psPolynomial1DEval(float x, ///< Value at which to evaluate const psPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -112,5 +112,5 @@ /** Evaluate 2D polynomial */ float -psEvalPolynomial2D(float x, ///< Value x at which to evaluate +psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate const psPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -119,5 +119,5 @@ /** Evaluate 3D polynomial */ float -psEvalPolynomial3D(float x, ///< Value x at which to evaluate +psPolynomial3DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate @@ -127,5 +127,5 @@ /** Evaluate 4D polynomial */ float -psEvalPolynomial4D(float w, ///< Value w at which to evaluate +psPolynomial4DEval(float w, ///< Value w at which to evaluate float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate @@ -193,5 +193,5 @@ /** Evaluate 1D polynomial (double precision) */ double -psDEvalPolynomial1D(double x, ///< Value at which to evaluate +psDPolynomial1DEval(double x, ///< Value at which to evaluate const psDPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -199,5 +199,5 @@ /** Evaluate 2D polynomial (double precision) */ double -psDEvalPolynomial2D(double x, ///< Value x at which to evaluate +psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate const psDPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -206,5 +206,5 @@ /** Evaluate 3D polynomial (double precision) */ double -psDEvalPolynomial3D(double x, ///< Value x at which to evaluate +psDPolynomial3DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate @@ -214,5 +214,5 @@ /** Evaluate 4D polynomial (double precision) */ double -psDEvalPolynomial4D(double w, ///< Value w at which to evaluate +psDPolynomial4DEval(double w, ///< Value w at which to evaluate double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 1340) +++ /trunk/psLib/src/dataManip/psStats.c (revision 1341) @@ -1049,5 +1049,5 @@ oldMidpoint = midpoint; - f = psEvalPolynomial1D(midpoint, myPoly); + f = psPolynomial1DEval(midpoint, myPoly); // printf("p_ps1DPolyMedian() iteration %d. f(%f) is %f\n", numIterations, midpoint, f); if (fabs(f - getThisValue) <= FLT_EPSILON) { Index: /trunk/psLib/src/image/psImageStats.c =================================================================== --- /trunk/psLib/src/image/psImageStats.c (revision 1340) +++ /trunk/psLib/src/image/psImageStats.c (revision 1341) @@ -200,6 +200,6 @@ sums[i][j]: This will contain the sum of input->data.F32[x][y] * - psEvalPolynomial1D((float) x, chebPolys[i]) * - psEvalPolynomial1D((float) y, chebPolys[j]); + psPolynomial1DEval((float) x, chebPolys[i]) * + psPolynomial1DEval((float) y, chebPolys[j]); over all pixels (x,y) in the image. *****************************************************************************/ @@ -242,6 +242,6 @@ tmp = 0.0; for (x=0;xnumRows;x++) { - tmp+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(rScalingFactors[x], chebPolys[j]); + tmp+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(rScalingFactors[x], chebPolys[j]); } @@ -257,6 +257,6 @@ for (y=0;ynumCols;y++) { sums[i][j]+= input->data.F32[x][y] * - psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]); + psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(cScalingFactors[y], chebPolys[j]); } } @@ -343,6 +343,6 @@ for (i=0;inX;i++) { for (j=0;jnY;j++) { - polySum+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]) * + polySum+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) * coeffs->coeff[i][j]; Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 1340) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 1341) @@ -200,6 +200,6 @@ sums[i][j]: This will contain the sum of input->data.F32[x][y] * - psEvalPolynomial1D((float) x, chebPolys[i]) * - psEvalPolynomial1D((float) y, chebPolys[j]); + psPolynomial1DEval((float) x, chebPolys[i]) * + psPolynomial1DEval((float) y, chebPolys[j]); over all pixels (x,y) in the image. *****************************************************************************/ @@ -242,6 +242,6 @@ tmp = 0.0; for (x=0;xnumRows;x++) { - tmp+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(rScalingFactors[x], chebPolys[j]); + tmp+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(rScalingFactors[x], chebPolys[j]); } @@ -257,6 +257,6 @@ for (y=0;ynumCols;y++) { sums[i][j]+= input->data.F32[x][y] * - psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]); + psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(cScalingFactors[y], chebPolys[j]); } } @@ -343,6 +343,6 @@ for (i=0;inX;i++) { for (j=0;jnY;j++) { - polySum+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) * - psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]) * + polySum+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) * + psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) * coeffs->coeff[i][j]; Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 1340) +++ /trunk/psLib/src/math/psPolynomial.c (revision 1341) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 23:45:16 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -344,5 +344,5 @@ *****************************************************************************/ float -psEvalPolynomial1D(float x, +psPolynomial1DEval(float x, const psPolynomial1D *myPoly) { @@ -352,5 +352,5 @@ if (NULL == myPoly) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n"); } @@ -362,5 +362,5 @@ if (NULL == myPoly->coeff) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n"); } @@ -375,5 +375,5 @@ float -psEvalPolynomial2D(float x, +psPolynomial2DEval(float x, float y, const psPolynomial2D *myPoly) @@ -398,5 +398,5 @@ float -psEvalPolynomial3D(float x, +psPolynomial3DEval(float x, float y, float z, @@ -428,5 +428,5 @@ float -psEvalPolynomial4D(float w, +psPolynomial4DEval(float w, float x, float y, @@ -678,5 +678,5 @@ *****************************************************************************/ double -psDEvalPolynomial1D(double x, +psDPolynomial1DEval(double x, const psDPolynomial1D *myPoly) { @@ -700,5 +700,5 @@ double -psDEvalPolynomial2D(double x, +psDPolynomial2DEval(double x, double y, const psDPolynomial2D *myPoly) @@ -723,5 +723,5 @@ double -psDEvalPolynomial3D(double x, +psDPolynomial3DEval(double x, double y, double z, @@ -753,5 +753,5 @@ double -psDEvalPolynomial4D(double w, +psDPolynomial4DEval(double w, double x, double y, Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 1340) +++ /trunk/psLib/src/math/psPolynomial.h (revision 1341) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-27 19:51:55 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -106,5 +106,5 @@ /** Evaluate 1D polynomial */ float -psEvalPolynomial1D(float x, ///< Value at which to evaluate +psPolynomial1DEval(float x, ///< Value at which to evaluate const psPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -112,5 +112,5 @@ /** Evaluate 2D polynomial */ float -psEvalPolynomial2D(float x, ///< Value x at which to evaluate +psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate const psPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -119,5 +119,5 @@ /** Evaluate 3D polynomial */ float -psEvalPolynomial3D(float x, ///< Value x at which to evaluate +psPolynomial3DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate @@ -127,5 +127,5 @@ /** Evaluate 4D polynomial */ float -psEvalPolynomial4D(float w, ///< Value w at which to evaluate +psPolynomial4DEval(float w, ///< Value w at which to evaluate float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate @@ -193,5 +193,5 @@ /** Evaluate 1D polynomial (double precision) */ double -psDEvalPolynomial1D(double x, ///< Value at which to evaluate +psDPolynomial1DEval(double x, ///< Value at which to evaluate const psDPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -199,5 +199,5 @@ /** Evaluate 2D polynomial (double precision) */ double -psDEvalPolynomial2D(double x, ///< Value x at which to evaluate +psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate const psDPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -206,5 +206,5 @@ /** Evaluate 3D polynomial (double precision) */ double -psDEvalPolynomial3D(double x, ///< Value x at which to evaluate +psDPolynomial3DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate @@ -214,5 +214,5 @@ /** Evaluate 4D polynomial (double precision) */ double -psDEvalPolynomial4D(double w, ///< Value w at which to evaluate +psDPolynomial4DEval(double w, ///< Value w at which to evaluate double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 1340) +++ /trunk/psLib/src/math/psSpline.c (revision 1341) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 23:45:16 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -344,5 +344,5 @@ *****************************************************************************/ float -psEvalPolynomial1D(float x, +psPolynomial1DEval(float x, const psPolynomial1D *myPoly) { @@ -352,5 +352,5 @@ if (NULL == myPoly) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n"); } @@ -362,5 +362,5 @@ if (NULL == myPoly->coeff) { - psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n"); + psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n"); } @@ -375,5 +375,5 @@ float -psEvalPolynomial2D(float x, +psPolynomial2DEval(float x, float y, const psPolynomial2D *myPoly) @@ -398,5 +398,5 @@ float -psEvalPolynomial3D(float x, +psPolynomial3DEval(float x, float y, float z, @@ -428,5 +428,5 @@ float -psEvalPolynomial4D(float w, +psPolynomial4DEval(float w, float x, float y, @@ -678,5 +678,5 @@ *****************************************************************************/ double -psDEvalPolynomial1D(double x, +psDPolynomial1DEval(double x, const psDPolynomial1D *myPoly) { @@ -700,5 +700,5 @@ double -psDEvalPolynomial2D(double x, +psDPolynomial2DEval(double x, double y, const psDPolynomial2D *myPoly) @@ -723,5 +723,5 @@ double -psDEvalPolynomial3D(double x, +psDPolynomial3DEval(double x, double y, double z, @@ -753,5 +753,5 @@ double -psDEvalPolynomial4D(double w, +psDPolynomial4DEval(double w, double x, double y, Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 1340) +++ /trunk/psLib/src/math/psSpline.h (revision 1341) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-27 19:51:55 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-07-29 22:44:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -106,5 +106,5 @@ /** Evaluate 1D polynomial */ float -psEvalPolynomial1D(float x, ///< Value at which to evaluate +psPolynomial1DEval(float x, ///< Value at which to evaluate const psPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -112,5 +112,5 @@ /** Evaluate 2D polynomial */ float -psEvalPolynomial2D(float x, ///< Value x at which to evaluate +psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate const psPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -119,5 +119,5 @@ /** Evaluate 3D polynomial */ float -psEvalPolynomial3D(float x, ///< Value x at which to evaluate +psPolynomial3DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate @@ -127,5 +127,5 @@ /** Evaluate 4D polynomial */ float -psEvalPolynomial4D(float w, ///< Value w at which to evaluate +psPolynomial4DEval(float w, ///< Value w at which to evaluate float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate @@ -193,5 +193,5 @@ /** Evaluate 1D polynomial (double precision) */ double -psDEvalPolynomial1D(double x, ///< Value at which to evaluate +psDPolynomial1DEval(double x, ///< Value at which to evaluate const psDPolynomial1D *myPoly ///< Coefficients for the polynomial ); @@ -199,5 +199,5 @@ /** Evaluate 2D polynomial (double precision) */ double -psDEvalPolynomial2D(double x, ///< Value x at which to evaluate +psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate const psDPolynomial2D *myPoly ///< Coefficients for the polynomial @@ -206,5 +206,5 @@ /** Evaluate 3D polynomial (double precision) */ double -psDEvalPolynomial3D(double x, ///< Value x at which to evaluate +psDPolynomial3DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate @@ -214,5 +214,5 @@ /** Evaluate 4D polynomial (double precision) */ double -psDEvalPolynomial4D(double w, ///< Value w at which to evaluate +psDPolynomial4DEval(double w, ///< Value w at which to evaluate double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 1340) +++ /trunk/psLib/src/math/psStats.c (revision 1341) @@ -1049,5 +1049,5 @@ oldMidpoint = midpoint; - f = psEvalPolynomial1D(midpoint, myPoly); + f = psPolynomial1DEval(midpoint, myPoly); // printf("p_ps1DPolyMedian() iteration %d. f(%f) is %f\n", numIterations, midpoint, f); if (fabs(f - getThisValue) <= FLT_EPSILON) {