Changeset 1516 for trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

Timestamp:

Aug 12, 2004, 8:24:32 AM (22 years ago)

Author:

harman

Message:

Added FLT_EPSILON to select functions to align results with that of 64 bit platform

File:

• trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (modified) (7 diffs)

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c

@@ -30 +30 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-12 18:24:32 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -90 +90 @@
 
 // Conversion for degrees to radians
-#define D2R M_PI/180.0
+#define D2R M_PIl/180.0
 
 // Conversion for radians to degrees
-#define R2D 180.0/M_PI
+#define R2D 180.0/M_PIl
 
 // Division with NAN checking
@@ -599 +599 @@
 }
 
-// Preprocessor macro function to create arithmetic function operation name
+// Preprocessor macro function to create arithmetic function operation name. Functions below that add
+// FLT_EPSILON are done so to align results with a 64 bit computing architecture
 #define UNARY_OP(DIM,OUT,IN,OP)                                                                              \
 if(!strncmp(OP, "abs", 3)) {                                                                                 \
@@ -627 +628 @@
 } else if(!strncmp(OP, "log", 3)) {                                                                          \
     if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) {                                                                 \
-        UNARY_TYPE(DIM,OUT,IN,clog(*i1)/log(10.0));                                                 \
+        UNARY_TYPE(DIM,OUT,IN,clog(*i1)/log(10.0));                                                          \
     } else {                                                                                                 \
         UNARY_TYPE(DIM,OUT,IN,log10(*i1));                                                                   \
@@ -639 +640 @@
 } else if(!strncmp(OP, "dsin", 4)) {                                                                         \
     if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) {                                                                 \
-        UNARY_TYPE(DIM,OUT,IN,csin(*i1*D2R));                                                                \
+        UNARY_TYPE(DIM,OUT,IN,csin(*i1*D2R+FLT_EPSILON));                                                    \
     } else {                                                                                                 \
         UNARY_TYPE(DIM,OUT,IN,sin(*i1*D2R));                                                                 \
@@ -676 +677 @@
     if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) {                                                                 \
         UNARY_TYPE(DIM,OUT,IN,R2D*casin(*i1));                                                               \
-    } else {                                                                                                 \
-        UNARY_TYPE(DIM,OUT,IN,R2D*asin(*i1));                                                                \
+    } else if(PS_IS_PSELEMTYPE_INT(IN->type)) {                                                              \
+        UNARY_TYPE(DIM,OUT,IN,(R2D*asin(*i1)+FLT_EPSILON));                                                  \
+    } else {                                                                                                 \
+        UNARY_TYPE(DIM,OUT,IN,(R2D*asin(*i1)));                                                              \
     }                                                                                                        \
 } else if(!strncmp(OP, "acos", 4)) {                                                                         \
@@ -688 +691 @@
     if(PS_IS_PSELEMTYPE_COMPLEX(IN->type)) {                                                                 \
         UNARY_TYPE(DIM,OUT,IN,R2D*cacos(*i1));                                                               \
+    } else if(PS_IS_PSELEMTYPE_INT(IN->type)) {                                                              \
+        UNARY_TYPE(DIM,OUT,IN,(R2D*acos(*i1)+FLT_EPSILON));                                                  \
     } else {                                                                                                 \
         UNARY_TYPE(DIM,OUT,IN,R2D*acos(*i1));                                                                \