IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1341


Ignore:
Timestamp:
Jul 29, 2004, 12:44:39 PM (22 years ago)
Author:
evanalst
Message:

Function name change. See task #772.

Location:
trunk/psLib/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psFunctions.c

    r1281 r1341  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2004-07-22 23:45:16 $
     9 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2004-07-29 22:44:34 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    344344 *****************************************************************************/
    345345float
    346 psEvalPolynomial1D(float x,
     346psPolynomial1DEval(float x,
    347347                   const psPolynomial1D *myPoly)
    348348{
    … …  
    352352
    353353    if (NULL == myPoly) {
    354         psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n");
     354        psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n");
    355355    }
    356356
    … …  
    362362
    363363    if (NULL == myPoly->coeff) {
    364         psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n");
     364        psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n");
    365365    }
    366366
    … …  
    375375
    376376float
    377 psEvalPolynomial2D(float x,
     377psPolynomial2DEval(float x,
    378378                   float y,
    379379                   const psPolynomial2D *myPoly)
    … …  
    398398
    399399float
    400 psEvalPolynomial3D(float x,
     400psPolynomial3DEval(float x,
    401401                   float y,
    402402                   float z,
    … …  
    428428
    429429float
    430 psEvalPolynomial4D(float w,
     430psPolynomial4DEval(float w,
    431431                   float x,
    432432                   float y,
    … …  
    678678 *****************************************************************************/
    679679double
    680 psDEvalPolynomial1D(double x,
     680psDPolynomial1DEval(double x,
    681681                    const psDPolynomial1D *myPoly)
    682682{
    … …  
    700700
    701701double
    702 psDEvalPolynomial2D(double x,
     702psDPolynomial2DEval(double x,
    703703                    double y,
    704704                    const psDPolynomial2D *myPoly)
    … …  
    723723
    724724double
    725 psDEvalPolynomial3D(double x,
     725psDPolynomial3DEval(double x,
    726726                    double y,
    727727                    double z,
    … …  
    753753
    754754double
    755 psDEvalPolynomial4D(double w,
     755psDPolynomial4DEval(double w,
    756756                    double x,
    757757                    double y,

  • trunk/psLib/src/dataManip/psFunctions.h

    r1298 r1341  
    1212 *  @author George Gusciora, MHPCC
    1313 *
    14  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-07-27 19:51:55 $
     14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-07-29 22:44:34 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    106106/** Evaluate 1D polynomial */
    107107float
    108 psEvalPolynomial1D(float x,  ///< Value at which to evaluate
     108psPolynomial1DEval(float x,  ///< Value at which to evaluate
    109109                   const psPolynomial1D *myPoly ///< Coefficients for the polynomial
    110110                  );
    … …  
    112112/** Evaluate 2D polynomial */
    113113float
    114 psEvalPolynomial2D(float x,  ///< Value x at which to evaluate
     114psPolynomial2DEval(float x,  ///< Value x at which to evaluate
    115115                   float y,  ///< Value y at which to evaluate
    116116                   const psPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    119119/** Evaluate 3D polynomial */
    120120float
    121 psEvalPolynomial3D(float x,  ///< Value x at which to evaluate
     121psPolynomial3DEval(float x,  ///< Value x at which to evaluate
    122122                   float y,  ///< Value y at which to evaluate
    123123                   float z,  ///< Value z at which to evaluate
    … …  
    127127/** Evaluate 4D polynomial */
    128128float
    129 psEvalPolynomial4D(float w,  ///< Value w at which to evaluate
     129psPolynomial4DEval(float w,  ///< Value w at which to evaluate
    130130                   float x,  ///< Value x at which to evaluate
    131131                   float y,  ///< Value y at which to evaluate
    … …  
    193193/** Evaluate 1D polynomial (double precision) */
    194194double
    195 psDEvalPolynomial1D(double x,  ///< Value at which to evaluate
     195psDPolynomial1DEval(double x,  ///< Value at which to evaluate
    196196                    const psDPolynomial1D *myPoly ///< Coefficients for the polynomial
    197197                   );
    … …  
    199199/** Evaluate 2D polynomial (double precision) */
    200200double
    201 psDEvalPolynomial2D(double x,  ///< Value x at which to evaluate
     201psDPolynomial2DEval(double x,  ///< Value x at which to evaluate
    202202                    double y,  ///< Value y at which to evaluate
    203203                    const psDPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    206206/** Evaluate 3D polynomial (double precision) */
    207207double
    208 psDEvalPolynomial3D(double x,  ///< Value x at which to evaluate
     208psDPolynomial3DEval(double x,  ///< Value x at which to evaluate
    209209                    double y,  ///< Value y at which to evaluate
    210210                    double z,  ///< Value z at which to evaluate
    … …  
    214214/** Evaluate 4D polynomial (double precision) */
    215215double
    216 psDEvalPolynomial4D(double w,  ///< Value w at which to evaluate
     216psDPolynomial4DEval(double w,  ///< Value w at which to evaluate
    217217                    double x,  ///< Value x at which to evaluate
    218218                    double y,  ///< Value y at which to evaluate

  • trunk/psLib/src/dataManip/psStats.c

    r1336 r1341  
    10491049        oldMidpoint = midpoint;
    10501050
    1051         f = psEvalPolynomial1D(midpoint, myPoly);
     1051        f = psPolynomial1DEval(midpoint, myPoly);
    10521052        //        printf("p_ps1DPolyMedian() iteration %d.  f(%f) is %f\n", numIterations, midpoint, f);
    10531053        if (fabs(f - getThisValue) <= FLT_EPSILON) {

  • trunk/psLib/src/image/psImageStats.c

    r1323 r1341  
    200200    sums[i][j]: This will contain the sum of
    201201                input->data.F32[x][y] *
    202                 psEvalPolynomial1D((float) x, chebPolys[i]) *
    203                 psEvalPolynomial1D((float) y, chebPolys[j]);
     202                psPolynomial1DEval((float) x, chebPolys[i]) *
     203                psPolynomial1DEval((float) y, chebPolys[j]);
    204204        over all pixels (x,y) in the image.
    205205 *****************************************************************************/
    … …  
    242242            tmp = 0.0;
    243243            for (x=0;x<input->numRows;x++) {
    244                 tmp+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    245                       psEvalPolynomial1D(rScalingFactors[x], chebPolys[j]);
     244                tmp+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     245                      psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
    246246
    247247            }
    … …  
    257257                for (y=0;y<input->numCols;y++) {
    258258                    sums[i][j]+= input->data.F32[x][y] *
    259                                  psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    260                                  psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]);
     259                                 psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     260                                 psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
    261261                }
    262262            }
    … …  
    343343            for (i=0;i<coeffs->nX;i++) {
    344344                for (j=0;j<coeffs->nY;j++) {
    345                     polySum+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    346                               psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]) *
     345                    polySum+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     346                              psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) *
    347347                              coeffs->coeff[i][j];
    348348

  • trunk/psLib/src/imageops/psImageStats.c

    r1323 r1341  
    200200    sums[i][j]: This will contain the sum of
    201201                input->data.F32[x][y] *
    202                 psEvalPolynomial1D((float) x, chebPolys[i]) *
    203                 psEvalPolynomial1D((float) y, chebPolys[j]);
     202                psPolynomial1DEval((float) x, chebPolys[i]) *
     203                psPolynomial1DEval((float) y, chebPolys[j]);
    204204        over all pixels (x,y) in the image.
    205205 *****************************************************************************/
    … …  
    242242            tmp = 0.0;
    243243            for (x=0;x<input->numRows;x++) {
    244                 tmp+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    245                       psEvalPolynomial1D(rScalingFactors[x], chebPolys[j]);
     244                tmp+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     245                      psPolynomial1DEval(rScalingFactors[x], chebPolys[j]);
    246246
    247247            }
    … …  
    257257                for (y=0;y<input->numCols;y++) {
    258258                    sums[i][j]+= input->data.F32[x][y] *
    259                                  psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    260                                  psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]);
     259                                 psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     260                                 psPolynomial1DEval(cScalingFactors[y], chebPolys[j]);
    261261                }
    262262            }
    … …  
    343343            for (i=0;i<coeffs->nX;i++) {
    344344                for (j=0;j<coeffs->nY;j++) {
    345                     polySum+= psEvalPolynomial1D(rScalingFactors[x], chebPolys[i]) *
    346                               psEvalPolynomial1D(cScalingFactors[y], chebPolys[j]) *
     345                    polySum+= psPolynomial1DEval(rScalingFactors[x], chebPolys[i]) *
     346                              psPolynomial1DEval(cScalingFactors[y], chebPolys[j]) *
    347347                              coeffs->coeff[i][j];
    348348

  • trunk/psLib/src/math/psPolynomial.c

    r1281 r1341  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2004-07-22 23:45:16 $
     9 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2004-07-29 22:44:34 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    344344 *****************************************************************************/
    345345float
    346 psEvalPolynomial1D(float x,
     346psPolynomial1DEval(float x,
    347347                   const psPolynomial1D *myPoly)
    348348{
    … …  
    352352
    353353    if (NULL == myPoly) {
    354         psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n");
     354        psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n");
    355355    }
    356356
    … …  
    362362
    363363    if (NULL == myPoly->coeff) {
    364         psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n");
     364        psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n");
    365365    }
    366366
    … …  
    375375
    376376float
    377 psEvalPolynomial2D(float x,
     377psPolynomial2DEval(float x,
    378378                   float y,
    379379                   const psPolynomial2D *myPoly)
    … …  
    398398
    399399float
    400 psEvalPolynomial3D(float x,
     400psPolynomial3DEval(float x,
    401401                   float y,
    402402                   float z,
    … …  
    428428
    429429float
    430 psEvalPolynomial4D(float w,
     430psPolynomial4DEval(float w,
    431431                   float x,
    432432                   float y,
    … …  
    678678 *****************************************************************************/
    679679double
    680 psDEvalPolynomial1D(double x,
     680psDPolynomial1DEval(double x,
    681681                    const psDPolynomial1D *myPoly)
    682682{
    … …  
    700700
    701701double
    702 psDEvalPolynomial2D(double x,
     702psDPolynomial2DEval(double x,
    703703                    double y,
    704704                    const psDPolynomial2D *myPoly)
    … …  
    723723
    724724double
    725 psDEvalPolynomial3D(double x,
     725psDPolynomial3DEval(double x,
    726726                    double y,
    727727                    double z,
    … …  
    753753
    754754double
    755 psDEvalPolynomial4D(double w,
     755psDPolynomial4DEval(double w,
    756756                    double x,
    757757                    double y,

  • trunk/psLib/src/math/psPolynomial.h

    r1298 r1341  
    1212 *  @author George Gusciora, MHPCC
    1313 *
    14  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-07-27 19:51:55 $
     14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-07-29 22:44:34 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    106106/** Evaluate 1D polynomial */
    107107float
    108 psEvalPolynomial1D(float x,  ///< Value at which to evaluate
     108psPolynomial1DEval(float x,  ///< Value at which to evaluate
    109109                   const psPolynomial1D *myPoly ///< Coefficients for the polynomial
    110110                  );
    … …  
    112112/** Evaluate 2D polynomial */
    113113float
    114 psEvalPolynomial2D(float x,  ///< Value x at which to evaluate
     114psPolynomial2DEval(float x,  ///< Value x at which to evaluate
    115115                   float y,  ///< Value y at which to evaluate
    116116                   const psPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    119119/** Evaluate 3D polynomial */
    120120float
    121 psEvalPolynomial3D(float x,  ///< Value x at which to evaluate
     121psPolynomial3DEval(float x,  ///< Value x at which to evaluate
    122122                   float y,  ///< Value y at which to evaluate
    123123                   float z,  ///< Value z at which to evaluate
    … …  
    127127/** Evaluate 4D polynomial */
    128128float
    129 psEvalPolynomial4D(float w,  ///< Value w at which to evaluate
     129psPolynomial4DEval(float w,  ///< Value w at which to evaluate
    130130                   float x,  ///< Value x at which to evaluate
    131131                   float y,  ///< Value y at which to evaluate
    … …  
    193193/** Evaluate 1D polynomial (double precision) */
    194194double
    195 psDEvalPolynomial1D(double x,  ///< Value at which to evaluate
     195psDPolynomial1DEval(double x,  ///< Value at which to evaluate
    196196                    const psDPolynomial1D *myPoly ///< Coefficients for the polynomial
    197197                   );
    … …  
    199199/** Evaluate 2D polynomial (double precision) */
    200200double
    201 psDEvalPolynomial2D(double x,  ///< Value x at which to evaluate
     201psDPolynomial2DEval(double x,  ///< Value x at which to evaluate
    202202                    double y,  ///< Value y at which to evaluate
    203203                    const psDPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    206206/** Evaluate 3D polynomial (double precision) */
    207207double
    208 psDEvalPolynomial3D(double x,  ///< Value x at which to evaluate
     208psDPolynomial3DEval(double x,  ///< Value x at which to evaluate
    209209                    double y,  ///< Value y at which to evaluate
    210210                    double z,  ///< Value z at which to evaluate
    … …  
    214214/** Evaluate 4D polynomial (double precision) */
    215215double
    216 psDEvalPolynomial4D(double w,  ///< Value w at which to evaluate
     216psDPolynomial4DEval(double w,  ///< Value w at which to evaluate
    217217                    double x,  ///< Value x at which to evaluate
    218218                    double y,  ///< Value y at which to evaluate

  • trunk/psLib/src/math/psSpline.c

    r1281 r1341  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2004-07-22 23:45:16 $
     9 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2004-07-29 22:44:34 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    344344 *****************************************************************************/
    345345float
    346 psEvalPolynomial1D(float x,
     346psPolynomial1DEval(float x,
    347347                   const psPolynomial1D *myPoly)
    348348{
    … …  
    352352
    353353    if (NULL == myPoly) {
    354         psAbort(__func__, "psEvalPolynomial1D(): myPoly is NULL\n");
     354        psAbort(__func__, "psPolynomial1DEval(): myPoly is NULL\n");
    355355    }
    356356
    … …  
    362362
    363363    if (NULL == myPoly->coeff) {
    364         psAbort(__func__, "psEvalPolynomial1D(): myPoly->coeff is NULL\n");
     364        psAbort(__func__, "psPolynomial1DEval(): myPoly->coeff is NULL\n");
    365365    }
    366366
    … …  
    375375
    376376float
    377 psEvalPolynomial2D(float x,
     377psPolynomial2DEval(float x,
    378378                   float y,
    379379                   const psPolynomial2D *myPoly)
    … …  
    398398
    399399float
    400 psEvalPolynomial3D(float x,
     400psPolynomial3DEval(float x,
    401401                   float y,
    402402                   float z,
    … …  
    428428
    429429float
    430 psEvalPolynomial4D(float w,
     430psPolynomial4DEval(float w,
    431431                   float x,
    432432                   float y,
    … …  
    678678 *****************************************************************************/
    679679double
    680 psDEvalPolynomial1D(double x,
     680psDPolynomial1DEval(double x,
    681681                    const psDPolynomial1D *myPoly)
    682682{
    … …  
    700700
    701701double
    702 psDEvalPolynomial2D(double x,
     702psDPolynomial2DEval(double x,
    703703                    double y,
    704704                    const psDPolynomial2D *myPoly)
    … …  
    723723
    724724double
    725 psDEvalPolynomial3D(double x,
     725psDPolynomial3DEval(double x,
    726726                    double y,
    727727                    double z,
    … …  
    753753
    754754double
    755 psDEvalPolynomial4D(double w,
     755psDPolynomial4DEval(double w,
    756756                    double x,
    757757                    double y,

  • trunk/psLib/src/math/psSpline.h

    r1298 r1341  
    1212 *  @author George Gusciora, MHPCC
    1313 *
    14  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-07-27 19:51:55 $
     14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-07-29 22:44:34 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    106106/** Evaluate 1D polynomial */
    107107float
    108 psEvalPolynomial1D(float x,  ///< Value at which to evaluate
     108psPolynomial1DEval(float x,  ///< Value at which to evaluate
    109109                   const psPolynomial1D *myPoly ///< Coefficients for the polynomial
    110110                  );
    … …  
    112112/** Evaluate 2D polynomial */
    113113float
    114 psEvalPolynomial2D(float x,  ///< Value x at which to evaluate
     114psPolynomial2DEval(float x,  ///< Value x at which to evaluate
    115115                   float y,  ///< Value y at which to evaluate
    116116                   const psPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    119119/** Evaluate 3D polynomial */
    120120float
    121 psEvalPolynomial3D(float x,  ///< Value x at which to evaluate
     121psPolynomial3DEval(float x,  ///< Value x at which to evaluate
    122122                   float y,  ///< Value y at which to evaluate
    123123                   float z,  ///< Value z at which to evaluate
    … …  
    127127/** Evaluate 4D polynomial */
    128128float
    129 psEvalPolynomial4D(float w,  ///< Value w at which to evaluate
     129psPolynomial4DEval(float w,  ///< Value w at which to evaluate
    130130                   float x,  ///< Value x at which to evaluate
    131131                   float y,  ///< Value y at which to evaluate
    … …  
    193193/** Evaluate 1D polynomial (double precision) */
    194194double
    195 psDEvalPolynomial1D(double x,  ///< Value at which to evaluate
     195psDPolynomial1DEval(double x,  ///< Value at which to evaluate
    196196                    const psDPolynomial1D *myPoly ///< Coefficients for the polynomial
    197197                   );
    … …  
    199199/** Evaluate 2D polynomial (double precision) */
    200200double
    201 psDEvalPolynomial2D(double x,  ///< Value x at which to evaluate
     201psDPolynomial2DEval(double x,  ///< Value x at which to evaluate
    202202                    double y,  ///< Value y at which to evaluate
    203203                    const psDPolynomial2D *myPoly ///< Coefficients for the polynomial
    … …  
    206206/** Evaluate 3D polynomial (double precision) */
    207207double
    208 psDEvalPolynomial3D(double x,  ///< Value x at which to evaluate
     208psDPolynomial3DEval(double x,  ///< Value x at which to evaluate
    209209                    double y,  ///< Value y at which to evaluate
    210210                    double z,  ///< Value z at which to evaluate
    … …  
    214214/** Evaluate 4D polynomial (double precision) */
    215215double
    216 psDEvalPolynomial4D(double w,  ///< Value w at which to evaluate
     216psDPolynomial4DEval(double w,  ///< Value w at which to evaluate
    217217                    double x,  ///< Value x at which to evaluate
    218218                    double y,  ///< Value y at which to evaluate

  • trunk/psLib/src/math/psStats.c

    r1336 r1341  
    10491049        oldMidpoint = midpoint;
    10501050
    1051         f = psEvalPolynomial1D(midpoint, myPoly);
     1051        f = psPolynomial1DEval(midpoint, myPoly);
    10521052        //        printf("p_ps1DPolyMedian() iteration %d.  f(%f) is %f\n", numIterations, midpoint, f);
    10531053        if (fabs(f - getThisValue) <= FLT_EPSILON) {
Note: See TracChangeset for help on using the changeset viewer.