Index: trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c =================================================================== --- trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1085) +++ trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1088) @@ -29,6 +29,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-06-25 00:31:12 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-06-25 02:00:41 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -323,5 +323,5 @@ // Preprocessor macro function to create arithmetic function based on input type -#define LEVEL1(DIM1,DIM2,OUT,IN1,OP,IN2) \ +#define BINARY_TYPE(DIM1,DIM2,OUT,IN1,OP,IN2) \ switch (IN1->type) { \ case PS_TYPE_S8: \ @@ -366,23 +366,23 @@ // Preprocessor macro function to create arithmetic function operation name -#define LEVEL2(DIM1,DIM2,OUT,IN1,OP,IN2) \ +#define BINARY_OP(DIM1,DIM2,OUT,IN1,OP,IN2) \ if(!strncmp(OP, "+", 1)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,*i1 + *i2,IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 + *i2,IN2); \ } else if(!strncmp(OP, "-", 1)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,*i1 - *i2,IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 - *i2,IN2); \ } else if(!strncmp(OP, "*", 1)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,*i1 * *i2,IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 * *i2,IN2); \ } else if(!strncmp(OP, "/", 1)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,*i1 / *i2,IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 / *i2,IN2); \ } else if(!strncmp(OP, "^", 1)) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,cpow(*i1,*i2),IN2); \ - } else { \ - LEVEL1(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,cpow(*i1,*i2),IN2); \ + } else { \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2); \ } \ } else if(!strncmp(OP, "min", 3)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,MIN(*i1,*i2),IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,MIN(*i1,*i2),IN2); \ } else if(!strncmp(OP, "max", 3)) { \ - LEVEL1(DIM1,DIM2,OUT,IN1,MAX(*i1,*i2),IN2); \ + BINARY_TYPE(DIM1,DIM2,OUT,IN1,MAX(*i1,*i2),IN2); \ } else { \ psError(__func__, ": Line %d - Invalid operator: %s", __LINE__, #OP); \ @@ -445,9 +445,9 @@ if(dim1 == PS_DIMEN_SCALAR) { if(dim2 == PS_DIMEN_SCALAR) { - LEVEL2(SCALAR,SCALAR,out,psType1,op,psType2); // scalar op scalar + BINARY_OP(SCALAR,SCALAR,out,psType1,op,psType2); // scalar op scalar } else if(dim2==PS_DIMEN_VECTOR || dim2==PS_DIMEN_TRANSV) { - LEVEL2(SCALAR,VECTOR,out,psType1,op,psType2); // scalar op vector + BINARY_OP(SCALAR,VECTOR,out,psType1,op,psType2); // scalar op vector } else if(dim2 == PS_DIMEN_IMAGE) { - LEVEL2(SCALAR,IMAGE,out,psType1,op,psType2); // scalar op image + BINARY_OP(SCALAR,IMAGE,out,psType1,op,psType2); // scalar op image } else { psError(__func__, ": Line %d - Invalid dimensionality for in2 arg: %d", __LINE__, dim2); @@ -455,9 +455,9 @@ } else if(dim1==PS_DIMEN_VECTOR || dim1==PS_DIMEN_TRANSV) { if(dim2 == PS_DIMEN_SCALAR) { - LEVEL2(VECTOR,SCALAR,out,psType1,op,psType2); // vector op scalar + BINARY_OP(VECTOR,SCALAR,out,psType1,op,psType2); // vector op scalar } else if(dim2==PS_DIMEN_VECTOR || dim2==PS_DIMEN_TRANSV) { - LEVEL2(VECTOR,VECTOR,out,psType1,op,psType2); // vector op vector + BINARY_OP(VECTOR,VECTOR,out,psType1,op,psType2); // vector op vector } else if(dim2 == PS_DIMEN_IMAGE) { - LEVEL2(VECTOR,IMAGE,out,psType1,op,psType2); // vector op image + BINARY_OP(VECTOR,IMAGE,out,psType1,op,psType2); // vector op image } else { psError(__func__, ": Line %d - Invalid dimensionality for in2 arg: %d", __LINE__, dim2); @@ -465,9 +465,9 @@ } else if(dim1 == PS_DIMEN_IMAGE) { if(dim2 == PS_DIMEN_SCALAR) { - LEVEL2(IMAGE,SCALAR,out,psType1,op,psType2); // image op scalar + BINARY_OP(IMAGE,SCALAR,out,psType1,op,psType2); // image op scalar } else if(dim2==PS_DIMEN_VECTOR || dim2==PS_DIMEN_TRANSV) { - LEVEL2(IMAGE,VECTOR,out,psType1,op,psType2); // image op vector + BINARY_OP(IMAGE,VECTOR,out,psType1,op,psType2); // image op vector } else if(dim2 == PS_DIMEN_IMAGE) { - LEVEL2(IMAGE,IMAGE,out,psType1,op,psType2); // image op image + BINARY_OP(IMAGE,IMAGE,out,psType1,op,psType2); // image op image } else { psError(__func__, ": Line %d - Invalid dimensionality for in2 arg: %d", __LINE__, dim2); @@ -594,5 +594,5 @@ } \ } else if(!strncmp(OP, "exp", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,exp(*i1)); \ } else { \ @@ -600,5 +600,5 @@ } \ } else if(!strncmp(OP, "ln", 2)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,log(*i1)); \ } else { \ @@ -606,5 +606,5 @@ } \ } else if(!strncmp(OP, "ten", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,exp10(*i1)); \ } else { \ @@ -612,5 +612,5 @@ } \ } else if(!strncmp(OP, "log", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,log10(*i1)); \ } else { \ @@ -618,5 +618,5 @@ } \ } else if(!strncmp(OP, "sin", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,sin(*i1)); \ } else { \ @@ -624,5 +624,5 @@ } \ } else if(!strncmp(OP, "dsin", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,sin(*i1*D2R)); \ } else { \ @@ -630,5 +630,5 @@ } \ } else if(!strncmp(OP, "cos", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,cos(*i1)); \ } else { \ @@ -636,5 +636,5 @@ } \ } else if(!strncmp(OP, "dcos", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,cos(*i1*D2R)); \ } else { \ @@ -642,5 +642,5 @@ } \ } else if(!strncmp(OP, "tan", 3)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,tan(*i1)); \ } else { \ @@ -648,5 +648,5 @@ } \ } else if(!strncmp(OP, "dtan", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,tan(*i1*D2R)); \ } else { \ @@ -654,5 +654,5 @@ } \ } else if(!strncmp(OP, "asin", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,asin(*i1)); \ } else { \ @@ -660,5 +660,5 @@ } \ } else if(!strncmp(OP, "dasin", 5)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,R2D*asin(*i1)); \ } else { \ @@ -666,5 +666,5 @@ } \ } else if(!strncmp(OP, "acos", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,acos(*i1)); \ } else { \ @@ -672,5 +672,5 @@ } \ } else if(!strncmp(OP, "dacos", 5)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,R2D*acos(*i1)); \ } else { \ @@ -678,5 +678,5 @@ } \ } else if(!strncmp(OP, "atan", 4)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,atan(*i1)); \ } else { \ @@ -684,5 +684,5 @@ } \ } else if(!strncmp(OP, "datan", 5)) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ + if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) { \ UNARY_TYPE(DIM,OUT,IN,R2D*atan(*i1)); \ } else { \