IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6204 for trunk/psLib/test/math


Ignore:
Timestamp:
Jan 26, 2006, 11:10:22 AM (20 years ago)
Author:
gusciora
Message:

Implemented the polynomial alloc argument changes.

Location:
trunk/psLib/test/math
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/math/tst_psFunc08.c

    r5092 r6204  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.5 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2005-09-22 20:45:43 $
     6*  @version  $Revision: 1.6 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-01-26 21:10:22 $
    88*
    99*  XXX: Probably should test single- and multi-dimensional polynomials in
    … …  
    6262
    6363    // Allocate polynomial structure
    64     psPolynomial1D*  polyOrd = psPolynomial1DAlloc(TERMS-1, PS_POLYNOMIAL_ORD);
    65     psPolynomial1D*  polyCheb = psPolynomial1DAlloc(TERMS-1, PS_POLYNOMIAL_CHEB);
     64    psPolynomial1D*  polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1);
     65    psPolynomial1D*  polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
    6666    // Set polynomial members
    6767    for(psS32 i = 0; i < TERMS; i++) {
    … …  
    9090
    9191    // Allocate polynomial with invalid type
    92     polyOrd = psPolynomial1DAlloc(TERMS-1, 99);
     92    polyOrd = psPolynomial1DAlloc(99, TERMS-1);
    9393    // Attempt to evaluation invalid polynomial type
    9494    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type");
    … …  
    107107{
    108108    // Allocate polynomial
    109     psPolynomial1D* polyOrd = psPolynomial1DAlloc(TERMS-1,PS_POLYNOMIAL_ORD);
    110     psPolynomial1D* polyCheb = psPolynomial1DAlloc(TERMS-1,PS_POLYNOMIAL_CHEB);
     109    psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1);
     110    psPolynomial1D* polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
    111111
    112112    // Set polynomial members

  • trunk/psLib/test/math/tst_psFunc09.c

    r5092 r6204  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.5 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2005-09-22 20:45:43 $
     6*  @version  $Revision: 1.6 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-01-26 21:10:22 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    8989
    9090    // Allocate polynomial structure
    91     psPolynomial2D*  polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD);
    92     psPolynomial2D*  polyCheb = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB);
     91    psPolynomial2D*  polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1);
     92    psPolynomial2D*  polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1);
    9393    // Set polynomial members
    9494    for(psS32 i = 0; i < TERMS; i++) {
    … …  
    117117
    118118    // Allocate polynomial with invalid type
    119     polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, 99);
     119    polyOrd = psPolynomial2DAlloc(99, TERMS-1, TERMS-1);
    120120    // Attempt to evaluation invalid polynomial type
    121121    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type");
    … …  
    134134    psBool testStatus = true;
    135135    // Allocate polynomial
    136     psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_ORD);
    137     psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_CHEB);
     136    psPolynomial2D* polyOrd = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1);
     137    psPolynomial2D* polyCheb = psPolynomial2DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1);
    138138
    139139    // Set polynomial members

  • trunk/psLib/test/math/tst_psFunc10.c

    r5094 r6204  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.6 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2005-09-22 22:22:15 $
     6*  @version  $Revision: 1.7 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-01-26 21:10:22 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    140140
    141141    // Allocate polynomial structure
    142     psPolynomial3D*  polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_ORD);
    143     psPolynomial3D*  polyCheb = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_CHEB);
     142    psPolynomial3D*  polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1);
     143    psPolynomial3D*  polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1);
    144144    // Set polynomial members
    145145    for(psS32 i = 0; i < TERMS; i++) {
    … …  
    174174
    175175    // Allocate polynomial with invalid type
    176     polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1, 99);
     176    polyOrd = psPolynomial3DAlloc(99, TERMS-1, TERMS-1, TERMS-1);
    177177    // Attempt to evaluation invalid polynomial type
    178178    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type");
    … …  
    191191    psBool testStatus = true;
    192192    // Allocate polynomial
    193     psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_ORD);
    194     psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS-1, TERMS-1, TERMS-1,PS_POLYNOMIAL_CHEB);
     193    psPolynomial3D* polyOrd = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1);
     194    psPolynomial3D* polyCheb = psPolynomial3DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1);
    195195
    196196    // Set polynomial members

  • trunk/psLib/test/math/tst_psFunc11.c

    r6197 r6204  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.7 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2006-01-26 02:11:01 $
     6*  @version  $Revision: 1.8 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-01-26 21:10:22 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    379379    psBool testStatus = true;
    380380    // Allocate polynomial structure
    381     psPolynomial4D*  polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD);
    382     psPolynomial4D*  polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB);
     381    psPolynomial4D*  polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
     382    psPolynomial4D*  polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
    383383    // Set polynomial members
    384384    for(psS32 i = 0; i < TERMS; i++) {
    … …  
    418418
    419419    // Allocate polynomial with invalid type
    420     polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, 99);
     420    polyOrd = psPolynomial4DAlloc(99, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
    421421    // Attempt to evaluation invalid polynomial type
    422422    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type");
    … …  
    435435    psBool testStatus = true;
    436436    // Allocate polynomial
    437     psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD);
    438     psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB);
     437    psPolynomial4D* polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
     438    psPolynomial4D* polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
    439439
    440440    // Set polynomial members

  • trunk/psLib/test/math/tst_psPolyFit1D.c

    r6194 r6204  
    8484    if (flags & TS00_POLY_ORD) {
    8585        printf(" using ordinary polynomials\n");
    86         myPoly = psPolynomial1DAlloc(polyOrder, PS_POLYNOMIAL_ORD);
     86        myPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, polyOrder);
    8787    }
    8888
    8989    if (flags & TS00_POLY_CHEB) {
    9090        printf(" using chebyshev polynomials\n");
    91         myPoly = psPolynomial1DAlloc(polyOrder, PS_POLYNOMIAL_CHEB);
     91        myPoly = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, polyOrder);
    9292    }
    9393

  • trunk/psLib/test/math/tst_psPolyFit2D.c

    r6193 r6204  
    9090    if (flags & TS00_POLY_ORD) {
    9191        printf(" using ordinary polynomials\n");
    92         myPoly = psPolynomial2DAlloc(polyOrderX, polyOrderY, PS_POLYNOMIAL_ORD);
     92        myPoly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY);
    9393    }
    9494

  • trunk/psLib/test/math/tst_psPolyFit3D.c

    r6193 r6204  
    107107    if (flags & TS00_POLY_ORD) {
    108108        printf(" using ordinary polynomials\n");
    109         myPoly = psPolynomial3DAlloc(polyOrderX, polyOrderY, polyOrderZ, PS_POLYNOMIAL_ORD);
     109        myPoly = psPolynomial3DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY, polyOrderZ);
    110110    }
    111111

  • trunk/psLib/test/math/tst_psPolyFit4D.c

    r6193 r6204  
    120120    if (flags & TS00_POLY_ORD) {
    121121        printf(" using ordinary polynomials\n");
    122         myPoly = psPolynomial4DAlloc(polyOrderX, polyOrderY, polyOrderZ, polyOrderT, PS_POLYNOMIAL_ORD);
     122        myPoly = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, polyOrderX, polyOrderY, polyOrderZ, polyOrderT);
    123123    }
    124124

  • trunk/psLib/test/math/tst_psSpline1D.c

    r5647 r6204  
    1313*  @author GLG, MHPCC
    1414*
    15 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    16 *  @date $Date: 2005-12-01 01:20:38 $
     15*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     16*  @date $Date: 2006-01-26 21:10:22 $
    1717*
    1818*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    120120        tmpSline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *));
    121121        for (psS32 i=0;i<numSplines;i++) {
    122             spline->spline[i] = psPolynomial1DAlloc(3, PS_POLYNOMIAL_ORD);
     122            spline->spline[i] = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 3);
    123123        }
    124124    */
Note: See TracChangeset for help on using the changeset viewer.