Changeset 2962 for trunk/psLib/src/dataManip

Timestamp:

Jan 12, 2005, 12:17:02 PM (22 years ago)

Author:

desonia

Message:

added tests for some psFits functions.

Location:

trunk/psLib/src/dataManip

Files:

• psMatrixVectorArithmetic.c (modified) (3 diffs)
• psMatrixVectorArithmetic.h (modified) (2 diffs)

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

@@ -29 +29 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-11 03:06:31 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-12 22:17:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -377 +377 @@
 // Preprocessor macro function to create arithmetic function operation name
 #define BINARY_OP(DIM1,DIM2,OUT,IN1,OP,IN2)                                                                  \
-if(!strncmp(OP, "+", 1)) {                                                                                   \
+if(!strncmp(OP, "=", 1)) {                                                                                   \
+    BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i2,IN2);                                                                  \
+} else if(!strncmp(OP, "+", 1)) {                                                                            \
     BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 + *i2,IN2);                                                            \
 } else if(!strncmp(OP, "-", 1)) {                                                                            \
@@ -384 +386 @@
     BINARY_TYPE(DIM1,DIM2,OUT,IN1,*i1 * *i2,IN2);                                                            \
 } else if(!strncmp(OP, "/", 1)) {                                                                            \
-    BINARY_TYPE(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)) {                                                                \

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h

@@ -30 +30 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-12 22:17:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
  *      out = in1 op in2,
  *
- *      Where op is: "+", "-", "*", "/", "^", "min", or "max"
+ *      Where op is: "=", "+", "-", "*", "/", "^", "min", or "max"
  *
- *  This function only supports vector-vector or image-image opertions.
+ *  This function only supports vector-vector or image-image operations.
  *
  *  @return  psType* : Pointer to either psImage or psVector.