[Numpy-svn] r5911 - branches/ufunc_cleanup/numpy/core/src

[numpy-svn at scipy.org]

Author: charris
Date: 2008-10-05 00:36:57 -0500 (Sun, 05 Oct 2008)
New Revision: 5911

Modified:
   branches/ufunc_cleanup/numpy/core/src/umathmodule.c.src
Log:
More constant type cleanups.
USE CLE,CGE for complex compare macros instead of LE & GE.


Modified: branches/ufunc_cleanup/numpy/core/src/umathmodule.c.src
===================================================================
--- branches/ufunc_cleanup/numpy/core/src/umathmodule.c.src	2008-10-05 05:29:09 UTC (rev 5910)
+++ branches/ufunc_cleanup/numpy/core/src/umathmodule.c.src	2008-10-05 05:36:57 UTC (rev 5911)
@@ -1737,6 +1737,7 @@
 #undef HAVE_DOUBLE_FUNCS
 
 #define @TYPE at _true_divide @TYPE at _divide
+
 #undef ONE
 #undef ZERO
 
@@ -1757,6 +1758,11 @@
  * #c = f, , l#
  */
 
+#define CGE(xr,xi,yr,yi) (xr > yr || (xr == yr && xi >= yi))
+#define CLE(xr,xi,yr,yi) (xr < yr || (xr == yr && xi <= yi))
+#define ONE 1.0 at c@
+#define ZERO 0.0 at c@
+
 /**begin repeat1
  * arithmetic
  * #kind = add, subtract#
@@ -1950,8 +1956,8 @@
 @CTYPE at _ones_like(char **args, intp *dimensions, intp *steps, void *data)
 {
     OUTPUT_LOOP {
-        ((@type@ *)op)[0] = 1;
-        ((@type@ *)op)[1] = 0;
+        ((@type@ *)op)[0] = ONE;
+        ((@type@ *)op)[1] = ZERO;
     }
 }
 
@@ -1982,32 +1988,30 @@
         const @type@ in1r = ((@type@ *)ip1)[0];
         const @type@ in1i = ((@type@ *)ip1)[1];
         if (in1r > 0) {
-            ((@type@ *)op)[0] = 1;
+            ((@type@ *)op)[0] = ONE;
         }
         else if (in1r < 0) {
-            ((@type@ *)op)[0] = -1;
+            ((@type@ *)op)[0] = -ONE;
         }
         else {
             if (in1i > 0) {
-                ((@type@ *)op)[0] = 1;
+                ((@type@ *)op)[0] = ONE;
             }
             else if (in1i < 0) {
-                ((@type@ *)op)[0] = -1;
+                ((@type@ *)op)[0] = -ONE;
             }
             else {
-                ((@type@ *)op)[0] = 0;
+                ((@type@ *)op)[0] = ZERO;
             }
         }
-        ((@type@ *)op)[1] = 0;
+        ((@type@ *)op)[1] = ZERO;
     }
 }
 
-#define GE(xr,xi,yr,yi) (xr > yr || (xr == yr && xi >= yi))
-#define LE(xr,xi,yr,yi) (xr < yr || (xr == yr && xi <= yi))
 /**begin repeat1
  * #kind = maximum, minimum#
- * #OP1 = GE, LE#
- * #OP2 = LE, GE#
+ * #OP1 = CGE, CLE#
+ * #OP2 = CLE, CGE#
  */
 static void
 @CTYPE at _@kind@(char **args, intp *dimensions, intp *steps, void *func)
@@ -2035,7 +2039,7 @@
 
 /**begin repeat1
  * #kind = fmax, fmin#
- * #OP1 = GE, LE#
+ * #OP1 = CGE, CLE#
  */
 static void
 @CTYPE at _@kind@(char **args, intp *dimensions, intp *steps, void *func)
@@ -2062,10 +2066,14 @@
     }
 }
 /**end repeat1**/
-#undef GE
-#undef LE
 
 #define @CTYPE at _true_divide @CTYPE at _divide
+
+#undef CGE
+#undef CLE
+#undef ONE
+#undef ZERO
+
 /**end repeat**/