[pypy-commit] pypy numpy-refactor: fix fmin/fmax

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-refactor
Changeset: r57233:44979622dc5a
Date: 2012-09-07 21:51 +0200
http://bitbucket.org/pypy/pypy/changeset/44979622dc5a/

Log:	fix fmin/fmax

diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -617,17 +617,21 @@
     @simple_binary_op
     def fmax(self, v1, v2):
         if math.isnan(v1):
+            if math.isnan(v2):
+                return v1
+            return v2
+        elif math.isnan(v2):
             return v1
-        elif math.isnan(v2):
-            return v2
         return max(v1, v2)
 
     @simple_binary_op
     def fmin(self, v1, v2):
         if math.isnan(v1):
+            if math.isnan(v2):
+                return v1
+            return v2
+        elif math.isnan(v2):
             return v1
-        elif math.isnan(v2):
-            return v2
         return min(v1, v2)
 
     @simple_binary_op