Index: trunk/psLib/test/math/tap_psMatrix02.c =================================================================== --- trunk/psLib/test/math/tap_psMatrix02.c (revision 12247) +++ trunk/psLib/test/math/tap_psMatrix02.c (revision 12431) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-12-20 20:02:29 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-14 00:39:51 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ psMemId id = psMemGetId(); psImage *outImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64); - psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_C32); + psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_U8); psMemIncrRefCounter(outImage); ok(psMatrixTranspose(outImage, badImage1) == NULL, "psMatrixTranspose(): inImage = outImage results in NULL return"); @@ -69,5 +69,5 @@ psMemId id = psMemGetId(); psImage *inImage = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64); - psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_C32); + psImage *badImage1 = (psImage*)psImageAlloc(3, 3, PS_TYPE_U8); badImage1 = psMatrixTranspose(badImage1, inImage); ok(badImage1 != NULL, "psMatrixTranspose() results in non-NULL return"); Index: trunk/psLib/test/math/tap_psMatrixVectorArithmetic01.c =================================================================== --- trunk/psLib/test/math/tap_psMatrixVectorArithmetic01.c (revision 12247) +++ trunk/psLib/test/math/tap_psMatrixVectorArithmetic01.c (revision 12431) @@ -4,12 +4,12 @@ * * This test driver tests combinations of matrix, vector, and scalar binary operations including: - * Matrix-matrix with +,-,*,/ with S32, F32, F64, C32 - * Matrix-vector with +,-,*,/ with S32, F32, F64, C32 - * Matrix-scalar with +,-,*,/ with S32, F32, F64, C32 + * Matrix-matrix with +,-,*,/ with S32, F32, F64 + * Matrix-vector with +,-,*,/ with S32, F32, F64 + * Matrix-scalar with +,-,*,/ with S32, F32, F64 * * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-30 00:11:31 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-14 00:39:51 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -140,7 +140,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, +, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMM(+,C32,10.0+10.0i,10.0+10.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, +, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMM(-,S32,20,10,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, -, S32)"); @@ -161,7 +158,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, *, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMM(*,C32,20.0+20.0i,10.0+10.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, *, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMM(/,S32,20,10,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, S32)"); @@ -172,7 +166,4 @@ testBinaryOpMM(/,F64,20.0,10.0,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, F64)"); - ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMM(/,C32,20.0+20.0i,10.0+10.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-matrix, /, C32)"); ok(memoryFlag== false, "no memory leaks"); @@ -187,7 +178,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, +, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMV(+,C32,10.0+10.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, +, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMV(-,S32,20,5,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, -, S32)"); @@ -208,7 +196,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, *, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMV(*,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, *, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMV(/,S32,20,5,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, S32)"); @@ -219,7 +204,4 @@ testBinaryOpMV(/,F64,20.0,5.0,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, F64)"); - ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMV(/,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-vector, /, C32)"); ok(memoryFlag== false, "no memory leaks"); @@ -234,7 +216,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, +, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMS(+,C32,10.0+10.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, +, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMS(-,S32,20,5,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, -, S32)"); @@ -255,7 +234,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, *, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMS(*,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, *, C32)"); - ok(memoryFlag== false, "no memory leaks"); testBinaryOpMS(/,S32,20,5,3,2,errorFlag,memoryFlag); ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, S32)"); @@ -267,7 +243,4 @@ ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, F64)"); ok(memoryFlag== false, "no memory leaks"); - testBinaryOpMS(/,C32,20.0+20.0i,5.0+5.0i,3,2,errorFlag,memoryFlag); - ok(errorFlag== false, "psBinaryOp(): was successful: (matrix-scalar, /, C32)"); - ok(memoryFlag== false, "no memory leaks"); return 0; } Index: trunk/psLib/test/math/tap_psMatrixVectorArithmetic02.c =================================================================== --- trunk/psLib/test/math/tap_psMatrixVectorArithmetic02.c (revision 12247) +++ trunk/psLib/test/math/tap_psMatrixVectorArithmetic02.c (revision 12431) @@ -5,11 +5,11 @@ * * This test driver tests combinations of matrix, vector, and scalar unary operations including: - * Matrix with all math operators with S32, F32, F64, C32 - * Vector with all math operators with S32, F32, F64, C32 + * Matrix with all math operators with S32, F32, F64 + * Vector with all math operators with S32, F32, F64 * * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-06 00:48:54 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-14 00:39:51 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -142,7 +142,4 @@ ok(errorFlag== false, "psUnaryOp(): abs was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( abs, C32, -10.0 - 10.0i, 0.0 + 0.0i, 3, 2,10+10i, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): abs was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( exp, S32, 10, 0, 3, 2, exp(10), errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): exp was successful"); @@ -154,7 +151,4 @@ ok(errorFlag== false, "psUnaryOp(): exp was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( exp, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, cexp(1.0+1.0i), errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): exp was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( ln, S32, 10, 0, 3, 2, clog(10), errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): ln was successful"); @@ -166,7 +160,4 @@ ok(errorFlag== false, "psUnaryOp(): ln was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( ln, C32, 10.0 + 10.0i, 0.0 + 0.0i, 3, 2, clog(10.0+10.0i), errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): ln was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( ten, S32, 3, 0, 3, 2, 1000, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): ten was successful"); @@ -178,7 +169,4 @@ ok(errorFlag== false, "psUnaryOp(): ten was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( ten, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, 10.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): ten was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( log, S32, 1000, 0, 3, 2, 3, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): log was successful"); @@ -190,7 +178,4 @@ ok(errorFlag== false, "psUnaryOp(): log was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( log, C32, 1000.0 + 0.0i, 0.0 + 0.0i, 3, 2, 3, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): log was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( sin, S32, M_PI_2, 0, 3, 2, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): sin was successful"); @@ -202,7 +187,4 @@ ok(errorFlag== false, "psUnaryOp(): sin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( sin, C32, M_PI_2 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): sin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( dsin, S32, 90, 0, 3, 2 , 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dsin was successful"); @@ -214,7 +196,4 @@ ok(errorFlag== false, "psUnaryOp(): dsin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( dsin, C32, 90.0 + 00.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dsin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( cos, S32, 0, 0, 3, 2, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): cos was successful"); @@ -226,7 +205,4 @@ ok(errorFlag== false, "psUnaryOp(): cos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( cos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): cos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( dcos, S32, 0, 0, 3, 2, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dcos was successful"); @@ -238,7 +214,4 @@ ok(errorFlag== false, "psUnaryOp(): dcos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( dcos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dcos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( tan, S32, M_PI_4, 0, 3, 2, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): tan was successful"); @@ -250,7 +223,4 @@ ok(errorFlag== false, "psUnaryOp(): tan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( tan, C32, M_PI_4 + 0.0i, 0.0 + 0.0i, 3, 2, 1, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): tan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( dtan, S32, 45, 0, 3, 2, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dtan was successful"); @@ -262,7 +232,4 @@ ok(errorFlag== false, "psUnaryOp(): dtan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( dtan, C32, 45.0 + 45.0i, 0.0 + 0.0i, 3, 2, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dtan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( asin, S32, 1, 0, 3, 2, M_PI_2, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): asin was successful"); @@ -274,7 +241,4 @@ ok(errorFlag== false, "psUnaryOp(): asin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( asin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, M_PI_2, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): asin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( dasin, S32, 1.0, 0, 3, 2, 90, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dasin was successful"); @@ -286,7 +250,4 @@ ok(errorFlag== false, "psUnaryOp(): dasin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( dasin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 2, 90.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dasin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( acos, S32, 0, 0, 3, 2, M_PI_2, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): acos was successful"); @@ -298,7 +259,4 @@ ok(errorFlag== false, "psUnaryOp(): acos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( acos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, M_PI_2, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): acos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( dacos, S32, 0, 0, 3, 2, 90, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dacos was successful"); @@ -310,7 +268,4 @@ ok(errorFlag== false, "psUnaryOp(): dacos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( dacos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 2, 90.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dacos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( atan, S32, 1, 0, 3, 2, M_PI_4, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): atan was successful"); @@ -322,7 +277,4 @@ ok(errorFlag== false, "psUnaryOp(): atan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( atan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, M_PI_4, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): atan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpM( datan, S32, 1, 0, 3, 2, 45, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): datan was successful"); @@ -334,7 +286,4 @@ ok(errorFlag== false, "psUnaryOp(): datan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpM( datan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 2, 45.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): datan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( abs, S32, -10, 0, 3, 10, errorFlag, memoryFlag); @@ -347,7 +296,4 @@ ok(errorFlag== false, "psUnaryOp(): abs was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( abs, C32, -10.0 - 10.0i, 0.0 + 0.0i, 3, 10+10i, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): abs was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( exp, S32, 10, 0, 3, cexp(10), errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): exp was successful"); @@ -359,7 +305,4 @@ ok(errorFlag== false, "psUnaryOp(): exp was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( exp, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, cexp(1.0+1.0i), errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): exp was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( ln, S32, 10, 0, 3, clog(10), errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): ln was successful"); @@ -371,7 +314,4 @@ ok(errorFlag== false, "psUnaryOp(): ln was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( ln, C32, 10.0 + 10.0i, 0.0 + 0.0i, 3, clog(10.0+10.0i), errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): ln was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( ten, S32, 3, 0, 3, 1000, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): ten was successful"); @@ -383,7 +323,4 @@ ok(errorFlag== false, "psUnaryOp(): ten was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( ten, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 10.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): ten was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( log, S32, 1000, 0, 3, 3, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): log was successful"); @@ -395,7 +332,4 @@ ok(errorFlag== false, "psUnaryOp(): log was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( log, C32, 1000.0 + 0.0i, 0.0 + 0.0i, 3, 3, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): log was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( sin, S32, M_PI_2, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): sin was successful"); @@ -407,7 +341,4 @@ ok(errorFlag== false, "psUnaryOp(): sin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( sin, C32, M_PI_2 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): sin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( dsin, S32, 90, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dsin was successful"); @@ -419,7 +350,4 @@ ok(errorFlag== false, "psUnaryOp(): dsin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( dsin, C32, 90.0 + 00.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dsin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( cos, S32, 0, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): cos was successful"); @@ -431,7 +359,4 @@ ok(errorFlag== false, "psUnaryOp(): cos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( cos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): cos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( dcos, S32, 0, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dcos was successful"); @@ -443,7 +368,4 @@ ok(errorFlag== false, "psUnaryOp(): dcos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( dcos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dcos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( tan, S32, M_PI_4, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): tan was successful"); @@ -455,7 +377,4 @@ ok(errorFlag== false, "psUnaryOp(): tan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( tan, C32, M_PI_4 + 0.0i, 0.0 + 0.0i, 3, 1, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): tan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( dtan, S32, 45, 0, 3, 1, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dtan was successful"); @@ -467,7 +386,4 @@ ok(errorFlag== false, "psUnaryOp(): dtan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( dtan, C32, 45.0 + 45.0i, 0.0 + 0.0i, 3, 1.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dtan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( asin, S32, 1, 0, 3, M_PI_2, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): asin was successful"); @@ -479,7 +395,4 @@ ok(errorFlag== false, "psUnaryOp(): asin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( asin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, M_PI_2, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): asin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( dasin, S32, 1.0, 0, 3, 90, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dasin was successful"); @@ -491,7 +404,4 @@ ok(errorFlag== false, "psUnaryOp(): dasin was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( dasin, C32, 1.0 + 1.0i, 0.0 + 0.0i, 3, 90.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dasin was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( acos, S32, 0, 0, 3, M_PI_2, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): acos was successful"); @@ -503,7 +413,4 @@ ok(errorFlag== false, "psUnaryOp(): acos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( acos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, M_PI_2, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): acos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( dacos, S32, 0, 0, 3, 90, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): dacos was successful"); @@ -515,7 +422,4 @@ ok(errorFlag== false, "psUnaryOp(): dacos was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( dacos, C32, 0.0 + 0.0i, 0.0 + 0.0i, 3, 90.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): dacos was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( atan, S32, 1, 0, 3, M_PI_4, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): atan was successful"); @@ -527,7 +431,4 @@ ok(errorFlag== false, "psUnaryOp(): atan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( atan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, M_PI_4, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): atan was successful"); - ok(memoryFlag== false, "no memory leaks"); testUnaryOpV( datan, S32, 1, 0, 3, 45, errorFlag, memoryFlag); ok(errorFlag== false, "psUnaryOp(): datan was successful"); @@ -539,7 +440,4 @@ ok(errorFlag== false, "psUnaryOp(): datan was successful"); ok(memoryFlag== false, "no memory leaks"); - testUnaryOpV( datan, C32, 1.0 + 0.0i, 0.0 + 0.0i, 3, 45.0, errorFlag, memoryFlag); - ok(errorFlag== false, "psUnaryOp(): datan was successful"); - ok(memoryFlag== false, "no memory leaks"); return 0; Index: trunk/psLib/test/math/tap_psMatrixVectorArithmetic03.c =================================================================== --- trunk/psLib/test/math/tap_psMatrixVectorArithmetic03.c (revision 12247) +++ trunk/psLib/test/math/tap_psMatrixVectorArithmetic03.c (revision 12431) @@ -9,6 +9,4 @@ * Inconsistent dimensionality * Division by zero - * Attempt to use min with complex numbers - * Attempt to use max with complex numbers * Invalid operation * @@ -17,6 +15,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-01-06 00:48:54 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-14 00:39:51 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +54,4 @@ CREATE_AND_SET_IMAGE(image3,F32,0,3,3); CREATE_AND_SET_IMAGE(image4,F64,0,2,2); - CREATE_AND_SET_IMAGE(image5,C32,1+1i,3,3); CREATE_AND_SET_VECTOR(vector1,F64,0,2); CREATE_AND_SET_VECTOR(vector2,F64,0,3); @@ -203,26 +200,4 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - // Attempt to use min with complex numbers - // Following should generate error message - if (0) { - psMemId id = psMemGetId(); - psImage* image6 = (psImage*)psBinaryOp(image6, image5, "min", image5); - ok(image6 == NULL, "psUnaryOp returned NULL with min of complex numbers"); - psFree(image6); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - // Attempt to use max with complex numbers - // Following should generate an error message - if (0) { - psMemId id = psMemGetId(); - psImage* image6 = (psImage*)psBinaryOp(image6, image5, "max", image5); - ok(image6 == NULL, "psUnaryOp returned NULL with max of complex numbers"); - psFree(image6); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - // Invalid operation