Changeset 12431 for trunk/psLib/src/math/psBinaryOp.c

Timestamp:

Mar 13, 2007, 2:39:51 PM (19 years ago)

Author:

Paul Price

Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

File:

• trunk/psLib/src/math/psBinaryOp.c (modified) (3 diffs)

trunk/psLib/src/math/psBinaryOp.c

@@ -30 +30 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-14 00:39:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -323 +323 @@
     DIM1##_##DIM2(OUT,IN1,OP,IN2,F64);                                                                       \
     break;                                                                                                   \
-case PS_TYPE_C32:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,C32);                                                                       \
-    break;                                                                                                   \
-case PS_TYPE_C64:                                                                                            \
-    DIM1##_##DIM2(OUT,IN1,OP,IN2,C64);                                                                       \
-    break;                                                                                                   \
-default:                                                                                                     \
-    /* char* strType;                                                                                        \
-    PS_TYPE_NAME(strType,IN1->type);                                                                         \
-    psError(PS_ERR_BAD_PARAMETER_TYPE, true,                                                                 \
-            _("Specified data type, %s, is not supported."),                                                             \
-            strType);  */                                                                                    \
-    if (OUT != IN1 && OUT != IN2) {                                                                          \
-        psFree(OUT);                                                                                         \
+default: {                                                                                                   \
+        char* strType;                                                                                       \
+        PS_TYPE_NAME(strType,IN1->type);                                                                     \
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,                                                             \
+                _("Specified data type, %s, is not supported."),                                             \
+                strType);                                                                                    \
+        if (OUT != IN1 && OUT != IN2) {                                                                      \
+            psFree(OUT);                                                                                     \
+        }                                                                                                    \
+        return NULL;                                                                                         \
     }                                                                                                        \
-    return NULL;                                                                                             \
 }
 
@@ -364 +359 @@
     } else {                                                                                                 \
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                "Types (%x,%x) are not appropriate for logical OR.\n", IN1->type, IN2->type);               \
+                "Types (%x,%x) are not appropriate for logical OR.\n", IN1->type, IN2->type);                \
         return NULL;                                                                                         \
     }                                                                                                        \
 } else if (!strncmp(OP, "^", 1)) {                                                                           \
-    if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) {                                                               \
-        BINARY_TYPE(DIM1,DIM2,OUT,IN1,cpow(*i1,*i2),IN2);                                                    \
-    } else {                                                                                                 \
-        BINARY_TYPE(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2);                                                     \
-    }                                                                                                        \
+    BINARY_TYPE(DIM1,DIM2,OUT,IN1,pow(*i1,*i2),IN2);                                                         \
 } else if (!strncmp(OP, "min", 3)) {                                                                         \
-    if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) {                                                               \
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                _("The minimum operation is not supported with complex data."));                                                  \
-        if (OUT != IN1 && OUT != IN2) {                                                                      \
-            psFree(OUT);                                                                                     \
-        }                                                                                                    \
-        return NULL;                                                                                         \
-    } else {                                                                                                 \
-        BINARY_TYPE(DIM1,DIM2,OUT,IN1,fmin(*i1,*i2),IN2);                                                    \
-    }                                                                                                        \
+    BINARY_TYPE(DIM1,DIM2,OUT,IN1,fmin(*i1,*i2),IN2);                                                        \
 } else if (!strncmp(OP, "max", 3)) {                                                                         \
-    if (PS_IS_PSELEMTYPE_COMPLEX(IN1->type)) {                                                               \
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                            \
-                _("The maximum operation is not supported with complex data."));                                                  \
-        if (OUT != IN1 && OUT != IN2) {                                                                      \
-            psFree(OUT);                                                                                     \
-        }                                                                                                    \
-        return NULL;                                                                                         \
-    } else {                                                                                                 \
-        BINARY_TYPE(DIM1,DIM2,OUT,IN1,fmax(*i1,*i2),IN2);                                                    \
-    }                                                                                                        \
+    BINARY_TYPE(DIM1,DIM2,OUT,IN1,fmax(*i1,*i2),IN2);                                                        \
 } else {                                                                                                     \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true,                                                                \
-            _("Specified operation, %s, is not supported."),                                                     \
+            _("Specified operation, %s, is not supported."),                                                 \
             OP);                                                                                             \
     if (OUT != IN1 && OUT != IN2) {                                                                          \