IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4405


Ignore:
Timestamp:
Jun 27, 2005, 2:53:54 PM (21 years ago)
Author:
drobbin
Message:

psPolynomial fxns revised per apidelta-report-cycle6

Location:
trunk/psLib
Files:
10 edited

Legend:

Unmodified
Added
Removed

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

    r4392 r4405  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-25 02:02:05 $
     9 *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-28 00:53:53 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    12321232}
    12331233
    1234 psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x)
    1235 {
    1236     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1237 
    1238     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1239         return(ordPolynomial1DEval(x, myPoly));
    1240     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1241         return(chebPolynomial1DEval(x, myPoly));
     1234psF64 psPolynomial1DEval(const psPolynomial1D* poly, psF64 x)
     1235{
     1236    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1237
     1238    if (poly->type == PS_POLYNOMIAL_ORD) {
     1239        return(ordPolynomial1DEval(x, poly));
     1240    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1241        return(chebPolynomial1DEval(x, poly));
    12421242    } else {
    12431243        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12441244                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1245                 myPoly->type);
     1245                poly->type);
    12461246    }
    12471247    return(NAN);
    12481248}
    12491249
    1250 psVector *psPolynomial1DEvalVector(const psPolynomial1D *myPoly,
     1250psVector *psPolynomial1DEvalVector(const psPolynomial1D *poly,
    12511251                                   const psVector *x)
    12521252{
    1253     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1253    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12541254    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12551255    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    12591259    tmp = psVectorAlloc(x->n, PS_TYPE_F32);
    12601260    for (psS32 i=0;i<x->n;i++) {
    1261         tmp->data.F32[i] = psPolynomial1DEval(myPoly, x->data.F32[i]);
     1261        tmp->data.F32[i] = psPolynomial1DEval(poly, x->data.F32[i]);
    12621262    }
    12631263
    … …  
    12651265}
    12661266
    1267 psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y)
    1268 {
    1269     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1270 
    1271     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1272         return(ordPolynomial2DEval(x, y, myPoly));
    1273     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1274         return(chebPolynomial2DEval(x, y, myPoly));
     1267psF64 psPolynomial2DEval(const psPolynomial2D* poly, psF64 x, psF64 y)
     1268{
     1269    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1270
     1271    if (poly->type == PS_POLYNOMIAL_ORD) {
     1272        return(ordPolynomial2DEval(x, y, poly));
     1273    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1274        return(chebPolynomial2DEval(x, y, poly));
    12751275    } else {
    12761276        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12771277                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1278                 myPoly->type);
     1278                poly->type);
    12791279    }
    12801280    return(NAN);
    12811281}
    12821282
    1283 psVector *psPolynomial2DEvalVector(const psPolynomial2D *myPoly,
     1283psVector *psPolynomial2DEvalVector(const psPolynomial2D *poly,
    12841284                                   const psVector *x,
    12851285                                   const psVector *y)
    12861286
    12871287{
    1288     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1288    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12891289    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12901290    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13051305    // Evaluate the polynomial at the specified points
    13061306    for (psS32 i=0; i<vecLen; i++) {
    1307         tmp->data.F32[i] = psPolynomial2DEval(myPoly,x->data.F32[i],y->data.F32[i]);
     1307        tmp->data.F32[i] = psPolynomial2DEval(poly,x->data.F32[i],y->data.F32[i]);
    13081308    }
    13091309
    … …  
    13121312}
    13131313
    1314 psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z)
    1315 {
    1316     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1317 
    1318     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1319         return(ordPolynomial3DEval(x, y, z, myPoly));
    1320     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1321         return(chebPolynomial3DEval(x, y, z, myPoly));
     1314psF64 psPolynomial3DEval(const psPolynomial3D* poly, psF64 x, psF64 y, psF64 z)
     1315{
     1316    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1317
     1318    if (poly->type == PS_POLYNOMIAL_ORD) {
     1319        return(ordPolynomial3DEval(x, y, z, poly));
     1320    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1321        return(chebPolynomial3DEval(x, y, z, poly));
    13221322    } else {
    13231323        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13241324                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1325                 myPoly->type);
     1325                poly->type);
    13261326    }
    13271327    return(NAN);
    13281328}
    13291329
    1330 psVector *psPolynomial3DEvalVector(const psPolynomial3D *myPoly,
     1330psVector *psPolynomial3DEvalVector(const psPolynomial3D *poly,
    13311331                                   const psVector *x,
    13321332                                   const psVector *y,
    … …  
    13341334
    13351335{
    1336     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1336    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13371337    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13381338    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13581358    // Evaluate polynomial
    13591359    for (psS32 i = 0; i < vecLen; i++) {
    1360         tmp->data.F32[i] = psPolynomial3DEval(myPoly,
     1360        tmp->data.F32[i] = psPolynomial3DEval(poly,
    13611361                                              x->data.F32[i],
    13621362                                              y->data.F32[i],
    … …  
    13681368}
    13691369
    1370 psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z)
    1371 {
    1372     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1373 
    1374     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1375         return(ordPolynomial4DEval(w,x,y,z, myPoly));
    1376     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1377         return(chebPolynomial4DEval(w,x,y,z, myPoly));
     1370psF64 psPolynomial4DEval(const psPolynomial4D* poly, psF64 x, psF64 y, psF64 z, psF64 t)
     1371{
     1372    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1373
     1374    if (poly->type == PS_POLYNOMIAL_ORD) {
     1375        return(ordPolynomial4DEval(x,y,z,t, poly));
     1376    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1377        return(chebPolynomial4DEval(x,y,z,t, poly));
    13781378    } else {
    13791379        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13801380                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1381                 myPoly->type);
     1381                poly->type);
    13821382    }
    13831383    return(NAN);
    13841384}
    13851385
    1386 psVector *psPolynomial4DEvalVector(const psPolynomial4D *myPoly,
    1387                                    const psVector *w,
     1386psVector *psPolynomial4DEvalVector(const psPolynomial4D *poly,
    13881387                                   const psVector *x,
    13891388                                   const psVector *y,
    1390                                    const psVector *z)
    1391 {
    1392     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
    1393     PS_ASSERT_VECTOR_NON_NULL(w, NULL);
    1394     PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL);
     1389                                   const psVector *z,
     1390                                   const psVector *t)
     1391{
     1392    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13951393    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13961394    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13991397    PS_ASSERT_VECTOR_NON_NULL(z, NULL);
    14001398    PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL);
     1399    PS_ASSERT_VECTOR_NON_NULL(t, NULL);
     1400    PS_ASSERT_VECTOR_TYPE(t, PS_TYPE_F32, NULL);
    14011401
    14021402    psVector *tmp;
    1403     psS32 vecLen=w->n;
     1403    psS32 vecLen=x->n;
    14041404
    14051405    // Determine output vector size from min of input vectors
     1406    if (z->n < vecLen) {
     1407        vecLen = z->n;
     1408    }
    14061409    if (y->n < vecLen) {
    14071410        vecLen = y->n;
    14081411    }
    1409     if (x->n < vecLen) {
    1410         vecLen = x->n;
    1411     }
    1412     if (z->n < vecLen) {
    1413         vecLen = z->n;
     1412    if (t->n < vecLen) {
     1413        vecLen = t->n;
    14141414    }
    14151415
    … …  
    14191419    // Evaluate polynomial
    14201420    for (psS32 i = 0; i < vecLen; i++) {
    1421         tmp->data.F32[i] = psPolynomial4DEval(myPoly,
    1422                                               w->data.F32[i],
     1421        tmp->data.F32[i] = psPolynomial4DEval(poly,
    14231422                                              x->data.F32[i],
    14241423                                              y->data.F32[i],
    1425                                               z->data.F32[i]);
     1424                                              z->data.F32[i],
     1425                                              t->data.F32[i]);
    14261426    }
    14271427

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

    r4330 r4405  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-21 03:01:37 $
     14 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-28 00:53:53 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    PS_POLYNOMIAL_ORD,                 ///< Ordinary Polynomial
    6868    PS_POLYNOMIAL_CHEB                 ///< Chebyshev Polynomial
    69 } psPolynomialType;
     69}
     70psPolynomialType;
    7071
    7172/** One-dimensional polynomial */
    … …  
    7374{
    7475    psPolynomialType type;             ///< Polynomial type
    75     psS32 n;                             ///< Number of terms
     76    psS32 n;                           ///< Number of terms
    7677    psF32 *coeff;                      ///< Coefficients
    7778    psF32 *coeffErr;                   ///< Error in coefficients
    … …  
    8485{
    8586    psPolynomialType type;             ///< Polynomial type
    86     psS32 nX;                            ///< Number of terms in x
    87     psS32 nY;                            ///< Number of terms in y
     87    psS32 nX;                          ///< Number of terms in x
     88    psS32 nY;                          ///< Number of terms in y
    8889    psF32 **coeff;                     ///< Coefficients
    8990    psF32 **coeffErr;                  ///< Error in coefficients
    … …  
    9697{
    9798    psPolynomialType type;             ///< Polynomial type
    98     psS32 nX;                            ///< Number of terms in x
    99     psS32 nY;                            ///< Number of terms in y
    100     psS32 nZ;                            ///< Number of terms in z
     99    psS32 nX;                          ///< Number of terms in x
     100    psS32 nY;                          ///< Number of terms in y
     101    psS32 nZ;                          ///< Number of terms in z
    101102    psF32 ***coeff;                    ///< Coefficients
    102103    psF32 ***coeffErr;                 ///< Error in coefficients
    … …  
    109110{
    110111    psPolynomialType type;             ///< Polynomial type
    111     psS32 nW;                            ///< Number of terms in w
    112     psS32 nX;                            ///< Number of terms in x
    113     psS32 nY;                            ///< Number of terms in y
    114     psS32 nZ;                            ///< Number of terms in z
     112    psS32 nW;                          ///< Number of terms in w
     113    psS32 nX;                          ///< Number of terms in x
     114    psS32 nY;                          ///< Number of terms in y
     115    psS32 nZ;                          ///< Number of terms in z
    115116    psF32 ****coeff;                   ///< Coefficients
    116117    psF32 ****coeffErr;                ///< Error in coefficients
    … …  
    125126 */
    126127psPolynomial1D* psPolynomial1DAlloc(
    127     psS32 n,                            ///< Number of terms
     128    psS32 n,                           ///< Number of terms
    128129    psPolynomialType type              ///< Polynomial Type
    129130);
    … …  
    134135 */
    135136psPolynomial2D* psPolynomial2DAlloc(
    136     psS32 nX,                           ///< Number of terms in x
    137     psS32 nY,                           ///< Number of terms in y
     137    psS32 nX,                          ///< Number of terms in x
     138    psS32 nY,                          ///< Number of terms in y
    138139    psPolynomialType type              ///< Polynomial Type
    139140);
    … …  
    144145 */
    145146psPolynomial3D* psPolynomial3DAlloc(
    146     psS32 nX,                           ///< Number of terms in x
    147     psS32 nY,                           ///< Number of terms in y
    148     psS32 nZ,                           ///< Number of terms in z
     147    psS32 nX,                          ///< Number of terms in x
     148    psS32 nY,                          ///< Number of terms in y
     149    psS32 nZ,                          ///< Number of terms in z
    149150    psPolynomialType type              ///< Polynomial Type
    150151);
    … …  
    155156 */
    156157psPolynomial4D* psPolynomial4DAlloc(
    157     psS32 nW,                           ///< Number of terms in w
    158     psS32 nX,                           ///< Number of terms in x
    159     psS32 nY,                           ///< Number of terms in y
    160     psS32 nZ,                           ///< Number of terms in z
     158    psS32 nW,                          ///< Number of terms in w
     159    psS32 nX,                          ///< Number of terms in x
     160    psS32 nY,                          ///< Number of terms in y
     161    psS32 nZ,                          ///< Number of terms in z
    161162    psPolynomialType type              ///< Polynomial Type
    162163);
    … …  
    164165/** Evaluates a 1-D polynomial at specific coordinates.
    165166 *
    166  *  @return psF32    result of polynomial at given location
    167  */
    168 psF32 psPolynomial1DEval(
    169     const psPolynomial1D* myPoly,      ///< Coefficients for the polynomial
    170     psF32 x                            ///< location at which to evaluate
     167 *  @return psF64    result of polynomial at given location
     168 */
     169psF64 psPolynomial1DEval(
     170    const psPolynomial1D* poly,        ///< Coefficients for the polynomial
     171    psF64 x                            ///< location at which to evaluate
    171172);
    172173
    173174/** Evaluates a 2-D polynomial at specific coordinates.
    174175 *
    175  *  @return psF32    result of polynomial at given location
    176  */
    177 psF32 psPolynomial2DEval(
    178     const psPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    179     psF32 x,                            ///< x location at which to evaluate
    180     psF32 y                             ///< y location at which to evaluate
     176 *  @return psF64    result of polynomial at given location
     177 */
     178psF64 psPolynomial2DEval(
     179    const psPolynomial2D* poly,         ///< Coefficients for the polynomial
     180    psF64 x,                            ///< x location at which to evaluate
     181    psF64 y                             ///< y location at which to evaluate
    181182);
    182183
    183184/** Evaluates a 3-D polynomial at specific coordinates.
    184185 *
    185  *  @return psF32    result of polynomial at given location
    186  */
    187 psF32 psPolynomial3DEval(
    188     const psPolynomial3D* myPoly,      ///< Coefficients for the polynomial
    189     psF32 x,                            ///< x location at which to evaluate
    190     psF32 y,                            ///< y location at which to evaluate
    191     psF32 z                             ///< z location at which to evaluate
     186 *  @return psF64    result of polynomial at given location
     187 */
     188psF64 psPolynomial3DEval(
     189    const psPolynomial3D* poly,        ///< Coefficients for the polynomial
     190    psF64 x,                           ///< x location at which to evaluate
     191    psF64 y,                           ///< y location at which to evaluate
     192    psF64 z                            ///< z location at which to evaluate
    192193);
    193194
    194195/** Evaluates a 4-D polynomial at specific coordinates.
    195196 *
    196  *  @return psF32    result of polynomial at given location
    197  */
    198 psF32 psPolynomial4DEval(
    199     const psPolynomial4D* myPoly,      ///< Coefficients for the polynomial
    200     psF32 w,                            ///< w location at which to evaluate
    201     psF32 x,                            ///< x location at which to evaluate
    202     psF32 y,                            ///< y location at which to evaluate
    203     psF32 z                             ///< z location at which to evaluate
     197 *  @return psF64    result of polynomial at given location
     198 */
     199psF64 psPolynomial4DEval(
     200    const psPolynomial4D* poly,        ///< Coefficients for the polynomial
     201    psF64 x,                           ///< x location at which to evaluate
     202    psF64 y,                           ///< y location at which to evaluate
     203    psF64 z,                           ///< z location at which to evaluate
     204    psF64 t                            ///< t location at which to evaluate
    204205);
    205206
    … …  
    209210 */
    210211psVector *psPolynomial1DEvalVector(
    211     const psPolynomial1D *myPoly,      ///< Coefficients for the polynomial
    212     const psVector *x                   ///< x locations at which to evaluate
     212    const psPolynomial1D *poly,        ///< Coefficients for the polynomial
     213    const psVector *x                  ///< x locations at which to evaluate
    213214);
    214215
    … …  
    218219 */
    219220psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221     const psVector *x,                  ///< x locations at which to evaluate
    222     const psVector *y                   ///< y locations at which to evaluate
     221    const psPolynomial2D *poly,        ///< Coefficients for the polynomial
     222    const psVector *x,                 ///< x locations at which to evaluate
     223    const psVector *y                  ///< y locations at which to evaluate
    223224);
    224225
    … …  
    228229 */
    229230psVector *psPolynomial3DEvalVector(
    230     const psPolynomial3D *myPoly,      ///< Coefficients for the polynomial
    231     const psVector *x,                  ///< x locations at which to evaluate
    232     const psVector *y,                  ///< y locations at which to evaluate
    233     const psVector *z                   ///< z locations at which to evaluate
     231    const psPolynomial3D *poly,        ///< Coefficients for the polynomial
     232    const psVector *x,                 ///< x locations at which to evaluate
     233    const psVector *y,                 ///< y locations at which to evaluate
     234    const psVector *z                  ///< z locations at which to evaluate
    234235);
    235236
    … …  
    239240 */
    240241psVector *psPolynomial4DEvalVector(
    241     const psPolynomial4D *myPoly,      ///< Coefficients for the polynomial
    242     const psVector *w,                  ///< w locations at which to evaluate
    243     const psVector *x,                  ///< x locations at which to evaluate
    244     const psVector *y,                  ///< y locations at which to evaluate
    245     const psVector *z                   ///< z locations at which to evaluate
     242    const psPolynomial4D *poly,        ///< Coefficients for the polynomial
     243    const psVector *x,                 ///< x locations at which to evaluate
     244    const psVector *y,                 ///< y locations at which to evaluate
     245    const psVector *z,                 ///< z locations at which to evaluate
     246    const psVector *t                  ///< t locations at which to evaluate
    246247);
    247248
    … …  
    254255{
    255256    psPolynomialType type;             ///< Polynomial type
    256     psS32 n;                            ///< Number of terms
     257    psS32 n;                           ///< Number of terms
    257258    psF64 *coeff;                      ///< Coefficients
    258259    psF64 *coeffErr;                   ///< Error in coefficients
    … …  
    265266{
    266267    psPolynomialType type;             ///< Polynomial type
    267     psS32 nX;                           ///< Number of terms in x
    268     psS32 nY;                           ///< Number of terms in y
     268    psS32 nX;                          ///< Number of terms in x
     269    psS32 nY;                          ///< Number of terms in y
    269270    psF64 **coeff;                     ///< Coefficients
    270271    psF64 **coeffErr;                  ///< Error in coefficients
    … …  
    277278{
    278279    psPolynomialType type;             ///< Polynomial type
    279     psS32 nX;                           ///< Number of terms in x
    280     psS32 nY;                           ///< Number of terms in y
    281     psS32 nZ;                           ///< Number of terms in z
     280    psS32 nX;                          ///< Number of terms in x
     281    psS32 nY;                          ///< Number of terms in y
     282    psS32 nZ;                          ///< Number of terms in z
    282283    psF64 ***coeff;                    ///< Coefficients
    283284    psF64 ***coeffErr;                 ///< Error in coefficients
    … …  
    290291{
    291292    psPolynomialType type;             ///< Polynomial type
    292     psS32 nW;                           ///< Number of terms in w
    293     psS32 nX;                           ///< Number of terms in x
    294     psS32 nY;                           ///< Number of terms in y
    295     psS32 nZ;                           ///< Number of terms in z
     293    psS32 nW;                          ///< Number of terms in w
     294    psS32 nX;                          ///< Number of terms in x
     295    psS32 nY;                          ///< Number of terms in y
     296    psS32 nZ;                          ///< Number of terms in z
    296297    psF64 ****coeff;                   ///< Coefficients
    297298    psF64 ****coeffErr;                ///< Error in coefficients
    … …  
    305306 */
    306307psDPolynomial1D* psDPolynomial1DAlloc(
    307     psS32 n,                              ///< Number of terms
    308     psPolynomialType type                ///< Polynomial Type
     308    psS32 n,                           ///< Number of terms
     309    psPolynomialType type              ///< Polynomial Type
    309310);
    310311
    … …  
    314315 */
    315316psDPolynomial2D* psDPolynomial2DAlloc(
    316     psS32 nX,                           ///< Number of terms in x
    317     psS32 nY,                           ///< Number of terms in y
     317    psS32 nX,                          ///< Number of terms in x
     318    psS32 nY,                          ///< Number of terms in y
    318319    psPolynomialType type              ///< Polynomial Type
    319320);
    … …  
    324325 */
    325326psDPolynomial3D* psDPolynomial3DAlloc(
    326     psS32 nX,                           ///< Number of terms in x
    327     psS32 nY,                           ///< Number of terms in y
    328     psS32 nZ,                           ///< Number of terms in z
     327    psS32 nX,                          ///< Number of terms in x
     328    psS32 nY,                          ///< Number of terms in y
     329    psS32 nZ,                          ///< Number of terms in z
    329330    psPolynomialType type              ///< Polynomial Type
    330331);
    … …  
    335336 */
    336337psDPolynomial4D* psDPolynomial4DAlloc(
    337     psS32 nW,                           ///< Number of terms in w
    338     psS32 nX,                           ///< Number of terms in x
    339     psS32 nY,                           ///< Number of terms in y
    340     psS32 nZ,                           ///< Number of terms in z
     338    psS32 nW,                          ///< Number of terms in w
     339    psS32 nX,                          ///< Number of terms in x
     340    psS32 nY,                          ///< Number of terms in y
     341    psS32 nZ,                          ///< Number of terms in z
    341342    psPolynomialType type              ///< Polynomial Type
    342343);
    … …  
    348349psF64 psDPolynomial1DEval(
    349350    const psDPolynomial1D* myPoly,     ///< Coefficients for the polynomial
    350     psF64 x                             ///< Value at which to evaluate
     351    psF64 x                            ///< Value at which to evaluate
    351352);
    352353
    … …  
    357358psF64 psDPolynomial2DEval(
    358359    const psDPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    359     psF64 x,                             ///< Value x at which to evaluate
    360     psF64 y                              ///< Value y at which to evaluate
     360    psF64 x,                            ///< Value x at which to evaluate
     361    psF64 y                             ///< Value y at which to evaluate
    361362);
    362363
    363364/** Evaluates a double-precision 3-D polynomial at specific coordinates.
    364365 *
    365  *  @return psF32    result of polynomial at given location
     366 *  @return psF64    result of polynomial at given location
    366367 */
    367368psF64 psDPolynomial3DEval(
    368369    const psDPolynomial3D* myPoly,     ///< Coefficients for the polynomial
    369     psF64 x,                            ///< Value x at which to evaluate
    370     psF64 y,                            ///< Value y at which to evaluate
    371     psF64 z                             ///< Value z at which to evaluate
     370    psF64 x,                           ///< Value x at which to evaluate
     371    psF64 y,                           ///< Value y at which to evaluate
     372    psF64 z                            ///< Value z at which to evaluate
    372373);
    373374
    374375/** Evaluates a double-precision 4-D polynomial at specific coordinates.
    375376 *
    376  *  @return psF32    result of polynomial at given location
     377 *  @return psF64    result of polynomial at given location
    377378 */
    378379psF64 psDPolynomial4DEval(
    379380    const psDPolynomial4D* myPoly,     ///< Coefficients for the polynomial
    380     psF64 w,                            ///< Value w at which to evaluate
    381     psF64 x,                            ///< Value x at which to evaluate
    382     psF64 y,                            ///< Value y at which to evaluate
    383     psF64 z                             ///< Value z at which to evaluate
     381    psF64 w,                           ///< Value w at which to evaluate
     382    psF64 x,                           ///< Value x at which to evaluate
     383    psF64 y,                           ///< Value y at which to evaluate
     384    psF64 z                            ///< Value z at which to evaluate
    384385);
    385386
    … …  
    390391psVector *psDPolynomial1DEvalVector(
    391392    const psDPolynomial1D *myPoly,     ///< Coefficients for the polynomial
    392     const psVector *x                   ///< x locations at which to evaluate
     393    const psVector *x                  ///< x locations at which to evaluate
    393394);
    394395
    … …  
    399400psVector *psDPolynomial2DEvalVector(
    400401    const psDPolynomial2D *myPoly,     ///< Coefficients for the polynomial
    401     const psVector *x,                  ///< x locations at which to evaluate
    402     const psVector *y                   ///< y locations at which to evaluate
     402    const psVector *x,                 ///< x locations at which to evaluate
     403    const psVector *y                  ///< y locations at which to evaluate
    403404);
    404405
    … …  
    409410psVector *psDPolynomial3DEvalVector(
    410411    const psDPolynomial3D *myPoly,     ///< Coefficients for the polynomial
    411     const psVector *x,                  ///< x locations at which to evaluate
    412     const psVector *y,                  ///< y locations at which to evaluate
    413     const psVector *z                   ///< z locations at which to evaluate
     412    const psVector *x,                 ///< x locations at which to evaluate
     413    const psVector *y,                 ///< y locations at which to evaluate
     414    const psVector *z                  ///< z locations at which to evaluate
    414415);
    415416
    … …  
    420421psVector *psDPolynomial4DEvalVector(
    421422    const psDPolynomial4D *myPoly,     ///< Coefficients for the polynomial
    422     const psVector *w,                  ///< w locations at which to evaluate
    423     const psVector *x,                  ///< x locations at which to evaluate
    424     const psVector *y,                  ///< y locations at which to evaluate
    425     const psVector *z                   ///< z locations at which to evaluate
     423    const psVector *w,                 ///< w locations at which to evaluate
     424    const psVector *x,                 ///< x locations at which to evaluate
     425    const psVector *y,                 ///< y locations at which to evaluate
     426    const psVector *z                  ///< z locations at which to evaluate
    426427);
    427428
    … …  
    429430typedef struct
    430431{
    431     psS32 n;                            ///< The number of spline polynomials
     432    psS32 n;                           ///< The number of spline polynomials
    432433    psPolynomial1D **spline;           ///< An array of n pointers to the spline polynomials
    433434    psF32 *p_psDeriv2;                 ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
    … …  
    444445 *  @return psSpline1D*    new 1-D spline struct
    445446 */
    446 psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
    447                             int order,           ///< Order of spline polynomials
    448                             float min,           ///< Lower boundary value of spline polynomials
    449                             float max);          ///< Upper boundary value of spline polynomials
     447psSpline1D *psSpline1DAlloc(
     448    int n,                             ///< Number of spline polynomials
     449    int order,                         ///< Order of spline polynomials
     450    float min,                         ///< Lower boundary value of spline polynomials
     451    float max                          ///< Upper boundary value of spline polynomials
     452);
    450453
    451454/** Allocates a psSpline1D structure
    … …  
    455458 *  @return psSpline1D*    new 1-D spline struct
    456459 */
    457 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    int order);               ///< Order of spline polynomials
     460psSpline1D *psSpline1DAllocGeneric(
     461    const psVector *bounds,            ///< Bounds for spline polynomials
     462    int order                          ///< Order of spline polynomials
     463);
    459464
    460465/** Evaluates 1-D spline polynomials at a specific coordinate.
    … …  
    481486 *  @return psS32    corresponding index number of specified value
    482487 */
    483 psS32 p_psVectorBinDisect(psVector *bins,        ///< Array of non-decreasing values
    484                           psScalar *x);          ///< Target value to find
     488psS32 p_psVectorBinDisect(
     489    psVector *bins,                    ///< Array of non-decreasing values
     490    psScalar *x                        ///< Target value to find
     491);
    485492
    486493/** Interpolates a series of data points for evaluation at a specific coordinate.  Uses a
    … …  
    489496 *  @return psScalar*    Lagrange interpolation value at given location
    490497 */
    491 psScalar *p_psVectorInterpolate(psVector *domain,     ///< Domain (x coords) for interpolation
    492                                 psVector *range,      ///< Range (y coords) for interpolation
    493                                 psS32 order,          ///< Order of interpolation function
    494                                 psScalar *x);         ///< Location at which to evaluate
     498psScalar *p_psVectorInterpolate(
     499    psVector *domain,                  ///< Domain (x coords) for interpolation
     500    psVector *range,                   ///< Range (y coords) for interpolation
     501    psS32 order,                       ///< Order of interpolation function
     502    psScalar *x                        ///< Location at which to evaluate
     503);
    495504
    496505#if 0

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

    r4392 r4405  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-25 02:02:05 $
     9 *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-28 00:53:53 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    12321232}
    12331233
    1234 psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x)
    1235 {
    1236     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1237 
    1238     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1239         return(ordPolynomial1DEval(x, myPoly));
    1240     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1241         return(chebPolynomial1DEval(x, myPoly));
     1234psF64 psPolynomial1DEval(const psPolynomial1D* poly, psF64 x)
     1235{
     1236    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1237
     1238    if (poly->type == PS_POLYNOMIAL_ORD) {
     1239        return(ordPolynomial1DEval(x, poly));
     1240    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1241        return(chebPolynomial1DEval(x, poly));
    12421242    } else {
    12431243        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12441244                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1245                 myPoly->type);
     1245                poly->type);
    12461246    }
    12471247    return(NAN);
    12481248}
    12491249
    1250 psVector *psPolynomial1DEvalVector(const psPolynomial1D *myPoly,
     1250psVector *psPolynomial1DEvalVector(const psPolynomial1D *poly,
    12511251                                   const psVector *x)
    12521252{
    1253     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1253    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12541254    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12551255    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    12591259    tmp = psVectorAlloc(x->n, PS_TYPE_F32);
    12601260    for (psS32 i=0;i<x->n;i++) {
    1261         tmp->data.F32[i] = psPolynomial1DEval(myPoly, x->data.F32[i]);
     1261        tmp->data.F32[i] = psPolynomial1DEval(poly, x->data.F32[i]);
    12621262    }
    12631263
    … …  
    12651265}
    12661266
    1267 psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y)
    1268 {
    1269     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1270 
    1271     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1272         return(ordPolynomial2DEval(x, y, myPoly));
    1273     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1274         return(chebPolynomial2DEval(x, y, myPoly));
     1267psF64 psPolynomial2DEval(const psPolynomial2D* poly, psF64 x, psF64 y)
     1268{
     1269    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1270
     1271    if (poly->type == PS_POLYNOMIAL_ORD) {
     1272        return(ordPolynomial2DEval(x, y, poly));
     1273    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1274        return(chebPolynomial2DEval(x, y, poly));
    12751275    } else {
    12761276        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12771277                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1278                 myPoly->type);
     1278                poly->type);
    12791279    }
    12801280    return(NAN);
    12811281}
    12821282
    1283 psVector *psPolynomial2DEvalVector(const psPolynomial2D *myPoly,
     1283psVector *psPolynomial2DEvalVector(const psPolynomial2D *poly,
    12841284                                   const psVector *x,
    12851285                                   const psVector *y)
    12861286
    12871287{
    1288     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1288    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12891289    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12901290    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13051305    // Evaluate the polynomial at the specified points
    13061306    for (psS32 i=0; i<vecLen; i++) {
    1307         tmp->data.F32[i] = psPolynomial2DEval(myPoly,x->data.F32[i],y->data.F32[i]);
     1307        tmp->data.F32[i] = psPolynomial2DEval(poly,x->data.F32[i],y->data.F32[i]);
    13081308    }
    13091309
    … …  
    13121312}
    13131313
    1314 psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z)
    1315 {
    1316     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1317 
    1318     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1319         return(ordPolynomial3DEval(x, y, z, myPoly));
    1320     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1321         return(chebPolynomial3DEval(x, y, z, myPoly));
     1314psF64 psPolynomial3DEval(const psPolynomial3D* poly, psF64 x, psF64 y, psF64 z)
     1315{
     1316    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1317
     1318    if (poly->type == PS_POLYNOMIAL_ORD) {
     1319        return(ordPolynomial3DEval(x, y, z, poly));
     1320    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1321        return(chebPolynomial3DEval(x, y, z, poly));
    13221322    } else {
    13231323        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13241324                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1325                 myPoly->type);
     1325                poly->type);
    13261326    }
    13271327    return(NAN);
    13281328}
    13291329
    1330 psVector *psPolynomial3DEvalVector(const psPolynomial3D *myPoly,
     1330psVector *psPolynomial3DEvalVector(const psPolynomial3D *poly,
    13311331                                   const psVector *x,
    13321332                                   const psVector *y,
    … …  
    13341334
    13351335{
    1336     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1336    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13371337    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13381338    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13581358    // Evaluate polynomial
    13591359    for (psS32 i = 0; i < vecLen; i++) {
    1360         tmp->data.F32[i] = psPolynomial3DEval(myPoly,
     1360        tmp->data.F32[i] = psPolynomial3DEval(poly,
    13611361                                              x->data.F32[i],
    13621362                                              y->data.F32[i],
    … …  
    13681368}
    13691369
    1370 psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z)
    1371 {
    1372     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1373 
    1374     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1375         return(ordPolynomial4DEval(w,x,y,z, myPoly));
    1376     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1377         return(chebPolynomial4DEval(w,x,y,z, myPoly));
     1370psF64 psPolynomial4DEval(const psPolynomial4D* poly, psF64 x, psF64 y, psF64 z, psF64 t)
     1371{
     1372    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1373
     1374    if (poly->type == PS_POLYNOMIAL_ORD) {
     1375        return(ordPolynomial4DEval(x,y,z,t, poly));
     1376    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1377        return(chebPolynomial4DEval(x,y,z,t, poly));
    13781378    } else {
    13791379        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13801380                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1381                 myPoly->type);
     1381                poly->type);
    13821382    }
    13831383    return(NAN);
    13841384}
    13851385
    1386 psVector *psPolynomial4DEvalVector(const psPolynomial4D *myPoly,
    1387                                    const psVector *w,
     1386psVector *psPolynomial4DEvalVector(const psPolynomial4D *poly,
    13881387                                   const psVector *x,
    13891388                                   const psVector *y,
    1390                                    const psVector *z)
    1391 {
    1392     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
    1393     PS_ASSERT_VECTOR_NON_NULL(w, NULL);
    1394     PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL);
     1389                                   const psVector *z,
     1390                                   const psVector *t)
     1391{
     1392    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13951393    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13961394    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13991397    PS_ASSERT_VECTOR_NON_NULL(z, NULL);
    14001398    PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL);
     1399    PS_ASSERT_VECTOR_NON_NULL(t, NULL);
     1400    PS_ASSERT_VECTOR_TYPE(t, PS_TYPE_F32, NULL);
    14011401
    14021402    psVector *tmp;
    1403     psS32 vecLen=w->n;
     1403    psS32 vecLen=x->n;
    14041404
    14051405    // Determine output vector size from min of input vectors
     1406    if (z->n < vecLen) {
     1407        vecLen = z->n;
     1408    }
    14061409    if (y->n < vecLen) {
    14071410        vecLen = y->n;
    14081411    }
    1409     if (x->n < vecLen) {
    1410         vecLen = x->n;
    1411     }
    1412     if (z->n < vecLen) {
    1413         vecLen = z->n;
     1412    if (t->n < vecLen) {
     1413        vecLen = t->n;
    14141414    }
    14151415
    … …  
    14191419    // Evaluate polynomial
    14201420    for (psS32 i = 0; i < vecLen; i++) {
    1421         tmp->data.F32[i] = psPolynomial4DEval(myPoly,
    1422                                               w->data.F32[i],
     1421        tmp->data.F32[i] = psPolynomial4DEval(poly,
    14231422                                              x->data.F32[i],
    14241423                                              y->data.F32[i],
    1425                                               z->data.F32[i]);
     1424                                              z->data.F32[i],
     1425                                              t->data.F32[i]);
    14261426    }
    14271427

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

    r4330 r4405  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-21 03:01:37 $
     14 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-28 00:53:53 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    PS_POLYNOMIAL_ORD,                 ///< Ordinary Polynomial
    6868    PS_POLYNOMIAL_CHEB                 ///< Chebyshev Polynomial
    69 } psPolynomialType;
     69}
     70psPolynomialType;
    7071
    7172/** One-dimensional polynomial */
    … …  
    7374{
    7475    psPolynomialType type;             ///< Polynomial type
    75     psS32 n;                             ///< Number of terms
     76    psS32 n;                           ///< Number of terms
    7677    psF32 *coeff;                      ///< Coefficients
    7778    psF32 *coeffErr;                   ///< Error in coefficients
    … …  
    8485{
    8586    psPolynomialType type;             ///< Polynomial type
    86     psS32 nX;                            ///< Number of terms in x
    87     psS32 nY;                            ///< Number of terms in y
     87    psS32 nX;                          ///< Number of terms in x
     88    psS32 nY;                          ///< Number of terms in y
    8889    psF32 **coeff;                     ///< Coefficients
    8990    psF32 **coeffErr;                  ///< Error in coefficients
    … …  
    9697{
    9798    psPolynomialType type;             ///< Polynomial type
    98     psS32 nX;                            ///< Number of terms in x
    99     psS32 nY;                            ///< Number of terms in y
    100     psS32 nZ;                            ///< Number of terms in z
     99    psS32 nX;                          ///< Number of terms in x
     100    psS32 nY;                          ///< Number of terms in y
     101    psS32 nZ;                          ///< Number of terms in z
    101102    psF32 ***coeff;                    ///< Coefficients
    102103    psF32 ***coeffErr;                 ///< Error in coefficients
    … …  
    109110{
    110111    psPolynomialType type;             ///< Polynomial type
    111     psS32 nW;                            ///< Number of terms in w
    112     psS32 nX;                            ///< Number of terms in x
    113     psS32 nY;                            ///< Number of terms in y
    114     psS32 nZ;                            ///< Number of terms in z
     112    psS32 nW;                          ///< Number of terms in w
     113    psS32 nX;                          ///< Number of terms in x
     114    psS32 nY;                          ///< Number of terms in y
     115    psS32 nZ;                          ///< Number of terms in z
    115116    psF32 ****coeff;                   ///< Coefficients
    116117    psF32 ****coeffErr;                ///< Error in coefficients
    … …  
    125126 */
    126127psPolynomial1D* psPolynomial1DAlloc(
    127     psS32 n,                            ///< Number of terms
     128    psS32 n,                           ///< Number of terms
    128129    psPolynomialType type              ///< Polynomial Type
    129130);
    … …  
    134135 */
    135136psPolynomial2D* psPolynomial2DAlloc(
    136     psS32 nX,                           ///< Number of terms in x
    137     psS32 nY,                           ///< Number of terms in y
     137    psS32 nX,                          ///< Number of terms in x
     138    psS32 nY,                          ///< Number of terms in y
    138139    psPolynomialType type              ///< Polynomial Type
    139140);
    … …  
    144145 */
    145146psPolynomial3D* psPolynomial3DAlloc(
    146     psS32 nX,                           ///< Number of terms in x
    147     psS32 nY,                           ///< Number of terms in y
    148     psS32 nZ,                           ///< Number of terms in z
     147    psS32 nX,                          ///< Number of terms in x
     148    psS32 nY,                          ///< Number of terms in y
     149    psS32 nZ,                          ///< Number of terms in z
    149150    psPolynomialType type              ///< Polynomial Type
    150151);
    … …  
    155156 */
    156157psPolynomial4D* psPolynomial4DAlloc(
    157     psS32 nW,                           ///< Number of terms in w
    158     psS32 nX,                           ///< Number of terms in x
    159     psS32 nY,                           ///< Number of terms in y
    160     psS32 nZ,                           ///< Number of terms in z
     158    psS32 nW,                          ///< Number of terms in w
     159    psS32 nX,                          ///< Number of terms in x
     160    psS32 nY,                          ///< Number of terms in y
     161    psS32 nZ,                          ///< Number of terms in z
    161162    psPolynomialType type              ///< Polynomial Type
    162163);
    … …  
    164165/** Evaluates a 1-D polynomial at specific coordinates.
    165166 *
    166  *  @return psF32    result of polynomial at given location
    167  */
    168 psF32 psPolynomial1DEval(
    169     const psPolynomial1D* myPoly,      ///< Coefficients for the polynomial
    170     psF32 x                            ///< location at which to evaluate
     167 *  @return psF64    result of polynomial at given location
     168 */
     169psF64 psPolynomial1DEval(
     170    const psPolynomial1D* poly,        ///< Coefficients for the polynomial
     171    psF64 x                            ///< location at which to evaluate
    171172);
    172173
    173174/** Evaluates a 2-D polynomial at specific coordinates.
    174175 *
    175  *  @return psF32    result of polynomial at given location
    176  */
    177 psF32 psPolynomial2DEval(
    178     const psPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    179     psF32 x,                            ///< x location at which to evaluate
    180     psF32 y                             ///< y location at which to evaluate
     176 *  @return psF64    result of polynomial at given location
     177 */
     178psF64 psPolynomial2DEval(
     179    const psPolynomial2D* poly,         ///< Coefficients for the polynomial
     180    psF64 x,                            ///< x location at which to evaluate
     181    psF64 y                             ///< y location at which to evaluate
    181182);
    182183
    183184/** Evaluates a 3-D polynomial at specific coordinates.
    184185 *
    185  *  @return psF32    result of polynomial at given location
    186  */
    187 psF32 psPolynomial3DEval(
    188     const psPolynomial3D* myPoly,      ///< Coefficients for the polynomial
    189     psF32 x,                            ///< x location at which to evaluate
    190     psF32 y,                            ///< y location at which to evaluate
    191     psF32 z                             ///< z location at which to evaluate
     186 *  @return psF64    result of polynomial at given location
     187 */
     188psF64 psPolynomial3DEval(
     189    const psPolynomial3D* poly,        ///< Coefficients for the polynomial
     190    psF64 x,                           ///< x location at which to evaluate
     191    psF64 y,                           ///< y location at which to evaluate
     192    psF64 z                            ///< z location at which to evaluate
    192193);
    193194
    194195/** Evaluates a 4-D polynomial at specific coordinates.
    195196 *
    196  *  @return psF32    result of polynomial at given location
    197  */
    198 psF32 psPolynomial4DEval(
    199     const psPolynomial4D* myPoly,      ///< Coefficients for the polynomial
    200     psF32 w,                            ///< w location at which to evaluate
    201     psF32 x,                            ///< x location at which to evaluate
    202     psF32 y,                            ///< y location at which to evaluate
    203     psF32 z                             ///< z location at which to evaluate
     197 *  @return psF64    result of polynomial at given location
     198 */
     199psF64 psPolynomial4DEval(
     200    const psPolynomial4D* poly,        ///< Coefficients for the polynomial
     201    psF64 x,                           ///< x location at which to evaluate
     202    psF64 y,                           ///< y location at which to evaluate
     203    psF64 z,                           ///< z location at which to evaluate
     204    psF64 t                            ///< t location at which to evaluate
    204205);
    205206
    … …  
    209210 */
    210211psVector *psPolynomial1DEvalVector(
    211     const psPolynomial1D *myPoly,      ///< Coefficients for the polynomial
    212     const psVector *x                   ///< x locations at which to evaluate
     212    const psPolynomial1D *poly,        ///< Coefficients for the polynomial
     213    const psVector *x                  ///< x locations at which to evaluate
    213214);
    214215
    … …  
    218219 */
    219220psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221     const psVector *x,                  ///< x locations at which to evaluate
    222     const psVector *y                   ///< y locations at which to evaluate
     221    const psPolynomial2D *poly,        ///< Coefficients for the polynomial
     222    const psVector *x,                 ///< x locations at which to evaluate
     223    const psVector *y                  ///< y locations at which to evaluate
    223224);
    224225
    … …  
    228229 */
    229230psVector *psPolynomial3DEvalVector(
    230     const psPolynomial3D *myPoly,      ///< Coefficients for the polynomial
    231     const psVector *x,                  ///< x locations at which to evaluate
    232     const psVector *y,                  ///< y locations at which to evaluate
    233     const psVector *z                   ///< z locations at which to evaluate
     231    const psPolynomial3D *poly,        ///< Coefficients for the polynomial
     232    const psVector *x,                 ///< x locations at which to evaluate
     233    const psVector *y,                 ///< y locations at which to evaluate
     234    const psVector *z                  ///< z locations at which to evaluate
    234235);
    235236
    … …  
    239240 */
    240241psVector *psPolynomial4DEvalVector(
    241     const psPolynomial4D *myPoly,      ///< Coefficients for the polynomial
    242     const psVector *w,                  ///< w locations at which to evaluate
    243     const psVector *x,                  ///< x locations at which to evaluate
    244     const psVector *y,                  ///< y locations at which to evaluate
    245     const psVector *z                   ///< z locations at which to evaluate
     242    const psPolynomial4D *poly,        ///< Coefficients for the polynomial
     243    const psVector *x,                 ///< x locations at which to evaluate
     244    const psVector *y,                 ///< y locations at which to evaluate
     245    const psVector *z,                 ///< z locations at which to evaluate
     246    const psVector *t                  ///< t locations at which to evaluate
    246247);
    247248
    … …  
    254255{
    255256    psPolynomialType type;             ///< Polynomial type
    256     psS32 n;                            ///< Number of terms
     257    psS32 n;                           ///< Number of terms
    257258    psF64 *coeff;                      ///< Coefficients
    258259    psF64 *coeffErr;                   ///< Error in coefficients
    … …  
    265266{
    266267    psPolynomialType type;             ///< Polynomial type
    267     psS32 nX;                           ///< Number of terms in x
    268     psS32 nY;                           ///< Number of terms in y
     268    psS32 nX;                          ///< Number of terms in x
     269    psS32 nY;                          ///< Number of terms in y
    269270    psF64 **coeff;                     ///< Coefficients
    270271    psF64 **coeffErr;                  ///< Error in coefficients
    … …  
    277278{
    278279    psPolynomialType type;             ///< Polynomial type
    279     psS32 nX;                           ///< Number of terms in x
    280     psS32 nY;                           ///< Number of terms in y
    281     psS32 nZ;                           ///< Number of terms in z
     280    psS32 nX;                          ///< Number of terms in x
     281    psS32 nY;                          ///< Number of terms in y
     282    psS32 nZ;                          ///< Number of terms in z
    282283    psF64 ***coeff;                    ///< Coefficients
    283284    psF64 ***coeffErr;                 ///< Error in coefficients
    … …  
    290291{
    291292    psPolynomialType type;             ///< Polynomial type
    292     psS32 nW;                           ///< Number of terms in w
    293     psS32 nX;                           ///< Number of terms in x
    294     psS32 nY;                           ///< Number of terms in y
    295     psS32 nZ;                           ///< Number of terms in z
     293    psS32 nW;                          ///< Number of terms in w
     294    psS32 nX;                          ///< Number of terms in x
     295    psS32 nY;                          ///< Number of terms in y
     296    psS32 nZ;                          ///< Number of terms in z
    296297    psF64 ****coeff;                   ///< Coefficients
    297298    psF64 ****coeffErr;                ///< Error in coefficients
    … …  
    305306 */
    306307psDPolynomial1D* psDPolynomial1DAlloc(
    307     psS32 n,                              ///< Number of terms
    308     psPolynomialType type                ///< Polynomial Type
     308    psS32 n,                           ///< Number of terms
     309    psPolynomialType type              ///< Polynomial Type
    309310);
    310311
    … …  
    314315 */
    315316psDPolynomial2D* psDPolynomial2DAlloc(
    316     psS32 nX,                           ///< Number of terms in x
    317     psS32 nY,                           ///< Number of terms in y
     317    psS32 nX,                          ///< Number of terms in x
     318    psS32 nY,                          ///< Number of terms in y
    318319    psPolynomialType type              ///< Polynomial Type
    319320);
    … …  
    324325 */
    325326psDPolynomial3D* psDPolynomial3DAlloc(
    326     psS32 nX,                           ///< Number of terms in x
    327     psS32 nY,                           ///< Number of terms in y
    328     psS32 nZ,                           ///< Number of terms in z
     327    psS32 nX,                          ///< Number of terms in x
     328    psS32 nY,                          ///< Number of terms in y
     329    psS32 nZ,                          ///< Number of terms in z
    329330    psPolynomialType type              ///< Polynomial Type
    330331);
    … …  
    335336 */
    336337psDPolynomial4D* psDPolynomial4DAlloc(
    337     psS32 nW,                           ///< Number of terms in w
    338     psS32 nX,                           ///< Number of terms in x
    339     psS32 nY,                           ///< Number of terms in y
    340     psS32 nZ,                           ///< Number of terms in z
     338    psS32 nW,                          ///< Number of terms in w
     339    psS32 nX,                          ///< Number of terms in x
     340    psS32 nY,                          ///< Number of terms in y
     341    psS32 nZ,                          ///< Number of terms in z
    341342    psPolynomialType type              ///< Polynomial Type
    342343);
    … …  
    348349psF64 psDPolynomial1DEval(
    349350    const psDPolynomial1D* myPoly,     ///< Coefficients for the polynomial
    350     psF64 x                             ///< Value at which to evaluate
     351    psF64 x                            ///< Value at which to evaluate
    351352);
    352353
    … …  
    357358psF64 psDPolynomial2DEval(
    358359    const psDPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    359     psF64 x,                             ///< Value x at which to evaluate
    360     psF64 y                              ///< Value y at which to evaluate
     360    psF64 x,                            ///< Value x at which to evaluate
     361    psF64 y                             ///< Value y at which to evaluate
    361362);
    362363
    363364/** Evaluates a double-precision 3-D polynomial at specific coordinates.
    364365 *
    365  *  @return psF32    result of polynomial at given location
     366 *  @return psF64    result of polynomial at given location
    366367 */
    367368psF64 psDPolynomial3DEval(
    368369    const psDPolynomial3D* myPoly,     ///< Coefficients for the polynomial
    369     psF64 x,                            ///< Value x at which to evaluate
    370     psF64 y,                            ///< Value y at which to evaluate
    371     psF64 z                             ///< Value z at which to evaluate
     370    psF64 x,                           ///< Value x at which to evaluate
     371    psF64 y,                           ///< Value y at which to evaluate
     372    psF64 z                            ///< Value z at which to evaluate
    372373);
    373374
    374375/** Evaluates a double-precision 4-D polynomial at specific coordinates.
    375376 *
    376  *  @return psF32    result of polynomial at given location
     377 *  @return psF64    result of polynomial at given location
    377378 */
    378379psF64 psDPolynomial4DEval(
    379380    const psDPolynomial4D* myPoly,     ///< Coefficients for the polynomial
    380     psF64 w,                            ///< Value w at which to evaluate
    381     psF64 x,                            ///< Value x at which to evaluate
    382     psF64 y,                            ///< Value y at which to evaluate
    383     psF64 z                             ///< Value z at which to evaluate
     381    psF64 w,                           ///< Value w at which to evaluate
     382    psF64 x,                           ///< Value x at which to evaluate
     383    psF64 y,                           ///< Value y at which to evaluate
     384    psF64 z                            ///< Value z at which to evaluate
    384385);
    385386
    … …  
    390391psVector *psDPolynomial1DEvalVector(
    391392    const psDPolynomial1D *myPoly,     ///< Coefficients for the polynomial
    392     const psVector *x                   ///< x locations at which to evaluate
     393    const psVector *x                  ///< x locations at which to evaluate
    393394);
    394395
    … …  
    399400psVector *psDPolynomial2DEvalVector(
    400401    const psDPolynomial2D *myPoly,     ///< Coefficients for the polynomial
    401     const psVector *x,                  ///< x locations at which to evaluate
    402     const psVector *y                   ///< y locations at which to evaluate
     402    const psVector *x,                 ///< x locations at which to evaluate
     403    const psVector *y                  ///< y locations at which to evaluate
    403404);
    404405
    … …  
    409410psVector *psDPolynomial3DEvalVector(
    410411    const psDPolynomial3D *myPoly,     ///< Coefficients for the polynomial
    411     const psVector *x,                  ///< x locations at which to evaluate
    412     const psVector *y,                  ///< y locations at which to evaluate
    413     const psVector *z                   ///< z locations at which to evaluate
     412    const psVector *x,                 ///< x locations at which to evaluate
     413    const psVector *y,                 ///< y locations at which to evaluate
     414    const psVector *z                  ///< z locations at which to evaluate
    414415);
    415416
    … …  
    420421psVector *psDPolynomial4DEvalVector(
    421422    const psDPolynomial4D *myPoly,     ///< Coefficients for the polynomial
    422     const psVector *w,                  ///< w locations at which to evaluate
    423     const psVector *x,                  ///< x locations at which to evaluate
    424     const psVector *y,                  ///< y locations at which to evaluate
    425     const psVector *z                   ///< z locations at which to evaluate
     423    const psVector *w,                 ///< w locations at which to evaluate
     424    const psVector *x,                 ///< x locations at which to evaluate
     425    const psVector *y,                 ///< y locations at which to evaluate
     426    const psVector *z                  ///< z locations at which to evaluate
    426427);
    427428
    … …  
    429430typedef struct
    430431{
    431     psS32 n;                            ///< The number of spline polynomials
     432    psS32 n;                           ///< The number of spline polynomials
    432433    psPolynomial1D **spline;           ///< An array of n pointers to the spline polynomials
    433434    psF32 *p_psDeriv2;                 ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
    … …  
    444445 *  @return psSpline1D*    new 1-D spline struct
    445446 */
    446 psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
    447                             int order,           ///< Order of spline polynomials
    448                             float min,           ///< Lower boundary value of spline polynomials
    449                             float max);          ///< Upper boundary value of spline polynomials
     447psSpline1D *psSpline1DAlloc(
     448    int n,                             ///< Number of spline polynomials
     449    int order,                         ///< Order of spline polynomials
     450    float min,                         ///< Lower boundary value of spline polynomials
     451    float max                          ///< Upper boundary value of spline polynomials
     452);
    450453
    451454/** Allocates a psSpline1D structure
    … …  
    455458 *  @return psSpline1D*    new 1-D spline struct
    456459 */
    457 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    int order);               ///< Order of spline polynomials
     460psSpline1D *psSpline1DAllocGeneric(
     461    const psVector *bounds,            ///< Bounds for spline polynomials
     462    int order                          ///< Order of spline polynomials
     463);
    459464
    460465/** Evaluates 1-D spline polynomials at a specific coordinate.
    … …  
    481486 *  @return psS32    corresponding index number of specified value
    482487 */
    483 psS32 p_psVectorBinDisect(psVector *bins,        ///< Array of non-decreasing values
    484                           psScalar *x);          ///< Target value to find
     488psS32 p_psVectorBinDisect(
     489    psVector *bins,                    ///< Array of non-decreasing values
     490    psScalar *x                        ///< Target value to find
     491);
    485492
    486493/** Interpolates a series of data points for evaluation at a specific coordinate.  Uses a
    … …  
    489496 *  @return psScalar*    Lagrange interpolation value at given location
    490497 */
    491 psScalar *p_psVectorInterpolate(psVector *domain,     ///< Domain (x coords) for interpolation
    492                                 psVector *range,      ///< Range (y coords) for interpolation
    493                                 psS32 order,          ///< Order of interpolation function
    494                                 psScalar *x);         ///< Location at which to evaluate
     498psScalar *p_psVectorInterpolate(
     499    psVector *domain,                  ///< Domain (x coords) for interpolation
     500    psVector *range,                   ///< Range (y coords) for interpolation
     501    psS32 order,                       ///< Order of interpolation function
     502    psScalar *x                        ///< Location at which to evaluate
     503);
    495504
    496505#if 0

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

    r4392 r4405  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-25 02:02:05 $
     9 *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-28 00:53:53 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    12321232}
    12331233
    1234 psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x)
    1235 {
    1236     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1237 
    1238     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1239         return(ordPolynomial1DEval(x, myPoly));
    1240     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1241         return(chebPolynomial1DEval(x, myPoly));
     1234psF64 psPolynomial1DEval(const psPolynomial1D* poly, psF64 x)
     1235{
     1236    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1237
     1238    if (poly->type == PS_POLYNOMIAL_ORD) {
     1239        return(ordPolynomial1DEval(x, poly));
     1240    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1241        return(chebPolynomial1DEval(x, poly));
    12421242    } else {
    12431243        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12441244                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1245                 myPoly->type);
     1245                poly->type);
    12461246    }
    12471247    return(NAN);
    12481248}
    12491249
    1250 psVector *psPolynomial1DEvalVector(const psPolynomial1D *myPoly,
     1250psVector *psPolynomial1DEvalVector(const psPolynomial1D *poly,
    12511251                                   const psVector *x)
    12521252{
    1253     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1253    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12541254    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12551255    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    12591259    tmp = psVectorAlloc(x->n, PS_TYPE_F32);
    12601260    for (psS32 i=0;i<x->n;i++) {
    1261         tmp->data.F32[i] = psPolynomial1DEval(myPoly, x->data.F32[i]);
     1261        tmp->data.F32[i] = psPolynomial1DEval(poly, x->data.F32[i]);
    12621262    }
    12631263
    … …  
    12651265}
    12661266
    1267 psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y)
    1268 {
    1269     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1270 
    1271     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1272         return(ordPolynomial2DEval(x, y, myPoly));
    1273     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1274         return(chebPolynomial2DEval(x, y, myPoly));
     1267psF64 psPolynomial2DEval(const psPolynomial2D* poly, psF64 x, psF64 y)
     1268{
     1269    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1270
     1271    if (poly->type == PS_POLYNOMIAL_ORD) {
     1272        return(ordPolynomial2DEval(x, y, poly));
     1273    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1274        return(chebPolynomial2DEval(x, y, poly));
    12751275    } else {
    12761276        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    12771277                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1278                 myPoly->type);
     1278                poly->type);
    12791279    }
    12801280    return(NAN);
    12811281}
    12821282
    1283 psVector *psPolynomial2DEvalVector(const psPolynomial2D *myPoly,
     1283psVector *psPolynomial2DEvalVector(const psPolynomial2D *poly,
    12841284                                   const psVector *x,
    12851285                                   const psVector *y)
    12861286
    12871287{
    1288     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1288    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    12891289    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    12901290    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13051305    // Evaluate the polynomial at the specified points
    13061306    for (psS32 i=0; i<vecLen; i++) {
    1307         tmp->data.F32[i] = psPolynomial2DEval(myPoly,x->data.F32[i],y->data.F32[i]);
     1307        tmp->data.F32[i] = psPolynomial2DEval(poly,x->data.F32[i],y->data.F32[i]);
    13081308    }
    13091309
    … …  
    13121312}
    13131313
    1314 psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z)
    1315 {
    1316     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1317 
    1318     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1319         return(ordPolynomial3DEval(x, y, z, myPoly));
    1320     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1321         return(chebPolynomial3DEval(x, y, z, myPoly));
     1314psF64 psPolynomial3DEval(const psPolynomial3D* poly, psF64 x, psF64 y, psF64 z)
     1315{
     1316    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1317
     1318    if (poly->type == PS_POLYNOMIAL_ORD) {
     1319        return(ordPolynomial3DEval(x, y, z, poly));
     1320    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1321        return(chebPolynomial3DEval(x, y, z, poly));
    13221322    } else {
    13231323        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13241324                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1325                 myPoly->type);
     1325                poly->type);
    13261326    }
    13271327    return(NAN);
    13281328}
    13291329
    1330 psVector *psPolynomial3DEvalVector(const psPolynomial3D *myPoly,
     1330psVector *psPolynomial3DEvalVector(const psPolynomial3D *poly,
    13311331                                   const psVector *x,
    13321332                                   const psVector *y,
    … …  
    13341334
    13351335{
    1336     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1336    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13371337    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13381338    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13581358    // Evaluate polynomial
    13591359    for (psS32 i = 0; i < vecLen; i++) {
    1360         tmp->data.F32[i] = psPolynomial3DEval(myPoly,
     1360        tmp->data.F32[i] = psPolynomial3DEval(poly,
    13611361                                              x->data.F32[i],
    13621362                                              y->data.F32[i],
    … …  
    13681368}
    13691369
    1370 psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z)
    1371 {
    1372     PS_ASSERT_POLY_NON_NULL(myPoly, NAN);
    1373 
    1374     if (myPoly->type == PS_POLYNOMIAL_ORD) {
    1375         return(ordPolynomial4DEval(w,x,y,z, myPoly));
    1376     } else if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    1377         return(chebPolynomial4DEval(w,x,y,z, myPoly));
     1370psF64 psPolynomial4DEval(const psPolynomial4D* poly, psF64 x, psF64 y, psF64 z, psF64 t)
     1371{
     1372    PS_ASSERT_POLY_NON_NULL(poly, NAN);
     1373
     1374    if (poly->type == PS_POLYNOMIAL_ORD) {
     1375        return(ordPolynomial4DEval(x,y,z,t, poly));
     1376    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
     1377        return(chebPolynomial4DEval(x,y,z,t, poly));
    13781378    } else {
    13791379        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
    13801380                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
    1381                 myPoly->type);
     1381                poly->type);
    13821382    }
    13831383    return(NAN);
    13841384}
    13851385
    1386 psVector *psPolynomial4DEvalVector(const psPolynomial4D *myPoly,
    1387                                    const psVector *w,
     1386psVector *psPolynomial4DEvalVector(const psPolynomial4D *poly,
    13881387                                   const psVector *x,
    13891388                                   const psVector *y,
    1390                                    const psVector *z)
    1391 {
    1392     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
    1393     PS_ASSERT_VECTOR_NON_NULL(w, NULL);
    1394     PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL);
     1389                                   const psVector *z,
     1390                                   const psVector *t)
     1391{
     1392    PS_ASSERT_POLY_NON_NULL(poly, NULL);
    13951393    PS_ASSERT_VECTOR_NON_NULL(x, NULL);
    13961394    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL);
    … …  
    13991397    PS_ASSERT_VECTOR_NON_NULL(z, NULL);
    14001398    PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL);
     1399    PS_ASSERT_VECTOR_NON_NULL(t, NULL);
     1400    PS_ASSERT_VECTOR_TYPE(t, PS_TYPE_F32, NULL);
    14011401
    14021402    psVector *tmp;
    1403     psS32 vecLen=w->n;
     1403    psS32 vecLen=x->n;
    14041404
    14051405    // Determine output vector size from min of input vectors
     1406    if (z->n < vecLen) {
     1407        vecLen = z->n;
     1408    }
    14061409    if (y->n < vecLen) {
    14071410        vecLen = y->n;
    14081411    }
    1409     if (x->n < vecLen) {
    1410         vecLen = x->n;
    1411     }
    1412     if (z->n < vecLen) {
    1413         vecLen = z->n;
     1412    if (t->n < vecLen) {
     1413        vecLen = t->n;
    14141414    }
    14151415
    … …  
    14191419    // Evaluate polynomial
    14201420    for (psS32 i = 0; i < vecLen; i++) {
    1421         tmp->data.F32[i] = psPolynomial4DEval(myPoly,
    1422                                               w->data.F32[i],
     1421        tmp->data.F32[i] = psPolynomial4DEval(poly,
    14231422                                              x->data.F32[i],
    14241423                                              y->data.F32[i],
    1425                                               z->data.F32[i]);
     1424                                              z->data.F32[i],
     1425                                              t->data.F32[i]);
    14261426    }
    14271427

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

    r4330 r4405  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-21 03:01:37 $
     14 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-28 00:53:53 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    PS_POLYNOMIAL_ORD,                 ///< Ordinary Polynomial
    6868    PS_POLYNOMIAL_CHEB                 ///< Chebyshev Polynomial
    69 } psPolynomialType;
     69}
     70psPolynomialType;
    7071
    7172/** One-dimensional polynomial */
    … …  
    7374{
    7475    psPolynomialType type;             ///< Polynomial type
    75     psS32 n;                             ///< Number of terms
     76    psS32 n;                           ///< Number of terms
    7677    psF32 *coeff;                      ///< Coefficients
    7778    psF32 *coeffErr;                   ///< Error in coefficients
    … …  
    8485{
    8586    psPolynomialType type;             ///< Polynomial type
    86     psS32 nX;                            ///< Number of terms in x
    87     psS32 nY;                            ///< Number of terms in y
     87    psS32 nX;                          ///< Number of terms in x
     88    psS32 nY;                          ///< Number of terms in y
    8889    psF32 **coeff;                     ///< Coefficients
    8990    psF32 **coeffErr;                  ///< Error in coefficients
    … …  
    9697{
    9798    psPolynomialType type;             ///< Polynomial type
    98     psS32 nX;                            ///< Number of terms in x
    99     psS32 nY;                            ///< Number of terms in y
    100     psS32 nZ;                            ///< Number of terms in z
     99    psS32 nX;                          ///< Number of terms in x
     100    psS32 nY;                          ///< Number of terms in y
     101    psS32 nZ;                          ///< Number of terms in z
    101102    psF32 ***coeff;                    ///< Coefficients
    102103    psF32 ***coeffErr;                 ///< Error in coefficients
    … …  
    109110{
    110111    psPolynomialType type;             ///< Polynomial type
    111     psS32 nW;                            ///< Number of terms in w
    112     psS32 nX;                            ///< Number of terms in x
    113     psS32 nY;                            ///< Number of terms in y
    114     psS32 nZ;                            ///< Number of terms in z
     112    psS32 nW;                          ///< Number of terms in w
     113    psS32 nX;                          ///< Number of terms in x
     114    psS32 nY;                          ///< Number of terms in y
     115    psS32 nZ;                          ///< Number of terms in z
    115116    psF32 ****coeff;                   ///< Coefficients
    116117    psF32 ****coeffErr;                ///< Error in coefficients
    … …  
    125126 */
    126127psPolynomial1D* psPolynomial1DAlloc(
    127     psS32 n,                            ///< Number of terms
     128    psS32 n,                           ///< Number of terms
    128129    psPolynomialType type              ///< Polynomial Type
    129130);
    … …  
    134135 */
    135136psPolynomial2D* psPolynomial2DAlloc(
    136     psS32 nX,                           ///< Number of terms in x
    137     psS32 nY,                           ///< Number of terms in y
     137    psS32 nX,                          ///< Number of terms in x
     138    psS32 nY,                          ///< Number of terms in y
    138139    psPolynomialType type              ///< Polynomial Type
    139140);
    … …  
    144145 */
    145146psPolynomial3D* psPolynomial3DAlloc(
    146     psS32 nX,                           ///< Number of terms in x
    147     psS32 nY,                           ///< Number of terms in y
    148     psS32 nZ,                           ///< Number of terms in z
     147    psS32 nX,                          ///< Number of terms in x
     148    psS32 nY,                          ///< Number of terms in y
     149    psS32 nZ,                          ///< Number of terms in z
    149150    psPolynomialType type              ///< Polynomial Type
    150151);
    … …  
    155156 */
    156157psPolynomial4D* psPolynomial4DAlloc(
    157     psS32 nW,                           ///< Number of terms in w
    158     psS32 nX,                           ///< Number of terms in x
    159     psS32 nY,                           ///< Number of terms in y
    160     psS32 nZ,                           ///< Number of terms in z
     158    psS32 nW,                          ///< Number of terms in w
     159    psS32 nX,                          ///< Number of terms in x
     160    psS32 nY,                          ///< Number of terms in y
     161    psS32 nZ,                          ///< Number of terms in z
    161162    psPolynomialType type              ///< Polynomial Type
    162163);
    … …  
    164165/** Evaluates a 1-D polynomial at specific coordinates.
    165166 *
    166  *  @return psF32    result of polynomial at given location
    167  */
    168 psF32 psPolynomial1DEval(
    169     const psPolynomial1D* myPoly,      ///< Coefficients for the polynomial
    170     psF32 x                            ///< location at which to evaluate
     167 *  @return psF64    result of polynomial at given location
     168 */
     169psF64 psPolynomial1DEval(
     170    const psPolynomial1D* poly,        ///< Coefficients for the polynomial
     171    psF64 x                            ///< location at which to evaluate
    171172);
    172173
    173174/** Evaluates a 2-D polynomial at specific coordinates.
    174175 *
    175  *  @return psF32    result of polynomial at given location
    176  */
    177 psF32 psPolynomial2DEval(
    178     const psPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    179     psF32 x,                            ///< x location at which to evaluate
    180     psF32 y                             ///< y location at which to evaluate
     176 *  @return psF64    result of polynomial at given location
     177 */
     178psF64 psPolynomial2DEval(
     179    const psPolynomial2D* poly,         ///< Coefficients for the polynomial
     180    psF64 x,                            ///< x location at which to evaluate
     181    psF64 y                             ///< y location at which to evaluate
    181182);
    182183
    183184/** Evaluates a 3-D polynomial at specific coordinates.
    184185 *
    185  *  @return psF32    result of polynomial at given location
    186  */
    187 psF32 psPolynomial3DEval(
    188     const psPolynomial3D* myPoly,      ///< Coefficients for the polynomial
    189     psF32 x,                            ///< x location at which to evaluate
    190     psF32 y,                            ///< y location at which to evaluate
    191     psF32 z                             ///< z location at which to evaluate
     186 *  @return psF64    result of polynomial at given location
     187 */
     188psF64 psPolynomial3DEval(
     189    const psPolynomial3D* poly,        ///< Coefficients for the polynomial
     190    psF64 x,                           ///< x location at which to evaluate
     191    psF64 y,                           ///< y location at which to evaluate
     192    psF64 z                            ///< z location at which to evaluate
    192193);
    193194
    194195/** Evaluates a 4-D polynomial at specific coordinates.
    195196 *
    196  *  @return psF32    result of polynomial at given location
    197  */
    198 psF32 psPolynomial4DEval(
    199     const psPolynomial4D* myPoly,      ///< Coefficients for the polynomial
    200     psF32 w,                            ///< w location at which to evaluate
    201     psF32 x,                            ///< x location at which to evaluate
    202     psF32 y,                            ///< y location at which to evaluate
    203     psF32 z                             ///< z location at which to evaluate
     197 *  @return psF64    result of polynomial at given location
     198 */
     199psF64 psPolynomial4DEval(
     200    const psPolynomial4D* poly,        ///< Coefficients for the polynomial
     201    psF64 x,                           ///< x location at which to evaluate
     202    psF64 y,                           ///< y location at which to evaluate
     203    psF64 z,                           ///< z location at which to evaluate
     204    psF64 t                            ///< t location at which to evaluate
    204205);
    205206
    … …  
    209210 */
    210211psVector *psPolynomial1DEvalVector(
    211     const psPolynomial1D *myPoly,      ///< Coefficients for the polynomial
    212     const psVector *x                   ///< x locations at which to evaluate
     212    const psPolynomial1D *poly,        ///< Coefficients for the polynomial
     213    const psVector *x                  ///< x locations at which to evaluate
    213214);
    214215
    … …  
    218219 */
    219220psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221     const psVector *x,                  ///< x locations at which to evaluate
    222     const psVector *y                   ///< y locations at which to evaluate
     221    const psPolynomial2D *poly,        ///< Coefficients for the polynomial
     222    const psVector *x,                 ///< x locations at which to evaluate
     223    const psVector *y                  ///< y locations at which to evaluate
    223224);
    224225
    … …  
    228229 */
    229230psVector *psPolynomial3DEvalVector(
    230     const psPolynomial3D *myPoly,      ///< Coefficients for the polynomial
    231     const psVector *x,                  ///< x locations at which to evaluate
    232     const psVector *y,                  ///< y locations at which to evaluate
    233     const psVector *z                   ///< z locations at which to evaluate
     231    const psPolynomial3D *poly,        ///< Coefficients for the polynomial
     232    const psVector *x,                 ///< x locations at which to evaluate
     233    const psVector *y,                 ///< y locations at which to evaluate
     234    const psVector *z                  ///< z locations at which to evaluate
    234235);
    235236
    … …  
    239240 */
    240241psVector *psPolynomial4DEvalVector(
    241     const psPolynomial4D *myPoly,      ///< Coefficients for the polynomial
    242     const psVector *w,                  ///< w locations at which to evaluate
    243     const psVector *x,                  ///< x locations at which to evaluate
    244     const psVector *y,                  ///< y locations at which to evaluate
    245     const psVector *z                   ///< z locations at which to evaluate
     242    const psPolynomial4D *poly,        ///< Coefficients for the polynomial
     243    const psVector *x,                 ///< x locations at which to evaluate
     244    const psVector *y,                 ///< y locations at which to evaluate
     245    const psVector *z,                 ///< z locations at which to evaluate
     246    const psVector *t                  ///< t locations at which to evaluate
    246247);
    247248
    … …  
    254255{
    255256    psPolynomialType type;             ///< Polynomial type
    256     psS32 n;                            ///< Number of terms
     257    psS32 n;                           ///< Number of terms
    257258    psF64 *coeff;                      ///< Coefficients
    258259    psF64 *coeffErr;                   ///< Error in coefficients
    … …  
    265266{
    266267    psPolynomialType type;             ///< Polynomial type
    267     psS32 nX;                           ///< Number of terms in x
    268     psS32 nY;                           ///< Number of terms in y
     268    psS32 nX;                          ///< Number of terms in x
     269    psS32 nY;                          ///< Number of terms in y
    269270    psF64 **coeff;                     ///< Coefficients
    270271    psF64 **coeffErr;                  ///< Error in coefficients
    … …  
    277278{
    278279    psPolynomialType type;             ///< Polynomial type
    279     psS32 nX;                           ///< Number of terms in x
    280     psS32 nY;                           ///< Number of terms in y
    281     psS32 nZ;                           ///< Number of terms in z
     280    psS32 nX;                          ///< Number of terms in x
     281    psS32 nY;                          ///< Number of terms in y
     282    psS32 nZ;                          ///< Number of terms in z
    282283    psF64 ***coeff;                    ///< Coefficients
    283284    psF64 ***coeffErr;                 ///< Error in coefficients
    … …  
    290291{
    291292    psPolynomialType type;             ///< Polynomial type
    292     psS32 nW;                           ///< Number of terms in w
    293     psS32 nX;                           ///< Number of terms in x
    294     psS32 nY;                           ///< Number of terms in y
    295     psS32 nZ;                           ///< Number of terms in z
     293    psS32 nW;                          ///< Number of terms in w
     294    psS32 nX;                          ///< Number of terms in x
     295    psS32 nY;                          ///< Number of terms in y
     296    psS32 nZ;                          ///< Number of terms in z
    296297    psF64 ****coeff;                   ///< Coefficients
    297298    psF64 ****coeffErr;                ///< Error in coefficients
    … …  
    305306 */
    306307psDPolynomial1D* psDPolynomial1DAlloc(
    307     psS32 n,                              ///< Number of terms
    308     psPolynomialType type                ///< Polynomial Type
     308    psS32 n,                           ///< Number of terms
     309    psPolynomialType type              ///< Polynomial Type
    309310);
    310311
    … …  
    314315 */
    315316psDPolynomial2D* psDPolynomial2DAlloc(
    316     psS32 nX,                           ///< Number of terms in x
    317     psS32 nY,                           ///< Number of terms in y
     317    psS32 nX,                          ///< Number of terms in x
     318    psS32 nY,                          ///< Number of terms in y
    318319    psPolynomialType type              ///< Polynomial Type
    319320);
    … …  
    324325 */
    325326psDPolynomial3D* psDPolynomial3DAlloc(
    326     psS32 nX,                           ///< Number of terms in x
    327     psS32 nY,                           ///< Number of terms in y
    328     psS32 nZ,                           ///< Number of terms in z
     327    psS32 nX,                          ///< Number of terms in x
     328    psS32 nY,                          ///< Number of terms in y
     329    psS32 nZ,                          ///< Number of terms in z
    329330    psPolynomialType type              ///< Polynomial Type
    330331);
    … …  
    335336 */
    336337psDPolynomial4D* psDPolynomial4DAlloc(
    337     psS32 nW,                           ///< Number of terms in w
    338     psS32 nX,                           ///< Number of terms in x
    339     psS32 nY,                           ///< Number of terms in y
    340     psS32 nZ,                           ///< Number of terms in z
     338    psS32 nW,                          ///< Number of terms in w
     339    psS32 nX,                          ///< Number of terms in x
     340    psS32 nY,                          ///< Number of terms in y
     341    psS32 nZ,                          ///< Number of terms in z
    341342    psPolynomialType type              ///< Polynomial Type
    342343);
    … …  
    348349psF64 psDPolynomial1DEval(
    349350    const psDPolynomial1D* myPoly,     ///< Coefficients for the polynomial
    350     psF64 x                             ///< Value at which to evaluate
     351    psF64 x                            ///< Value at which to evaluate
    351352);
    352353
    … …  
    357358psF64 psDPolynomial2DEval(
    358359    const psDPolynomial2D* myPoly,      ///< Coefficients for the polynomial
    359     psF64 x,                             ///< Value x at which to evaluate
    360     psF64 y                              ///< Value y at which to evaluate
     360    psF64 x,                            ///< Value x at which to evaluate
     361    psF64 y                             ///< Value y at which to evaluate
    361362);
    362363
    363364/** Evaluates a double-precision 3-D polynomial at specific coordinates.
    364365 *
    365  *  @return psF32    result of polynomial at given location
     366 *  @return psF64    result of polynomial at given location
    366367 */
    367368psF64 psDPolynomial3DEval(
    368369    const psDPolynomial3D* myPoly,     ///< Coefficients for the polynomial
    369     psF64 x,                            ///< Value x at which to evaluate
    370     psF64 y,                            ///< Value y at which to evaluate
    371     psF64 z                             ///< Value z at which to evaluate
     370    psF64 x,                           ///< Value x at which to evaluate
     371    psF64 y,                           ///< Value y at which to evaluate
     372    psF64 z                            ///< Value z at which to evaluate
    372373);
    373374
    374375/** Evaluates a double-precision 4-D polynomial at specific coordinates.
    375376 *
    376  *  @return psF32    result of polynomial at given location
     377 *  @return psF64    result of polynomial at given location
    377378 */
    378379psF64 psDPolynomial4DEval(
    379380    const psDPolynomial4D* myPoly,     ///< Coefficients for the polynomial
    380     psF64 w,                            ///< Value w at which to evaluate
    381     psF64 x,                            ///< Value x at which to evaluate
    382     psF64 y,                            ///< Value y at which to evaluate
    383     psF64 z                             ///< Value z at which to evaluate
     381    psF64 w,                           ///< Value w at which to evaluate
     382    psF64 x,                           ///< Value x at which to evaluate
     383    psF64 y,                           ///< Value y at which to evaluate
     384    psF64 z                            ///< Value z at which to evaluate
    384385);
    385386
    … …  
    390391psVector *psDPolynomial1DEvalVector(
    391392    const psDPolynomial1D *myPoly,     ///< Coefficients for the polynomial
    392     const psVector *x                   ///< x locations at which to evaluate
     393    const psVector *x                  ///< x locations at which to evaluate
    393394);
    394395
    … …  
    399400psVector *psDPolynomial2DEvalVector(
    400401    const psDPolynomial2D *myPoly,     ///< Coefficients for the polynomial
    401     const psVector *x,                  ///< x locations at which to evaluate
    402     const psVector *y                   ///< y locations at which to evaluate
     402    const psVector *x,                 ///< x locations at which to evaluate
     403    const psVector *y                  ///< y locations at which to evaluate
    403404);
    404405
    … …  
    409410psVector *psDPolynomial3DEvalVector(
    410411    const psDPolynomial3D *myPoly,     ///< Coefficients for the polynomial
    411     const psVector *x,                  ///< x locations at which to evaluate
    412     const psVector *y,                  ///< y locations at which to evaluate
    413     const psVector *z                   ///< z locations at which to evaluate
     412    const psVector *x,                 ///< x locations at which to evaluate
     413    const psVector *y,                 ///< y locations at which to evaluate
     414    const psVector *z                  ///< z locations at which to evaluate
    414415);
    415416
    … …  
    420421psVector *psDPolynomial4DEvalVector(
    421422    const psDPolynomial4D *myPoly,     ///< Coefficients for the polynomial
    422     const psVector *w,                  ///< w locations at which to evaluate
    423     const psVector *x,                  ///< x locations at which to evaluate
    424     const psVector *y,                  ///< y locations at which to evaluate
    425     const psVector *z                   ///< z locations at which to evaluate
     423    const psVector *w,                 ///< w locations at which to evaluate
     424    const psVector *x,                 ///< x locations at which to evaluate
     425    const psVector *y,                 ///< y locations at which to evaluate
     426    const psVector *z                  ///< z locations at which to evaluate
    426427);
    427428
    … …  
    429430typedef struct
    430431{
    431     psS32 n;                            ///< The number of spline polynomials
     432    psS32 n;                           ///< The number of spline polynomials
    432433    psPolynomial1D **spline;           ///< An array of n pointers to the spline polynomials
    433434    psF32 *p_psDeriv2;                 ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
    … …  
    444445 *  @return psSpline1D*    new 1-D spline struct
    445446 */
    446 psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
    447                             int order,           ///< Order of spline polynomials
    448                             float min,           ///< Lower boundary value of spline polynomials
    449                             float max);          ///< Upper boundary value of spline polynomials
     447psSpline1D *psSpline1DAlloc(
     448    int n,                             ///< Number of spline polynomials
     449    int order,                         ///< Order of spline polynomials
     450    float min,                         ///< Lower boundary value of spline polynomials
     451    float max                          ///< Upper boundary value of spline polynomials
     452);
    450453
    451454/** Allocates a psSpline1D structure
    … …  
    455458 *  @return psSpline1D*    new 1-D spline struct
    456459 */
    457 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    int order);               ///< Order of spline polynomials
     460psSpline1D *psSpline1DAllocGeneric(
     461    const psVector *bounds,            ///< Bounds for spline polynomials
     462    int order                          ///< Order of spline polynomials
     463);
    459464
    460465/** Evaluates 1-D spline polynomials at a specific coordinate.
    … …  
    481486 *  @return psS32    corresponding index number of specified value
    482487 */
    483 psS32 p_psVectorBinDisect(psVector *bins,        ///< Array of non-decreasing values
    484                           psScalar *x);          ///< Target value to find
     488psS32 p_psVectorBinDisect(
     489    psVector *bins,                    ///< Array of non-decreasing values
     490    psScalar *x                        ///< Target value to find
     491);
    485492
    486493/** Interpolates a series of data points for evaluation at a specific coordinate.  Uses a
    … …  
    489496 *  @return psScalar*    Lagrange interpolation value at given location
    490497 */
    491 psScalar *p_psVectorInterpolate(psVector *domain,     ///< Domain (x coords) for interpolation
    492                                 psVector *range,      ///< Range (y coords) for interpolation
    493                                 psS32 order,          ///< Order of interpolation function
    494                                 psScalar *x);         ///< Location at which to evaluate
     498psScalar *p_psVectorInterpolate(
     499    psVector *domain,                  ///< Domain (x coords) for interpolation
     500    psVector *range,                   ///< Range (y coords) for interpolation
     501    psS32 order,                       ///< Order of interpolation function
     502    psScalar *x                        ///< Location at which to evaluate
     503);
    495504
    496505#if 0

  • trunk/psLib/test/dataManip/verified/tst_psFunc08.stderr

    r3379 r4405  
    3434    Following should generate an error message for NULL polynomial
    3535<DATE><TIME>|<HOST>|E|psPolynomial1DEvalVector (FILE:LINENO)
    36     Unallowable operation: polynomial myPoly or its coeffs is NULL.
     36    Unallowable operation: polynomial poly or its coeffs is NULL.
    3737<DATE><TIME>|<HOST>|I|testPoly1DEvalVector
    3838    Following should generate an error message for NULL input vector

  • trunk/psLib/test/dataManip/verified/tst_psFunc09.stderr

    r3385 r4405  
    3434    Following should generate an error message for NULL polynomial
    3535<DATE><TIME>|<HOST>|E|psPolynomial2DEvalVector (FILE:LINENO)
    36     Unallowable operation: polynomial myPoly or its coeffs is NULL.
     36    Unallowable operation: polynomial poly or its coeffs is NULL.
    3737<DATE><TIME>|<HOST>|I|testPoly2DEvalVector
    3838    Following should generate an error message for NULL input vector

  • trunk/psLib/test/dataManip/verified/tst_psFunc10.stderr

    r3398 r4405  
    3434    Following should generate an error message for NULL polynomial
    3535<DATE><TIME>|<HOST>|E|psPolynomial3DEvalVector (FILE:LINENO)
    36     Unallowable operation: polynomial myPoly or its coeffs is NULL.
     36    Unallowable operation: polynomial poly or its coeffs is NULL.
    3737<DATE><TIME>|<HOST>|I|testPoly3DEvalVector
    3838    Following should generate an error message for NULL input vector

  • trunk/psLib/test/dataManip/verified/tst_psFunc11.stderr

    r3406 r4405  
    3434    Following should generate an error message for NULL polynomial
    3535<DATE><TIME>|<HOST>|E|psPolynomial4DEvalVector (FILE:LINENO)
    36     Unallowable operation: polynomial myPoly or its coeffs is NULL.
    37 <DATE><TIME>|<HOST>|I|testPoly4DEvalVector
    38     Following should generate an error message for NULL input vector
    39 <DATE><TIME>|<HOST>|E|psPolynomial4DEvalVector (FILE:LINENO)
    40     Unallowable operation: psVector w or its data is NULL.
     36    Unallowable operation: polynomial poly or its coeffs is NULL.
    4137<DATE><TIME>|<HOST>|I|testPoly4DEvalVector
    4238    Following should generate an error message for NULL input vector
    … …  
    5248    Unallowable operation: psVector z or its data is NULL.
    5349<DATE><TIME>|<HOST>|I|testPoly4DEvalVector
    54     Following should generate an error message for invalid input type
     50    Following should generate an error message for NULL input vector
    5551<DATE><TIME>|<HOST>|E|psPolynomial4DEvalVector (FILE:LINENO)
    56     Unallowable operation: psVector x has incorrect type.
     52    Unallowable operation: psVector t or its data is NULL.
    5753<DATE><TIME>|<HOST>|I|testPoly4DEvalVector
    5854    Following should generate an error message for invalid input type
    … …  
    6662    Following should generate an error message for invalid input type
    6763<DATE><TIME>|<HOST>|E|psPolynomial4DEvalVector (FILE:LINENO)
    68     Unallowable operation: psVector w has incorrect type.
     64    Unallowable operation: psVector t has incorrect type.
     65<DATE><TIME>|<HOST>|I|testPoly4DEvalVector
     66    Following should generate an error message for invalid input type
     67<DATE><TIME>|<HOST>|E|psPolynomial4DEvalVector (FILE:LINENO)
     68    Unallowable operation: psVector x has incorrect type.
    6969
    7070---> TESTPOINT PASSED (psPolynomialXDEval{psPolynomial4DEvalVector} | tst_psFunc11.c)
Note: See TracChangeset for help on using the changeset viewer.