fixing fminimum method in raster class

wbierbower · Apr 30, 2015 · 1301280 · 1301280
1 parent c000d9b
commit 1301280
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/fauxgeo/raster.py b/fauxgeo/raster.py
@@ -289,14 +289,14 @@ def minimum(self, raster):
             # Implement broadcast operation
             def min_closure(nodata):
                 def mini(x):
-                    def f(x): return np.where((np.minimum(x, raster)), x, raster)
+                    def f(x): return np.where(np.not_equal(x, raster), np.minimum(x, raster), np.minimum(x, raster))
                     return np.where((np.not_equal(x, nodata)), f(x), nodata)
                 return mini
             return self.local_op(raster, min_closure, broadcast=True)
         else:
             def min_closure(nodata):
                 def mini(x, y):
-                    def f(x, y): return np.where((np.minimum(x, y)), x, y)
+                    def f(x, y): return np.where(np.not_equal(x, y), np.minimum(x, y), np.minimum(x, y))
                     return np.where((np.not_equal(x, nodata)) & (np.not_equal(y, nodata)), f(x, y), nodata)
                 return mini
             return self.local_op(raster, min_closure)
@@ -306,15 +306,15 @@ def fminimum(self, raster):
             # Implement broadcast operation
             def min_closure(nodata):
                 def mini(x):
-                    def f(x): return np.where((np.fmin(x, raster)), x, raster)
+                    def f(x): return np.where(np.not_equal(x, raster), np.fmin(x, raster), np.fmin(x, raster))
                     return np.where((np.not_equal(x, nodata)), f(x), nodata)
                 return mini
             return self.local_op(raster, min_closure, broadcast=True)
         else:
             def min_closure(nodata):
                 def mini(x, y):
-                    def f(x, y): return np.where((np.fmin(x, y)), x, y)
-                    return np.where((np.not_equal(x, nodata)) | (np.not_equal(y, nodata)), f(x, y), nodata)
+                    def f(x, y): return np.where((np.not_equal(x, y)), np.fmin(x, y), np.fmin(x, y))
+                    return np.where((np.not_equal(x, nodata)) & (np.not_equal(y, nodata)), f(x, y), nodata)
                 return mini
             return self.local_op(raster, min_closure)
 

diff --git a/tests/test_raster.py b/tests/test_raster.py
@@ -420,8 +420,8 @@ def test_minimum(self):
         assert(min_raster.get_band(1).data[0, 1] == -9999)
 
     def test_fminimum(self):
-        raster1 = self.factory.alternating(1.0, 2.0)
-        raster2 = self.factory.alternating(2.0, -9999)
+        raster1 = self.factory.alternating(2.0, float('NaN'))
+        raster2 = self.factory.alternating(1.0, 2.0)
         min_raster = raster1.fminimum(raster2)
         assert(min_raster.get_band(1).data[0, 0] == 1)
         assert(min_raster.get_band(1).data[0, 1] == 2)