Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c (revision 2701) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c (revision 2701) @@ -0,0 +1,212 @@ +/** @file tst_psMatrixVectorArithmetic04.c + * + * @brief Test driver for psBinary arithmetic operations with scalars + * + * This test driver will test the following binary operation with scalar inputs + * vector addition with scalar in first argument + * image addition with scalar in second argument + * + * @author Eric Van Alst, MHPCC + * + * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-11 03:05:54 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + * + */ + +#include "pslib.h" +#include "psTest.h" + +static psS32 testBinOpScalarFirst(void); +static psS32 testBinOpScalarSecond(void); +static psS32 testBinOpScalarBoth(void); +static psS32 testUnaryOpScalar(void); + +testDescription testsBinary[] = { + {testBinOpScalarFirst,737,"psBinaryOp",0,false}, + {testBinOpScalarSecond,737,"psBinaryOp",0,false}, + {testBinOpScalarBoth,737,"psBinaryOp",0,false}, + {NULL} + }; + +testDescription testUnary[] = { + {testUnaryOpScalar,737,"psUnaryOp",0,false}, + {NULL} + }; + +// Create vector +#define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE) \ +psVector *NAME = psVectorAlloc(SIZE,PS_TYPE_##TYPE); \ +for(psS32 i=0; idata.TYPE[i] = VALUE; \ +} \ +NAME->n = SIZE; + +// Create image +#define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ +psImage *NAME = psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ + NAME->data.TYPE[i][j] = VALUE; \ + } \ +} + +psS32 main(psS32 argc, char* argv[]) +{ + psLogSetLevel(PS_LOG_INFO); + + runTestSuite(stderr,"psBinaryOp",testsBinary,argc,argv); + runTestSuite(stderr,"psUnaryOp",testUnary,argc,argv); + + return 0; +} + +psS32 testBinOpScalarFirst(void) +{ + CREATE_AND_SET_VECTOR(vector1,S8,1,5) + CREATE_AND_SET_VECTOR(vector2,S8,0,5) + + psScalar* inScalar1 = psScalarAlloc(2,PS_TYPE_S8); + + // Add vector and scalar + vector2 = (psVector*)psBinaryOp(vector2,inScalar1,"+",vector1); + // Verify the result vector + for(psS32 i=0; in; i++) { + if(vector2->data.S8[i] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return vector[%d]",i); + return 1; + } + } + psFree(vector1); + psFree(vector2); + + CREATE_AND_SET_VECTOR(vector3,S8,1,5); + CREATE_AND_SET_VECTOR(vector4,S8,0,3); + + psScalar* inScalar2 = psScalarAlloc(2,PS_TYPE_S8); + vector4->type.dimen = PS_DIMEN_TRANSV; + vector4 = (psVector*)psBinaryOp(vector4,inScalar2,"+",vector3); + for(psS32 i=0; in; i++) { + if(vector4->data.S8[i] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return vector[%d]",i); + return 2; + } + } + psFree(vector3); + psFree(vector4); + + CREATE_AND_SET_IMAGE(image1,S8,1,5,5) + psImage* image2 = NULL; + + psScalar* inScalar3 = psScalarAlloc(2,PS_TYPE_S8); + + image2 = (psImage*)psBinaryOp(image2,inScalar3,"+",image1); + for(psS32 i=0; inumRows; i++) { + for(psS32 j=0; jnumCols; j++) { + if(image2->data.S8[i][j] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return image[%d][%d]",i,j); + return 10; + } + } + } + psFree(image1); + psFree(image2); + + return 0; +} + +psS32 testBinOpScalarSecond(void) +{ + CREATE_AND_SET_VECTOR(vector1,S8,1,5) + CREATE_AND_SET_VECTOR(vector2,S8,0,5) + + psScalar* inScalar1 = psScalarAlloc(2,PS_TYPE_S8); + + vector2 = (psVector*)psBinaryOp(vector2,vector1,"+",inScalar1); + for(psS32 i=0; in; i++) { + if(vector2->data.S8[i] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return vector[%d]",i); + return 1; + } + } + psFree(vector1); + psFree(vector2); + + CREATE_AND_SET_VECTOR(vector3,S8,1,5); + CREATE_AND_SET_VECTOR(vector4,S8,0,3); + + psScalar* inScalar2 = psScalarAlloc(2,PS_TYPE_S8); + vector4->type.dimen = PS_DIMEN_TRANSV; + vector4 = (psVector*)psBinaryOp(vector4,vector3,"+",inScalar2); + for(psS32 i=0; in; i++) { + if(vector4->data.S8[i] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return vector[%d]",i); + return 2; + } + } + psFree(vector3); + psFree(vector4); + + CREATE_AND_SET_IMAGE(image1,S8,1,5,5); + psImage* image2 = NULL; + + psScalar* inScalar3 = psScalarAlloc(2,PS_TYPE_S8); + + image2 = (psImage*)psBinaryOp(image2,image1,"+",inScalar3); + for(psS32 i=0; inumRows; i++) { + for(psS32 j=0; jnumCols; j++) { + if(image2->data.S8[i][j] != 3 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return image[%d][%d]",i,j); + return 10; + } + } + } + psFree(image1); + psFree(image2); + + return 0; +} + +psS32 testBinOpScalarBoth(void) +{ + psScalar* inScalar1 = psScalarAlloc(1,PS_TYPE_S8); + psScalar* inScalar2 = psScalarAlloc(2,PS_TYPE_S8); + psScalar* outScalar = psScalarAlloc(4,PS_TYPE_S8); + + outScalar = (psScalar*)psBinaryOp(outScalar,inScalar1,"+",inScalar2); + if(outScalar->data.S8 != 3) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return scalar"); + return 3; + } + psFree(outScalar); + + psScalar* inScalar3 = psScalarAlloc(10,PS_TYPE_S8); + psScalar* inScalar4 = psScalarAlloc(20,PS_TYPE_S8); + psScalar* outScalar1 = NULL; + + outScalar1 = (psScalar*)psBinaryOp(outScalar1,inScalar3,"+",inScalar4); + if(outScalar1->data.S8 != 30 ) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return scalar"); + return 4; + } + psFree(outScalar1); + + return 0; +} + +psS32 testUnaryOpScalar(void) +{ + psScalar* inScalar = psScalarAlloc(-1,PS_TYPE_F32); + psScalar* outScalar = NULL; + + outScalar = (psScalar*)psUnaryOp(outScalar,inScalar,"abs"); + if(outScalar->data.F32 != 1) { + psError(PS_ERR_UNKNOWN,true,"Unexpected value in return scalar = %d in = %d",outScalar->data.F32,inScalar->data.F32); + return 5; + } + psFree(outScalar); + + return 0; +} + Index: /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic04.stderr =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic04.stderr (revision 2701) +++ /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic04.stderr (revision 2701) @@ -0,0 +1,36 @@ +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMatrixVectorArithmetic04.c * +* TestPoint: psBinaryOp{psBinaryOp} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psBinaryOp{psBinaryOp} | tst_psMatrixVectorArithmetic04.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMatrixVectorArithmetic04.c * +* TestPoint: psBinaryOp{psBinaryOp} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psBinaryOp{psBinaryOp} | tst_psMatrixVectorArithmetic04.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMatrixVectorArithmetic04.c * +* TestPoint: psBinaryOp{psBinaryOp} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psBinaryOp{psBinaryOp} | tst_psMatrixVectorArithmetic04.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMatrixVectorArithmetic04.c * +* TestPoint: psUnaryOp{psUnaryOp} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psUnaryOp{psUnaryOp} | tst_psMatrixVectorArithmetic04.c) +