IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1221


Ignore:
Timestamp:
Jul 14, 2004, 2:08:44 PM (22 years ago)
Author:
desonia
Message:

fixed tests to coorespond to changes in psImageClip and/or the FullUnitTest/runTest
scripts.

Location:
trunk/psLib/test
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr

    r1195 r1221  
    2323\**********************************************************************************/
    2424
    25  <DATE> <TIME> <HOST> |I|testVectorCompl|Following should be an error (type mismatch).
    26  <DATE> <TIME> <HOST> |E|psVectorComplex|The inputs to psVectorComplex must be the same type.
     25 <DATE> <TIME> |<HOST>|I|testVectorCompl|Following should be an error (type mismatch).
     26 <DATE> <TIME> |<HOST>|E|psVectorComplex|The inputs to psVectorComplex must be the same type.
    2727
    2828---> TESTPOINT PASSED (psFFT{psVectorComplex} | tst_psVectorFFT.c)
  • trunk/psLib/test/image/tst_psImageIO.c

    r1193 r1221  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-07-08 01:05:01 $
     8 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-07-15 00:08:43 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    8686        img2 = psImageCopy(img2,img,PS_TYPE_##TYP); \
    8787        GENIMAGE(img3,m,n,TYP,row+2*col); \
    88         psImageClip(img3,100,100,400,400); \
     88        psImageClip(img3,32.0,32.0,120.0,120.0); \
    8989        img4 = psImageCopy(img4,img3,PS_TYPE_##TYP); \
    9090        remove(filename); \
  • trunk/psLib/test/image/tst_psImageManip.c

    r1217 r1221  
    66 *  @author Robert DeSonia, MHPCC
    77 *
    8  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-07-14 23:23:42 $
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-07-15 00:08:43 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    5252    unsigned int c = 128;
    5353    unsigned int r = 256;
    54     psF32 min;
    55     psF32 max;
     54    psF64 min;
     55    psF64 max;
    5656    int numClipped = 0;
    5757    int retVal;
     
    9191        } \
    9292    } \
    93     min = (float)r/2.0f; \
    94     max = (float)r; \
     93    min = (psF64)r/2.0; \
     94    max = (psF64)r; \
    9595    \
    96     retVal = psImageClip(img,min,-1.0f,max,-2.0f); \
     96    retVal = psImageClip(img,min,(double)PS_MIN_##datatype,max,(double)PS_MAX_##datatype); \
    9797    \
    9898    numClipped = 0; \
     
    101101        for (unsigned int col=0;col<c;col++) { \
    102102            ps##datatype value = (ps##datatype)(row+col); \
    103             if (value < (ps##datatype)min) { \
     103            if (value < min) { \
    104104                numClipped++; \
    105                 value = -1; \
    106             } else if (value > (ps##datatype)max) { \
     105                value = PS_MIN_##datatype; \
     106            } else if (value > max) { \
    107107                numClipped++; \
    108                 value = -2; \
     108                value = PS_MAX_##datatype; \
    109109            } \
    110110            if (fabsf(imgRow[col]-value) > FLT_EPSILON) { \
    111                 psError(__func__,"Pixel value is not as expected (%d vs %d) at %u,%u", \
    112                         imgRow[col],value,col,row); \
     111                psError(__func__,"Pixel value is not as expected (%g vs %g) at %u,%u", \
     112                        (psF64)imgRow[col],(psF64)value,col,row); \
    113113                return 1; \
    114114            } \
  • trunk/psLib/test/image/verified/tst_psImageFFT.stderr

    r1195 r1221  
    2323\**********************************************************************************/
    2424
    25  <DATE> <TIME> <HOST> |I|testImageComple|Following should be an error (type mismatch).
    26  <DATE> <TIME> <HOST> |E| psImageComplex|The inputs to psImageComplex must be the same type.
    27  <DATE> <TIME> <HOST> |I|testImageComple|Following should be an error (size mismatch).
    28  <DATE> <TIME> <HOST> |E| psImageComplex|The inputs to psImageComplex must be the same dimensions.
     25 <DATE> <TIME> |<HOST>|I|testImageComple|Following should be an error (type mismatch).
     26 <DATE> <TIME> |<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same type.
     27 <DATE> <TIME> |<HOST>|I|testImageComple|Following should be an error (size mismatch).
     28 <DATE> <TIME> |<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same dimensions.
    2929
    3030---> TESTPOINT PASSED (psFFT{psImageComplex} | tst_psImageFFT.c)
  • trunk/psLib/test/image/verified/tst_psImageIO.stderr

    r1195 r1221  
    55\**********************************************************************************/
    66
    7  <DATE> <TIME> <HOST> |I|  testImageRead|Following should be an error as file doesn't exist.
    8  <DATE> <TIME> <HOST> |E|psImageReadSect|Could not open file 'foobar.fits'. (could not open the named file)
    9  <DATE> <TIME> <HOST> |I|  testImageRead|Following should be an error as filename is NULL.
    10  <DATE> <TIME> <HOST> |E|psImageReadSect|Must specify filename; it can not be NULL.
    11  <DATE> <TIME> <HOST> |I|  testImageRead|Following should be an error as extnum is invalid.
    12  <DATE> <TIME> <HOST> |E|psImageReadSect|Could not index to HDU #4 for file tmpImages/MxN_F32.fits. (tried to move past end of file)
    13  <DATE> <TIME> <HOST> |I|  testImageRead|Following should be an error as extname is invalid.
    14  <DATE> <TIME> <HOST> |E|psImageReadSect|Could not index to 'bogus' HDU for file tmpImages/MxN_F32.fits. (illegal HDU number)
     7 <DATE> <TIME> |<HOST>|I|  testImageRead|Following should be an error as file doesn't exist.
     8 <DATE> <TIME> |<HOST>|E|psImageReadSect|Could not open file 'foobar.fits'. (could not open the named file)
     9 <DATE> <TIME> |<HOST>|I|  testImageRead|Following should be an error as filename is NULL.
     10 <DATE> <TIME> |<HOST>|E|psImageReadSect|Must specify filename; it can not be NULL.
     11 <DATE> <TIME> |<HOST>|I|  testImageRead|Following should be an error as extnum is invalid.
     12 <DATE> <TIME> |<HOST>|E|psImageReadSect|Could not index to HDU #4 for file tmpImages/MxN_F32.fits. (tried to move past end of file)
     13 <DATE> <TIME> |<HOST>|I|  testImageRead|Following should be an error as extname is invalid.
     14 <DATE> <TIME> |<HOST>|E|psImageReadSect|Could not index to 'bogus' HDU for file tmpImages/MxN_F32.fits. (illegal HDU number)
    1515
    1616---> TESTPOINT PASSED (psImage{psImageReadSection} | tst_psImageIO.c)
  • trunk/psLib/test/image/verified/tst_psImageManip.stderr

    r1220 r1221  
    4646---> TESTPOINT PASSED (psImage{psImageOverlay} | tst_psImageManip.c)
    4747
     48/***************************** TESTPOINT ******************************************\
     49*             TestFile: tst_psImageManip.c                                         *
     50*            TestPoint: psImage{psImageRebin}                                      *
     51*             TestType: Positive                                                   *
     52\**********************************************************************************/
     53
     54 <DATE> <TIME> |<HOST>|E|   psImageRebin|Input image is NULL.
     55 <DATE> <TIME> |<HOST>|I| testImageRebin|Following should be an error.
     56 <DATE> <TIME> |<HOST>|E|   psImageRebin|The scale must be positive.
     57 <DATE> <TIME> |<HOST>|I| testImageRebin|Following should be an error.
     58 <DATE> <TIME> |<HOST>|E|   psImageRebin|The stats input can not be NULL.
     59 <DATE> <TIME> |<HOST>|I| testImageRebin|Following should be an error.
     60 <DATE> <TIME> |<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
     61 <DATE> <TIME> |<HOST>|I| testImageRebin|Following should be an error.
     62 <DATE> <TIME> |<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
     63 <DATE> <TIME> |<HOST>|I| testImageRebin|Following should be an error.
     64 <DATE> <TIME> |<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
     65
     66---> TESTPOINT PASSED (psImage{psImageRebin} | tst_psImageManip.c)
     67
Note: See TracChangeset for help on using the changeset viewer.