IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Sep 21, 2005, 4:47:16 PM (21 years ago)
Author:
gusciora
Message:

The nX terms for the polynomials now refer to the order, not the number
of terms.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4731 r5090  
    1414*    orders are created.
    1515*
    16 *    @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
    17 *    @date $Date: 2005-08-08 21:44:09 $
     16*    @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
     17*    @date $Date: 2005-09-22 02:47:16 $
    1818*
    1919*  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    6363    }
    6464    // Verify polynomial structure members set properly
    65     if(my1DPoly->n != ORDER) {
    66         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    67                 my1DPoly->n, ORDER);
     65    if(my1DPoly->COOL_1D_n != ORDER) {
     66        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     67                my1DPoly->COOL_1D_n, ORDER);
    6868        return 2;
    6969    }
    … …  
    7373        return 3;
    7474    }
    75     for(psS32 i = 0; i < ORDER; i++) {
     75    for(psS32 i = 0; i < ORDER+1; i++) {
    7676        if(my1DPoly->coeff[i] != 0.0) {
    7777            psError(PS_ERR_UNKNOWN,true,"Coeff[%d] %lg not as expected %lg",
    … …  
    115115    }
    116116    // Verify polynomial structure members set properly
    117     if(my2DPoly->nX != ORDER) {
    118         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    119                 my2DPoly->nX, ORDER);
     117    if(my2DPoly->COOL_2D_nX != ORDER) {
     118        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     119                my2DPoly->COOL_2D_nX, ORDER);
    120120        return 2;
    121121    }
    122122    // Verify polynomial structure members set properly
    123     if(my2DPoly->nY != ORDER+1) {
    124         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    125                 my2DPoly->nY, ORDER+1);
     123    if(my2DPoly->COOL_2D_nY != ORDER+1) {
     124        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     125                my2DPoly->COOL_2D_nY, ORDER+1);
    126126        return 3;
    127127    }
    … …  
    131131        return 4;
    132132    }
    133     for(psS32 i = 0; i < ORDER; i++) {
    134         for(psS32 j = 0; j < ORDER+1; j++) {
     133    for(psS32 i = 0; i < ORDER+1; i++) {
     134        for(psS32 j = 0; j < ORDER+2; j++) {
    135135            if(my2DPoly->coeff[i][j] != 0.0) {
    136136                psError(PS_ERR_UNKNOWN,true,"Coeff[%d][%d] %lg not as expected %lg",
    … …  
    181181    }
    182182    // Verify polynomial structure members set properly
    183     if(my3DPoly->nX != ORDER) {
    184         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    185                 my3DPoly->nX, ORDER);
     183    if(my3DPoly->COOL_3D_nX != ORDER) {
     184        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     185                my3DPoly->COOL_3D_nX, ORDER);
    186186        return 2;
    187187    }
    188188    // Verify polynomial structure members set properly
    189     if(my3DPoly->nY != ORDER+1) {
    190         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    191                 my3DPoly->nY, ORDER+1);
     189    if(my3DPoly->COOL_3D_nY != ORDER+1) {
     190        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     191                my3DPoly->COOL_3D_nY, ORDER+1);
    192192        return 3;
    193193    }
    194194    // Verify polynomial structure members set properly
    195     if(my3DPoly->nZ != ORDER+2) {
    196         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    197                 my3DPoly->nZ, ORDER+2);
     195    if(my3DPoly->COOL_3D_nZ != ORDER+2) {
     196        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     197                my3DPoly->COOL_3D_nZ, ORDER+2);
    198198        return 4;
    199199    }
    … …  
    203203        return 5;
    204204    }
    205     for(psS32 i = 0; i < ORDER; i++) {
    206         for(psS32 j = 0; j < ORDER+1; j++) {
    207             for(psS32 k = 0; k < ORDER+2; k++) {
     205    for(psS32 i = 0; i < ORDER+1; i++) {
     206        for(psS32 j = 0; j < ORDER+2; j++) {
     207            for(psS32 k = 0; k < ORDER+3; k++) {
    208208                if(my3DPoly->coeff[i][j][k] != 0.0) {
    209209                    psError(PS_ERR_UNKNOWN,true,"Coeff[%d][%d][%d] %lg not as expected %lg",
    … …  
    254254
    255255    // Allocate polynomial
    256     my4DPoly = psPolynomial4DAlloc(ORDER+3,ORDER,ORDER+1,ORDER+2,PS_POLYNOMIAL_ORD);
     256    my4DPoly = psPolynomial4DAlloc(ORDER,ORDER+1,ORDER+2,ORDER+3,PS_POLYNOMIAL_ORD);
    257257    // Verify structure allocated
    258258    if(my4DPoly == NULL) {
    … …  
    261261    }
    262262    // Verify polynomial structure members set properly
    263     if(my4DPoly->nY != ORDER) {
    264         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    265                 my4DPoly->nY, ORDER);
     263    if(my4DPoly->COOL_4D_nX != ORDER) {
     264        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     265                my4DPoly->COOL_4D_nX, ORDER);
    266266        return 2;
    267267    }
    268268    // Verify polynomial structure members set properly
    269     if(my4DPoly->nZ != ORDER+1) {
    270         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    271                 my4DPoly->nZ, ORDER+1);
     269    if(my4DPoly->COOL_4D_nY != ORDER+1) {
     270        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     271                my4DPoly->COOL_4D_nX, ORDER+1);
    272272        return 3;
    273273    }
    274274    // Verify polynomial structure members set properly
    275     if(my4DPoly->nT != ORDER+2) {
    276         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    277                 my4DPoly->nT, ORDER+2);
     275    if(my4DPoly->COOL_4D_nZ != ORDER+2) {
     276        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     277                my4DPoly->COOL_4D_nZ, ORDER+2);
    278278        return 4;
    279279    }
    280280    // Verify polynomial structure members set properly
    281     if(my4DPoly->nX != ORDER+3) {
    282         psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
    283                 my4DPoly->nX, ORDER+3);
     281    if(my4DPoly->COOL_4D_nT != ORDER+3) {
     282        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
     283                my4DPoly->COOL_4D_nT, ORDER+3);
    284284        return 5;
    285285    }
    … …  
    289289        return 6;
    290290    }
    291     for(psS32 i = 0; i < ORDER+3; i++) {
    292         for(psS32 j = 0; j < ORDER; j++) {
    293             for(psS32 k = 0; k < ORDER+1; k++) {
    294                 for(psS32 l = 0; l < ORDER+2; l++) {
     291    for(psS32 i = 0; i < ORDER+1; i++) {
     292        for(psS32 j = 0; j < ORDER+2; j++) {
     293            for(psS32 k = 0; k < ORDER+3; k++) {
     294                for(psS32 l = 0; l < ORDER+4; l++) {
    295295                    if(my4DPoly->coeff[i][j][k][l] != 0.0) {
    296296                        psError(PS_ERR_UNKNOWN,true,"Coeff[%d][%d][%d][%d] %lg not as expected %lg",
Note: See TracChangeset for help on using the changeset viewer.