IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6511 for trunk/psModules/test


Ignore:
Timestamp:
Mar 3, 2006, 3:01:34 PM (20 years ago)
Author:
drobbin
Message:

Updated files to reflect psArray, psVector, & psPixels changes in psLib that set n=0 upon allocation.

Location:
trunk/psModules/test
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/astrom/tst_pmAstrometry01.c

    r5739 r6511  
    55*  @author GLG, MHPCC
    66*
    7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8 *  @date $Date: 2005-12-08 00:00:57 $
     7*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8*  @date $Date: 2006-03-04 01:01:33 $
    99*
    1010* XXX: Add tests were the coordinate does not transform to any legitimate cell
    … …  
    2828
    2929testDescription tests[] = {
    30                               {test3, -3, "pmAstrometry focal plane transformations", 0, false},
    31                               {test4, -3, "pmCheckParents()", 0, false},
    32                               {test5, -3, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false},
     30                              {test3, 666, "pmAstrometry focal plane transformations", 0, false},
     31                              {test4, 667, "pmCheckParents()", 0, false},
     32                              {test5, 668, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false},
    3333                              {NULL}
    3434                          };
    … …  
    229229 
    230230    pmCoordFPAToTP()  yes
    231     pmCoordTPToFPA()  yes 
     231    pmCoordTPToFPA()  yes
    232232 
    233233    pmCoordTPToSky()  yes

  • trunk/psModules/test/imcombine/tst_pmImageCombine.c

    r5258 r6511  
    1010 *  XXX: Must test masks with pmRejectPixels()
    1111 *
    12  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-10-10 21:58:34 $
     12 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-03-04 01:01:34 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    psArray *errors = psArrayAlloc(numImages);
    6868    psArray *masks = psArrayAlloc(numImages);
     69    images->n = images->nalloc;
     70    errors->n = errors->nalloc;
     71    masks->n = masks->nalloc;
    6972    for (psS32 i = 0 ; i < numImages ; i++) {
    7073        images->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
    … …  
    9497    psArray *errorsLong = psArrayAlloc(numImages+1);
    9598    psArray *masksLong = psArrayAlloc(numImages+1);
     99    imagesLong->n = imagesLong->nalloc;
     100    errorsLong->n = errorsLong->nalloc;
     101    masksLong->n = masksLong->nalloc;
    96102    for (psS32 i = 0 ; i < numImages+1 ; i++) {
    97103        imagesLong->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
    … …  
    121127    psArray *errorsBadType = psArrayAlloc(numImages);
    122128    psArray *masksBadType = psArrayAlloc(numImages);
     129    imagesBadType->n = imagesBadType->nalloc;
     130    errorsBadType->n = errorsBadType->nalloc;
     131    masksBadType->n = masksBadType->nalloc;
    123132    for (psS32 i = 0 ; i < numImages ; i++) {
    124133        imagesBadType->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F64);
    … …  
    143152
    144153    psPixels *pixels = psPixelsAlloc(TST00_NUM_PIXELS);
     154    pixels->n = pixels->nalloc;
    145155    for (psS32 p = 0 ; p < TST00_NUM_PIXELS ; p++) {
    146156        psS32 col =  genRanInt(0, numCols);
    … …  
    284294    psArray *expandTransforms = psArrayAlloc(numImages);
    285295    psArray *contractTransforms = psArrayAlloc(numImages);
     296    expandTransforms->n = expandTransforms->nalloc;
     297    contractTransforms->n = contractTransforms->nalloc;
    286298    for (psS32 im = 0 ; im < numImages ; im++) {
    287299        psPlaneTransform *ptExpand = psPlaneTransformAlloc(2, 2);

  • trunk/psModules/test/imcombine/tst_pmReadoutCombine.c

    r5169 r6511  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-09-28 20:42:52 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-03-04 01:01:34 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383    psVector *zero = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
    8484    psVector *scale = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
     85    zero->n = zero->nalloc;
     86    scale->n = scale->nalloc;
    8587    printPositiveTestHeader(stdout, "pmReadoutCombine", "simpleCombineNoOverlap");
    8688
    … …  
    207209    psVector *scaleBig = psVectorAlloc(NUM_READOUTS*2, PS_TYPE_F32);
    208210    psVector *scaleF64 = psVectorAlloc(NUM_READOUTS, PS_TYPE_F64);
     211    zero->n = zero->nalloc;
     212    zeroHalf->n = zeroHalf->nalloc;
     213    zeroBig->n = zeroBig->nalloc;
     214    zeroF64->n = zeroF64->nalloc;
     215    scale->n = scale->nalloc;
     216    scaleHalf->n = scaleHalf->nalloc;
     217    scaleBig->n = scaleBig->nalloc;
     218    scaleF64->n = scaleF64->nalloc;
    209219    for (i=0;i<NUM_READOUTS;i++) {
    210220        zero->data.F32[i] = 3.0;

  • trunk/psModules/test/imsubtract/tst_pmImageSubtract.c

    r5169 r6511  
    1010 *  data.  More work need to be done to verify the results.
    1111 *
    12  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-09-28 20:42:52 $
     12 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-03-04 01:01:34 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    161161
    162162    psVector *sigmas = psVectorAlloc(sigmaLength, PS_TYPE_F32);
     163    sigmas->n = sigmas->nalloc;
    163164    for (psS32 i = 0 ; i < sigmas->n ; i++) {
    164165        sigmas->data.F32[i] = 1.0 + (psF32) i;
    165166    }
    166167    psVector *orders = psVectorAlloc(orderLength, PS_TYPE_S32);
     168    orders->n = orders->nalloc;
    167169    for (psS32 i = 0 ; i < orders->n ; i++) {
    168170        orders->data.S32[i] = i + 2;
    … …  
    617619    //
    618620    psVector *sigmas = psVectorAlloc(TST03_SIGMA_LENGTH, PS_TYPE_F32);
     621    sigmas->n = sigmas->nalloc;
    619622    for (psS32 i = 0 ; i < sigmas->n ; i++) {
    620623        sigmas->data.F32[i] = 1.0 + (psF32) i;
    621624    }
    622625    psVector *orders = psVectorAlloc(TST03_ORDER_LENGTH, PS_TYPE_S32);
     626    orders->n = orders->nalloc;
    623627    for (psS32 i = 0 ; i < orders->n ; i++) {
    624628        orders->data.S32[i] = i + 2;

  • trunk/psModules/test/objects/tst_pmObjects01.c

    r6326 r6511  
    3131    most of psObjects.c is not tested
    3232 *
    33  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    34  *  @date $Date: 2006-02-06 21:23:46 $
     33 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     34 *  @date $Date: 2006-03-04 01:01:34 $
    3535 *
    3636 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    234234    bool testStatus = true;
    235235    psVector *inData = psVectorAlloc(n, PS_TYPE_F32);
     236    inData->n = inData->nalloc;
    236237    psVector *outData = NULL;
    237238
    … …  
    401402    psVector *tmpVecF64 = psVectorAlloc(TST01_VECTOR_LENGTH, PS_TYPE_F64);
    402403    psVector *tmpVecEmpty = psVectorAlloc(0, PS_TYPE_F32);
     404    tmpVecF64->n = tmpVecF64->nalloc;
     405    tmpVecEmpty->n = tmpVecEmpty->nalloc;
    403406
    404407    psTraceSetLevel(".", 0);
Note: See TracChangeset for help on using the changeset viewer.