IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 13, 2007, 2:39:51 PM (19 years ago)
Author:
Paul Price
Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

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

Legend:

Unmodified
Added
Removed

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

    r10816 r12431  
    1212 *  @author  Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    15  *  @date  $Date: 2006-12-20 20:02:29 $
     14 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     15 *  @date  $Date: 2007-03-14 00:39:51 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5656        psMemId id = psMemGetId();
    5757        psImage *outImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
    58         psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_C32);
     58        psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_U8);
    5959        psMemIncrRefCounter(outImage);
    6060        ok(psMatrixTranspose(outImage, badImage1) == NULL, "psMatrixTranspose(): inImage = outImage results in NULL return");
    … …  
    6969        psMemId id = psMemGetId();
    7070        psImage *inImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
    71         psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_C32);
     71        psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_U8);
    7272        badImage1 = psMatrixTranspose(badImage1, inImage);
    7373        ok(badImage1 != NULL, "psMatrixTranspose() results in non-NULL return");

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

    r11397 r12431  
    44 *
    55 *  This test driver tests combinations of matrix, vector, and scalar binary operations including:
    6  *     Matrix-matrix with +,-,*,/ with S32, F32, F64, C32
    7  *     Matrix-vector with +,-,*,/ with S32, F32, F64, C32
    8  *     Matrix-scalar with +,-,*,/ with S32, F32, F64, C32
     6 *     Matrix-matrix with +,-,*,/ with S32, F32, F64
     7 *     Matrix-vector with +,-,*,/ with S32, F32, F64
     8 *     Matrix-scalar with +,-,*,/ with S32, F32, F64
    99 *
    1010 *  @author  Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    13  *  @date  $Date: 2007-01-30 00:11:31 $
     12 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     13 *  @date  $Date: 2007-03-14 00:39:51 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    140140    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, +, F64)");
    141141    ok(memoryFlag== false, "no memory leaks");
    142     testBinaryOpMM(+,C32,10.0+10.0i,10.0+10.0i,3,2,errorFlag,memoryFlag);
    143     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, +, C32)");
    144     ok(memoryFlag== false, "no memory leaks");
    145142    testBinaryOpMM(-,S32,20,10,3,2,errorFlag,memoryFlag);
    146143    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, -, S32)");
    … …  
    161158    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, *, F64)");
    162159    ok(memoryFlag== false, "no memory leaks");
    163     testBinaryOpMM(*,C32,20.0+20.0i,10.0+10.0i,3,2,errorFlag,memoryFlag);
    164     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, *, C32)");
    165     ok(memoryFlag== false, "no memory leaks");
    166160    testBinaryOpMM(/,S32,20,10,3,2,errorFlag,memoryFlag);
    167161    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, S32)");
    … …  
    172166    testBinaryOpMM(/,F64,20.0,10.0,3,2,errorFlag,memoryFlag);
    173167    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, F64)");
    174     ok(memoryFlag== false, "no memory leaks");
    175     testBinaryOpMM(/,C32,20.0+20.0i,10.0+10.0i,3,2,errorFlag,memoryFlag);
    176     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, C32)");
    177168    ok(memoryFlag== false, "no memory leaks");
    178169
    … …  
    187178    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, +, F64)");
    188179    ok(memoryFlag== false, "no memory leaks");
    189     testBinaryOpMV(+,C32,10.0+10.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    190     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, +, C32)");
    191     ok(memoryFlag== false, "no memory leaks");
    192180    testBinaryOpMV(-,S32,20,5,3,2,errorFlag,memoryFlag);
    193181    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, -, S32)");
    … …  
    208196    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, *, F64)");
    209197    ok(memoryFlag== false, "no memory leaks");
    210     testBinaryOpMV(*,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    211     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, *, C32)");
    212     ok(memoryFlag== false, "no memory leaks");
    213198    testBinaryOpMV(/,S32,20,5,3,2,errorFlag,memoryFlag);
    214199    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, S32)");
    … …  
    219204    testBinaryOpMV(/,F64,20.0,5.0,3,2,errorFlag,memoryFlag);
    220205    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, F64)");
    221     ok(memoryFlag== false, "no memory leaks");
    222     testBinaryOpMV(/,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    223     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, C32)");
    224206    ok(memoryFlag== false, "no memory leaks");
    225207
    … …  
    234216    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, +, F64)");
    235217    ok(memoryFlag== false, "no memory leaks");
    236     testBinaryOpMS(+,C32,10.0+10.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    237     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, +, C32)");
    238     ok(memoryFlag== false, "no memory leaks");
    239218    testBinaryOpMS(-,S32,20,5,3,2,errorFlag,memoryFlag);
    240219    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, -, S32)");
    … …  
    255234    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, *, F64)");
    256235    ok(memoryFlag== false, "no memory leaks");
    257     testBinaryOpMS(*,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    258     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, *, C32)");
    259     ok(memoryFlag== false, "no memory leaks");
    260236    testBinaryOpMS(/,S32,20,5,3,2,errorFlag,memoryFlag);
    261237    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, S32)");
    … …  
    267243    ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, F64)");
    268244    ok(memoryFlag== false, "no memory leaks");
    269     testBinaryOpMS(/,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag);
    270     ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, C32)");
    271     ok(memoryFlag== false, "no memory leaks");
    272245    return 0;
    273246}

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

    r10945 r12431  
    55 *
    66 *  This test driver tests combinations of matrix, vector, and scalar unary operations including:
    7  *     Matrix with all math operators with S32, F32, F64, C32
    8  *     Vector with all math operators with S32, F32, F64, C32
     7 *     Matrix with all math operators with S32, F32, F64
     8 *     Vector with all math operators with S32, F32, F64
    99 *
    1010 *  @author  Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    13  *  @date  $Date: 2007-01-06 00:48:54 $
     12 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     13 *  @date  $Date: 2007-03-14 00:39:51 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    142142    ok(errorFlag== false, "psUnaryOp(): abs was successful");
    143143    ok(memoryFlag== false, "no memory leaks");
    144     testUnaryOpM( abs, C32, -10.0 - 10.0i, 0.0 + 0.0i, 3, 2,10+10i, errorFlag, memoryFlag);
    145     ok(errorFlag== false, "psUnaryOp(): abs was successful");
    146     ok(memoryFlag== false, "no memory leaks");
    147144    testUnaryOpM( exp, S32, 10, 0, 3, 2, exp(10), errorFlag, memoryFlag);
    148145    ok(errorFlag== false, "psUnaryOp(): exp was successful");
    … …  
    154151    ok(errorFlag== false, "psUnaryOp(): exp was successful");
    155152    ok(memoryFlag== false, "no memory leaks");
    156     testUnaryOpM( exp, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, cexp(1.0+1.0i), errorFlag, memoryFlag);
    157     ok(errorFlag== false, "psUnaryOp(): exp was successful");
    158     ok(memoryFlag== false, "no memory leaks");
    159153    testUnaryOpM( ln, S32, 10, 0, 3, 2, clog(10), errorFlag, memoryFlag);
    160154    ok(errorFlag== false, "psUnaryOp(): ln was successful");
    … …  
    166160    ok(errorFlag== false, "psUnaryOp(): ln was successful");
    167161    ok(memoryFlag== false, "no memory leaks");
    168     testUnaryOpM( ln, C32, 10.0 + 10.0i, 0.0 + 0.0i, 3, 2, clog(10.0+10.0i), errorFlag, memoryFlag);
    169     ok(errorFlag== false, "psUnaryOp(): ln was successful");
    170     ok(memoryFlag== false, "no memory leaks");
    171162    testUnaryOpM( ten, S32, 3, 0, 3, 2, 1000, errorFlag, memoryFlag);
    172163    ok(errorFlag== false, "psUnaryOp(): ten was successful");
    … …  
    178169    ok(errorFlag== false, "psUnaryOp(): ten was successful");
    179170    ok(memoryFlag== false, "no memory leaks");
    180     testUnaryOpM( ten, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, 10.0, errorFlag, memoryFlag);
    181     ok(errorFlag== false, "psUnaryOp(): ten was successful");
    182     ok(memoryFlag== false, "no memory leaks");
    183171    testUnaryOpM( log, S32, 1000, 0, 3, 2, 3, errorFlag, memoryFlag);
    184172    ok(errorFlag== false, "psUnaryOp(): log was successful");
    … …  
    190178    ok(errorFlag== false, "psUnaryOp(): log was successful");
    191179    ok(memoryFlag== false, "no memory leaks");
    192     testUnaryOpM( log, C32, 1000.0 + 0.0i, 0.0 + 0.0i, 3, 2, 3, errorFlag, memoryFlag);
    193     ok(errorFlag== false, "psUnaryOp(): log was successful");
    194     ok(memoryFlag== false, "no memory leaks");
    195180    testUnaryOpM( sin, S32, M_PI_2, 0, 3, 2, 1, errorFlag, memoryFlag);
    196181    ok(errorFlag== false, "psUnaryOp(): sin was successful");
    … …  
    202187    ok(errorFlag== false, "psUnaryOp(): sin was successful");
    203188    ok(memoryFlag== false, "no memory leaks");
    204     testUnaryOpM( sin, C32, M_PI_2 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag);
    205     ok(errorFlag== false, "psUnaryOp(): sin was successful");
    206     ok(memoryFlag== false, "no memory leaks");
    207189    testUnaryOpM( dsin, S32, 90, 0, 3, 2 , 1, errorFlag, memoryFlag);
    208190    ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    … …  
    214196    ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    215197    ok(memoryFlag== false, "no memory leaks");
    216     testUnaryOpM( dsin, C32, 90.0 + 00.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag);
    217     ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    218     ok(memoryFlag== false, "no memory leaks");
    219198    testUnaryOpM( cos, S32, 0, 0, 3, 2, 1, errorFlag, memoryFlag);
    220199    ok(errorFlag== false, "psUnaryOp(): cos was successful");
    … …  
    226205    ok(errorFlag== false, "psUnaryOp(): cos was successful");
    227206    ok(memoryFlag== false, "no memory leaks");
    228     testUnaryOpM( cos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag);
    229     ok(errorFlag== false, "psUnaryOp(): cos was successful");
    230     ok(memoryFlag== false, "no memory leaks");
    231207    testUnaryOpM( dcos, S32, 0, 0, 3, 2, 1, errorFlag, memoryFlag);
    232208    ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    … …  
    238214    ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    239215    ok(memoryFlag== false, "no memory leaks");
    240     testUnaryOpM( dcos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag);
    241     ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    242     ok(memoryFlag== false, "no memory leaks");
    243216    testUnaryOpM( tan, S32, M_PI_4, 0, 3, 2, 1, errorFlag, memoryFlag);
    244217    ok(errorFlag== false, "psUnaryOp(): tan was successful");
    … …  
    250223    ok(errorFlag== false, "psUnaryOp(): tan was successful");
    251224    ok(memoryFlag== false, "no memory leaks");
    252     testUnaryOpM( tan, C32, M_PI_4 + 0.0i, 0.0 + 0.0i, 3, 2, 1, errorFlag, memoryFlag);
    253     ok(errorFlag== false, "psUnaryOp(): tan was successful");
    254     ok(memoryFlag== false, "no memory leaks");
    255225    testUnaryOpM( dtan, S32, 45, 0, 3, 2, 1, errorFlag, memoryFlag);
    256226    ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    … …  
    262232    ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    263233    ok(memoryFlag== false, "no memory leaks");
    264     testUnaryOpM( dtan, C32, 45.0 + 45.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag);
    265     ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    266     ok(memoryFlag== false, "no memory leaks");
    267234    testUnaryOpM( asin, S32, 1, 0, 3, 2, M_PI_2, errorFlag, memoryFlag);
    268235    ok(errorFlag== false, "psUnaryOp(): asin was successful");
    … …  
    274241    ok(errorFlag== false, "psUnaryOp(): asin was successful");
    275242    ok(memoryFlag== false, "no memory leaks");
    276     testUnaryOpM( asin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, M_PI_2, errorFlag, memoryFlag);
    277     ok(errorFlag== false, "psUnaryOp(): asin was successful");
    278     ok(memoryFlag== false, "no memory leaks");
    279243    testUnaryOpM( dasin, S32, 1.0, 0, 3, 2, 90, errorFlag, memoryFlag);
    280244    ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    … …  
    286250    ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    287251    ok(memoryFlag== false, "no memory leaks");
    288     testUnaryOpM( dasin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, 90.0, errorFlag, memoryFlag);
    289     ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    290     ok(memoryFlag== false, "no memory leaks");
    291252    testUnaryOpM( acos, S32, 0, 0, 3, 2, M_PI_2, errorFlag, memoryFlag);
    292253    ok(errorFlag== false, "psUnaryOp(): acos was successful");
    … …  
    298259    ok(errorFlag== false, "psUnaryOp(): acos was successful");
    299260    ok(memoryFlag== false, "no memory leaks");
    300     testUnaryOpM( acos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, M_PI_2, errorFlag, memoryFlag);
    301     ok(errorFlag== false, "psUnaryOp(): acos was successful");
    302     ok(memoryFlag== false, "no memory leaks");
    303261    testUnaryOpM( dacos, S32, 0, 0, 3, 2, 90, errorFlag, memoryFlag);
    304262    ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    … …  
    310268    ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    311269    ok(memoryFlag== false, "no memory leaks");
    312     testUnaryOpM( dacos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 90.0, errorFlag, memoryFlag);
    313     ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    314     ok(memoryFlag== false, "no memory leaks");
    315270    testUnaryOpM( atan, S32, 1, 0, 3, 2, M_PI_4, errorFlag, memoryFlag);
    316271    ok(errorFlag== false, "psUnaryOp(): atan was successful");
    … …  
    322277    ok(errorFlag== false, "psUnaryOp(): atan was successful");
    323278    ok(memoryFlag== false, "no memory leaks");
    324     testUnaryOpM( atan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, M_PI_4, errorFlag, memoryFlag);
    325     ok(errorFlag== false, "psUnaryOp(): atan was successful");
    326     ok(memoryFlag== false, "no memory leaks");
    327279    testUnaryOpM( datan, S32, 1, 0, 3, 2, 45, errorFlag, memoryFlag);
    328280    ok(errorFlag== false, "psUnaryOp(): datan was successful");
    … …  
    334286    ok(errorFlag== false, "psUnaryOp(): datan was successful");
    335287    ok(memoryFlag== false, "no memory leaks");
    336     testUnaryOpM( datan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, 45.0, errorFlag, memoryFlag);
    337     ok(errorFlag== false, "psUnaryOp(): datan was successful");
    338     ok(memoryFlag== false, "no memory leaks");
    339288
    340289    testUnaryOpV( abs, S32, -10, 0, 3, 10, errorFlag, memoryFlag);
    … …  
    347296    ok(errorFlag== false, "psUnaryOp(): abs was successful");
    348297    ok(memoryFlag== false, "no memory leaks");
    349     testUnaryOpV( abs, C32, -10.0 - 10.0i, 0.0 + 0.0i, 3, 10+10i, errorFlag, memoryFlag);
    350     ok(errorFlag== false, "psUnaryOp(): abs was successful");
    351     ok(memoryFlag== false, "no memory leaks");
    352298    testUnaryOpV( exp, S32, 10, 0, 3, cexp(10), errorFlag, memoryFlag);
    353299    ok(errorFlag== false, "psUnaryOp(): exp was successful");
    … …  
    359305    ok(errorFlag== false, "psUnaryOp(): exp was successful");
    360306    ok(memoryFlag== false, "no memory leaks");
    361     testUnaryOpV( exp, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, cexp(1.0+1.0i), errorFlag, memoryFlag);
    362     ok(errorFlag== false, "psUnaryOp(): exp was successful");
    363     ok(memoryFlag== false, "no memory leaks");
    364307    testUnaryOpV( ln, S32, 10, 0, 3, clog(10), errorFlag, memoryFlag);
    365308    ok(errorFlag== false, "psUnaryOp(): ln was successful");
    … …  
    371314    ok(errorFlag== false, "psUnaryOp(): ln was successful");
    372315    ok(memoryFlag== false, "no memory leaks");
    373     testUnaryOpV( ln, C32, 10.0 + 10.0i, 0.0 + 0.0i, 3, clog(10.0+10.0i), errorFlag, memoryFlag);
    374     ok(errorFlag== false, "psUnaryOp(): ln was successful");
    375     ok(memoryFlag== false, "no memory leaks");
    376316    testUnaryOpV( ten, S32, 3, 0, 3, 1000, errorFlag, memoryFlag);
    377317    ok(errorFlag== false, "psUnaryOp(): ten was successful");
    … …  
    383323    ok(errorFlag== false, "psUnaryOp(): ten was successful");
    384324    ok(memoryFlag== false, "no memory leaks");
    385     testUnaryOpV( ten, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 10.0, errorFlag, memoryFlag);
    386     ok(errorFlag== false, "psUnaryOp(): ten was successful");
    387     ok(memoryFlag== false, "no memory leaks");
    388325    testUnaryOpV( log, S32, 1000, 0, 3,  3, errorFlag, memoryFlag);
    389326    ok(errorFlag== false, "psUnaryOp(): log was successful");
    … …  
    395332    ok(errorFlag== false, "psUnaryOp(): log was successful");
    396333    ok(memoryFlag== false, "no memory leaks");
    397     testUnaryOpV( log, C32, 1000.0 + 0.0i, 0.0 + 0.0i, 3, 3, errorFlag, memoryFlag);
    398     ok(errorFlag== false, "psUnaryOp(): log was successful");
    399     ok(memoryFlag== false, "no memory leaks");
    400334    testUnaryOpV( sin, S32, M_PI_2, 0, 3, 1, errorFlag, memoryFlag);
    401335    ok(errorFlag== false, "psUnaryOp(): sin was successful");
    … …  
    407341    ok(errorFlag== false, "psUnaryOp(): sin was successful");
    408342    ok(memoryFlag== false, "no memory leaks");
    409     testUnaryOpV( sin, C32, M_PI_2 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag);
    410     ok(errorFlag== false, "psUnaryOp(): sin was successful");
    411     ok(memoryFlag== false, "no memory leaks");
    412343    testUnaryOpV( dsin, S32, 90, 0, 3, 1, errorFlag, memoryFlag);
    413344    ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    … …  
    419350    ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    420351    ok(memoryFlag== false, "no memory leaks");
    421     testUnaryOpV( dsin, C32, 90.0 + 00.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag);
    422     ok(errorFlag== false, "psUnaryOp(): dsin was successful");
    423     ok(memoryFlag== false, "no memory leaks");
    424352    testUnaryOpV( cos, S32, 0, 0, 3, 1, errorFlag, memoryFlag);
    425353    ok(errorFlag== false, "psUnaryOp(): cos was successful");
    … …  
    431359    ok(errorFlag== false, "psUnaryOp(): cos was successful");
    432360    ok(memoryFlag== false, "no memory leaks");
    433     testUnaryOpV( cos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag);
    434     ok(errorFlag== false, "psUnaryOp(): cos was successful");
    435     ok(memoryFlag== false, "no memory leaks");
    436361    testUnaryOpV( dcos, S32, 0, 0, 3, 1, errorFlag, memoryFlag);
    437362    ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    … …  
    443368    ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    444369    ok(memoryFlag== false, "no memory leaks");
    445     testUnaryOpV( dcos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag);
    446     ok(errorFlag== false, "psUnaryOp(): dcos was successful");
    447     ok(memoryFlag== false, "no memory leaks");
    448370    testUnaryOpV( tan, S32, M_PI_4, 0, 3, 1, errorFlag, memoryFlag);
    449371    ok(errorFlag== false, "psUnaryOp(): tan was successful");
    … …  
    455377    ok(errorFlag== false, "psUnaryOp(): tan was successful");
    456378    ok(memoryFlag== false, "no memory leaks");
    457     testUnaryOpV( tan, C32, M_PI_4 + 0.0i, 0.0 + 0.0i, 3, 1, errorFlag, memoryFlag);
    458     ok(errorFlag== false, "psUnaryOp(): tan was successful");
    459     ok(memoryFlag== false, "no memory leaks");
    460379    testUnaryOpV( dtan, S32, 45, 0, 3, 1, errorFlag, memoryFlag);
    461380    ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    … …  
    467386    ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    468387    ok(memoryFlag== false, "no memory leaks");
    469     testUnaryOpV( dtan, C32, 45.0 + 45.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag);
    470     ok(errorFlag== false, "psUnaryOp(): dtan was successful");
    471     ok(memoryFlag== false, "no memory leaks");
    472388    testUnaryOpV( asin, S32, 1, 0, 3, M_PI_2, errorFlag, memoryFlag);
    473389    ok(errorFlag== false, "psUnaryOp(): asin was successful");
    … …  
    479395    ok(errorFlag== false, "psUnaryOp(): asin was successful");
    480396    ok(memoryFlag== false, "no memory leaks");
    481     testUnaryOpV( asin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, M_PI_2, errorFlag, memoryFlag);
    482     ok(errorFlag== false, "psUnaryOp(): asin was successful");
    483     ok(memoryFlag== false, "no memory leaks");
    484397    testUnaryOpV( dasin, S32, 1.0, 0, 3, 90, errorFlag, memoryFlag);
    485398    ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    … …  
    491404    ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    492405    ok(memoryFlag== false, "no memory leaks");
    493     testUnaryOpV( dasin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 90.0, errorFlag, memoryFlag);
    494     ok(errorFlag== false, "psUnaryOp(): dasin was successful");
    495     ok(memoryFlag== false, "no memory leaks");
    496406    testUnaryOpV( acos, S32, 0, 0, 3, M_PI_2, errorFlag, memoryFlag);
    497407    ok(errorFlag== false, "psUnaryOp(): acos was successful");
    … …  
    503413    ok(errorFlag== false, "psUnaryOp(): acos was successful");
    504414    ok(memoryFlag== false, "no memory leaks");
    505     testUnaryOpV( acos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, M_PI_2, errorFlag, memoryFlag);
    506     ok(errorFlag== false, "psUnaryOp(): acos was successful");
    507     ok(memoryFlag== false, "no memory leaks");
    508415    testUnaryOpV( dacos, S32, 0, 0, 3, 90, errorFlag, memoryFlag);
    509416    ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    … …  
    515422    ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    516423    ok(memoryFlag== false, "no memory leaks");
    517     testUnaryOpV( dacos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 90.0, errorFlag, memoryFlag);
    518     ok(errorFlag== false, "psUnaryOp(): dacos was successful");
    519     ok(memoryFlag== false, "no memory leaks");
    520424    testUnaryOpV( atan, S32, 1, 0, 3, M_PI_4, errorFlag, memoryFlag);
    521425    ok(errorFlag== false, "psUnaryOp(): atan was successful");
    … …  
    527431    ok(errorFlag== false, "psUnaryOp(): atan was successful");
    528432    ok(memoryFlag== false, "no memory leaks");
    529     testUnaryOpV( atan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, M_PI_4, errorFlag, memoryFlag);
    530     ok(errorFlag== false, "psUnaryOp(): atan was successful");
    531     ok(memoryFlag== false, "no memory leaks");
    532433    testUnaryOpV( datan, S32, 1, 0, 3, 45, errorFlag, memoryFlag);
    533434    ok(errorFlag== false, "psUnaryOp(): datan was successful");
    … …  
    539440    ok(errorFlag== false, "psUnaryOp(): datan was successful");
    540441    ok(memoryFlag== false, "no memory leaks");
    541     testUnaryOpV( datan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 45.0, errorFlag, memoryFlag);
    542     ok(errorFlag== false, "psUnaryOp(): datan was successful");
    543     ok(memoryFlag== false, "no memory leaks");
    544442
    545443    return 0;

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

    r10945 r12431  
    99 *     Inconsistent dimensionality
    1010 *     Division by zero
    11  *     Attempt to use min with complex numbers
    12  *     Attempt to use max with complex numbers
    1311 *     Invalid operation
    1412 *
    … …  
    1715 *  @author  Ross Harman, MHPCC
    1816 *
    19  *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    20  *  @date  $Date: 2007-01-06 00:48:54 $
     17 *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     18 *  @date  $Date: 2007-03-14 00:39:51 $
    2119 *
    2220 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5654    CREATE_AND_SET_IMAGE(image3,F32,0,3,3);
    5755    CREATE_AND_SET_IMAGE(image4,F64,0,2,2);
    58     CREATE_AND_SET_IMAGE(image5,C32,1+1i,3,3);
    5956    CREATE_AND_SET_VECTOR(vector1,F64,0,2);
    6057    CREATE_AND_SET_VECTOR(vector2,F64,0,3);
    … …  
    203200        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    204201    }
    205 
    206     // Attempt to use min with complex numbers
    207     // Following should generate error message
    208     if (0) {
    209         psMemId id = psMemGetId();
    210         psImage* image6 = (psImage*)psBinaryOp(image6, image5, "min", image5);
    211         ok(image6 == NULL, "psUnaryOp returned NULL with min of complex numbers");
    212         psFree(image6);
    213         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    214     }
    215 
    216 
    217     // Attempt to use max with complex numbers
    218     // Following should generate an error message
    219     if (0) {
    220         psMemId id = psMemGetId();
    221         psImage* image6 = (psImage*)psBinaryOp(image6, image5, "max", image5);
    222         ok(image6 == NULL, "psUnaryOp returned NULL with max of complex numbers");
    223         psFree(image6);
    224         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    225     }
    226 
    227202
    228203    // Invalid operation
Note: See TracChangeset for help on using the changeset viewer.