Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic.c (revision 1111) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic.c (revision 1112) @@ -1,16 +1,15 @@ /** @file tst_psMatrix_01.c * - * @brief Test driver for psMatrix transpose function - * - * This test driver contains the following tests for psMatrix test point 1: - * A) Create input and output images - * B) Transpose input image into output image - * C) Transpose input image into auto allocated NULL output image - * D) Free images and check for leaks + * @brief Test driver for psMatrixVector arithmetic functions + * + * 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 * * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-24 18:59:57 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-29 01:36:26 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,86 +20,183 @@ #include "psTest.h" -#define PRINT_MATRIX(IMAGE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - printf("%f ", IMAGE->data.F64[i][j]); \ - } \ - printf("\n"); \ -} \ +#define PRINT_SCALAR(SCALAR,TYPE) \ +if(PS_IS_PSELEMTYPE_COMPLEX(SCALAR->type.type)) { \ + printf("%f+%fi ", creal(SCALAR->data.TYPE), cimag(SCALAR->data.TYPE)); \ +} else if(PS_IS_PSELEMTYPE_INT(SCALAR->type.type)) { \ + printf("%d ", (int)SCALAR->data.TYPE); \ +} else { \ + printf("%f ", (double)SCALAR->data.TYPE); \ +} \ +printf("\n\n"); + +#define PRINT_VECTOR(VECTOR,TYPE) \ +for(int i=0; in; i++) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) { \ + printf("%f+%fi ", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i])); \ + } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ + printf("%d ", (int)VECTOR->data.TYPE[i]); \ + } else { \ + printf("%f ", (double)VECTOR->data.TYPE[i]); \ + } \ +} \ +printf("\n\n"); + + +#define PRINT_MATRIX(IMAGE,TYPE) \ +for(int i=IMAGE->numRows-1; i>-1; i--) { \ + for(int j=0; jnumCols; j++) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ + printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ + } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ + printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ + } else { \ + printf("%f ", (double)IMAGE->data.TYPE[i][j]); \ + } \ + } \ + printf("\n"); \ +} \ printf("\n"); -int main(int argc, - char* argv[]) + +#define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE) \ +psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE); \ +for(int i=0; idata.TYPE[i] = VALUE; \ +} \ +NAME->n = SIZE; + + +#define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ +psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ +for(int i=0; inumRows; i++) { \ + for(int j=0; jnumCols; j++) { \ + NAME->data.TYPE[i][j] = VALUE; \ + } \ +} + + +#define CHECK_MEMORY \ +psMemCheckLeaks(0, NULL, stdout); \ +int nBad = psMemCheckCorruption(0); \ +if(nBad) { \ + printf("ERROR: Found %d bad memory blocks\n", nBad); \ +} + + +int main(int argc, char* argv[]) { - psVector *psVec1 = psVectorAlloc(5, PS_TYPE_S32); - psVector *psVec2 = psVectorAlloc(5, PS_TYPE_S32); - - for(int i = 0; i < 5; i++) { - psVec1->data.S32[i] = i*10; - psVec1->n++; - psVec2->data.S32[i] = i*10; - psVec2->n++; + + // Test matrix-matrix binary operations + #define testBinaryOpMM(OP,TYPE,VALUE1,VALUE2,NROWS,NCOLS) \ + { \ + printPositiveTestHeader(stdout, "psMatrixVectorArithmetic", "Test matrix-matrix psBinaryOp"); \ + printf("Operation: %s\n", #OP); \ + CREATE_AND_SET_IMAGE(inImage,TYPE,VALUE1,NROWS,NCOLS); \ + CREATE_AND_SET_IMAGE(outImage,TYPE,VALUE2,NROWS,NCOLS); \ + printf("Input:\n"); \ + PRINT_MATRIX(inImage,TYPE); \ + PRINT_MATRIX(outImage,TYPE); \ + outImage = (psImage*)psBinaryOp(outImage, inImage, #OP, outImage); \ + printf("Output:\n"); \ + PRINT_MATRIX(outImage,TYPE); \ + psFree(inImage); \ + psFree(outImage); \ + CHECK_MEMORY; \ + printFooter(stdout, "psMatrixVectorArithmetic", "Test matrix-matrix psBinaryOp", true); \ } - psVec1 =(psVector*)psBinaryOp(psVec1, psVec1, "+", psVec2); - for(int i = 0; i < 5; i++) { - printf("%d\n", psVec1->data.S32[i]); + + testBinaryOpMM(+,S32,10,10,3,2); + testBinaryOpMM(+,F32,10.0,10.0,3,2); + testBinaryOpMM(+,F64,10.0,10.0,3,2); + testBinaryOpMM(+,C32,10.0+10.0i,10.0+10.0i,3,2); + testBinaryOpMM(-,S32,20,10,3,2); + testBinaryOpMM(-,F32,20.0,10.0,3,2); + testBinaryOpMM(-,F64,20.0,10.0,3,2); + testBinaryOpMM(*,C32,20.0+20.0i,10.0+10.0i,3,2); + testBinaryOpMM(*,S32,20,10,3,2); + testBinaryOpMM(*,F32,20.0,10.0,3,2); + testBinaryOpMM(*,F64,20.0,10.0,3,2); + testBinaryOpMM(*,C32,20.0+20.0i,10.0+10.0i,3,2); + testBinaryOpMM(/,C32,20.0+20.0i,10.0+10.0i,3,2); + testBinaryOpMM(/,S32,20,10,3,2); + testBinaryOpMM(/,F32,20.0,10.0,3,2); + testBinaryOpMM(/,F64,20.0,10.0,3,2); + testBinaryOpMM(/,C32,20.0+20.0i,10.0+10.0i,3,2); + + // Test Matrix-Vector binary operations + #define testBinaryOpMV(OP,TYPE,VALUE1,VALUE2,NROWS,NCOLS) \ + { \ + printPositiveTestHeader(stdout, "psMatrixVectorArithmetic", "Test matrix-vector psBinaryOp"); \ + printf("Operation: %s\n", #OP); \ + CREATE_AND_SET_IMAGE(outImage,TYPE,VALUE1,NROWS,NCOLS); \ + CREATE_AND_SET_VECTOR(inVector,TYPE,VALUE2,NROWS); \ + printf("Input:\n"); \ + PRINT_MATRIX(outImage,TYPE); \ + PRINT_VECTOR(inVector,TYPE); \ + outImage = (psImage*)psBinaryOp(outImage, outImage, #OP, inVector); \ + printf("Output:\n"); \ + PRINT_MATRIX(outImage,TYPE); \ + psFree(inVector); \ + psFree(outImage); \ + CHECK_MEMORY; \ + printFooter(stdout, "psMatrixVectorArithmetic", "Test matrix-vector psBinaryOp", true); \ } - psImage *inImage = (psImage*)psImageAlloc(5, 5, PS_TYPE_F64); - psImage *outImage = (psImage*)psImageAlloc(5, 5, PS_TYPE_F64); - for(int i = 0; i < 5; i++) { - for(int j = 0; j < 5; j++) { - inImage->data.F64[i][j] = i*10; - outImage->data.F64[i][j] = i*10; - } + testBinaryOpMV(+,S32,10,5,3,2); + testBinaryOpMV(+,F32,10.0,5.0,3,2); + testBinaryOpMV(+,F64,10.0,5.0,3,2); + testBinaryOpMV(+,C32,10.0+10.0i,5.0+5.0i,3,2); + testBinaryOpMV(-,S32,20,5,3,2); + testBinaryOpMV(-,F32,20.0,5.0,3,2); + testBinaryOpMV(-,F64,20.0,5.0,3,2); + testBinaryOpMV(*,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMV(*,S32,20,5,3,2); + testBinaryOpMV(*,F32,20.0,5.0,3,2); + testBinaryOpMV(*,F64,20.0,5.0,3,2); + testBinaryOpMV(*,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMV(/,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMV(/,S32,20,5,3,2); + testBinaryOpMV(/,F32,20.0,5.0,3,2); + testBinaryOpMV(/,F64,20.0,5.0,3,2); + testBinaryOpMV(/,C32,20.0+20.0i,5.0+5.0i,3,2); + + // Test Matrix-Scalar binary operations + #define testBinaryOpMS(OP,TYPE,VALUE1,VALUE2,NROWS,NCOLS) \ + { \ + printPositiveTestHeader(stdout, "psMatrixVectorArithmetic", "Test matrix-scalar psBinaryOp"); \ + printf("Operation: %s\n", #OP); \ + CREATE_AND_SET_IMAGE(outImage,TYPE,VALUE1,NROWS,NCOLS); \ + psScalar *inScalar = (psScalar*)psScalarAlloc(VALUE2,PS_TYPE_##TYPE); \ + printf("Input:\n"); \ + PRINT_MATRIX(outImage,TYPE); \ + PRINT_SCALAR(inScalar,TYPE); \ + outImage = (psImage*)psBinaryOp(outImage, outImage, #OP, inScalar); \ + printf("Output:\n"); \ + PRINT_MATRIX(outImage,TYPE); \ + psFree(inScalar); \ + psFree(outImage); \ + CHECK_MEMORY; \ + printFooter(stdout, "psMatrixVectorArithmetic", "Test matrix-scalar psBinaryOp", true); \ } - outImage =(psImage*)psBinaryOp(outImage, outImage, "+", inImage); - PRINT_MATRIX(outImage); - - - psImage *outImage2 = (psImage*)psImageAlloc(5, 5, PS_TYPE_F64); - for(int i = 0; i < 5; i++) { - for(int j = 0; j < 5; j++) { - outImage2->data.F64[i][j] = i*10; - } - } - outImage2 =(psImage*)psBinaryOp(outImage2, outImage, "+", psScalarAlloc(2, PS_TYPE_F64)); - PRINT_MATRIX(outImage); - - - psVector *psVec3 = psVectorAlloc(4, PS_TYPE_F64); - for(int i = 0; i < 4; i++) { - psVec3->data.F64[i] = i; - psVec3->n++; - } - psImage *inImage3 = (psImage*)psImageAlloc(3, 4, PS_TYPE_F64); - psImage *outImage3 = (psImage*)psImageAlloc(3, 4, PS_TYPE_F64); - for(int i = 0; i < 4; i++) { - for(int j = 0; j < 3; j++) { - inImage3->data.F64[i][j] = 10.0; - outImage3->data.F64[i][j] = 0.0; - } - } - outImage3 =(psImage*)psBinaryOp(outImage3, psVec3, "+", inImage3); - PRINT_MATRIX(outImage3); - - - psVector *psVec4 = psVectorAlloc(4, PS_TYPE_F64); - psVec4->type.dimen = PS_DIMEN_TRANSV; - for(int i = 0; i < 4; i++) { - psVec4->data.F64[i] = i; - psVec4->n++; - } - psImage *inImage4 = (psImage*)psImageAlloc(4, 3, PS_TYPE_F64); - psImage *outImage4 = (psImage*)psImageAlloc(4, 3, PS_TYPE_F64); - for(int i = 0; i < 3; i++) { - for(int j = 0; j < 4; j++) { - inImage4->data.F64[i][j] = 10.0; - outImage4->data.F64[i][j] = 0.0; - } - } - outImage4 =(psImage*)psBinaryOp(outImage4, inImage4, "+", psVec4); - PRINT_MATRIX(outImage4); + + testBinaryOpMS(+,S32,10,5,3,2); + testBinaryOpMS(+,F32,10.0,5.0,3,2); + testBinaryOpMS(+,F64,10.0,5.0,3,2); + testBinaryOpMS(+,C32,10.0+10.0i,5.0+5.0i,3,2); + testBinaryOpMS(-,S32,20,5,3,2); + testBinaryOpMS(-,F32,20.0,5.0,3,2); + testBinaryOpMS(-,F64,20.0,5.0,3,2); + testBinaryOpMS(*,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMS(*,S32,20,5,3,2); + testBinaryOpMS(*,F32,20.0,5.0,3,2); + testBinaryOpMS(*,F64,20.0,5.0,3,2); + testBinaryOpMS(*,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMS(/,C32,20.0+20.0i,5.0+5.0i,3,2); + testBinaryOpMS(/,S32,20,5,3,2); + testBinaryOpMS(/,F32,20.0,5.0,3,2); + testBinaryOpMS(/,F64,20.0,5.0,3,2); + testBinaryOpMS(/,C32,20.0+20.0i,5.0+5.0i,3,2); return 0; } +