Merge branch 'pixelfunctions-integration' into enhance-complex-datase…

…ts-with-pf

autotest/gdrivers/pixfun.py

@@ -29,7 +29,13 @@
 ###############################################################################
 
 import sys
-import numpy
+
+try:
+    import numpy
+    numpy_available = True
+except ImportError:
+    numpy_available = False
+
 from osgeo import gdal
 
 sys.path.append('../pymod')
@@ -55,7 +61,7 @@ def pixfun_real_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.real):
+    if numpy_available and not numpy.alltrue(data == refdata.real):
         return 'fail'
 
     return 'success'
@@ -80,7 +86,7 @@ def pixfun_real_r():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.real):
+    if numpy_available and not numpy.alltrue(data == refdata.real):
         return 'fail'
 
     return 'success'
@@ -105,7 +111,7 @@ def pixfun_imag_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata.imag):
+    if numpy_available and not numpy.alltrue(data == refdata.imag):
         return 'fail'
 
     return 'success'
@@ -123,7 +129,7 @@ def pixfun_imag_r():
         return 'fail'
     data = ds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == 0):
+    if numpy_available and not numpy.alltrue(data == 0):
         return 'fail'
 
     return 'success'
@@ -148,7 +154,7 @@ def pixfun_complex():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.allclose(data, refdata + 1j * refdata):
+    if numpy_available and not numpy.allclose(data, refdata + 1j * refdata):
         return 'fail'
 
     return 'success'
@@ -173,7 +179,7 @@ def pixfun_mod_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.abs(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.abs(refdata)):
         return 'fail'
 
     return 'success'
@@ -198,7 +204,7 @@ def pixfun_mod_r():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.abs(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.abs(refdata)):
         return 'fail'
 
     return 'success'
@@ -225,7 +231,7 @@ def pixfun_phase_c():
     refdata = refdata.astype('complex128')
 
     #if not numpy.allclose(data, numpy.arctan2(refdata.imag, refdata.real)):
-    if not numpy.alltrue(data == numpy.arctan2(refdata.imag, refdata.real)):
+    if numpy_available and not numpy.alltrue(data == numpy.arctan2(refdata.imag, refdata.real)):
         return 'fail'
 
     return 'success'
@@ -250,7 +256,7 @@ def pixfun_phase_r():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.arctan2(0, refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.arctan2(0, refdata)):
         return 'fail'
 
     return 'success'
@@ -275,7 +281,7 @@ def pixfun_conj_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.conj(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.conj(refdata)):
         return 'fail'
 
     return 'success'
@@ -300,7 +306,7 @@ def pixfun_conj_r():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.conj(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.conj(refdata)):
         return 'fail'
 
     return 'success'
@@ -318,17 +324,18 @@ def pixfun_sum_r():
         return 'fail'
     data = ds.GetRasterBand(1).ReadAsArray()
 
-    refdata = numpy.zeros(data.shape, 'float')
-    for reffilename in ('data/uint16.tif', 'data/int32.tif',
-                        'data/float32.tif'):
-        refds = gdal.Open(reffilename)
-        if refds is None:
-            gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
+    if numpy_available:
+        refdata = numpy.zeros(data.shape, 'float')
+        for reffilename in ('data/uint16.tif', 'data/int32.tif',
+                            'data/float32.tif'):
+            refds = gdal.Open(reffilename)
+            if refds is None:
+                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
+                return 'fail'
+            refdata += refds.GetRasterBand(1).ReadAsArray()
+
+        if not numpy.alltrue(data == refdata):
             return 'fail'
-        refdata += refds.GetRasterBand(1).ReadAsArray()
-
-    if not numpy.alltrue(data == refdata):
-        return 'fail'
 
     return 'success'
 
@@ -345,17 +352,18 @@ def pixfun_sum_c():
         return 'fail'
     data = ds.GetRasterBand(1).ReadAsArray()
 
-    refdata = numpy.zeros(data.shape, 'complex')
-    for reffilename in ('data/uint16.tif', 'data/cint_sar.tif',
-                        'data/cfloat64.tif'):
-        refds = gdal.Open(reffilename)
-        if refds is None:
-            gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-            return 'fail'
+    if numpy_available:
+        refdata = numpy.zeros(data.shape, 'complex')
+        for reffilename in ('data/uint16.tif', 'data/cint_sar.tif',
+                            'data/cfloat64.tif'):
+            refds = gdal.Open(reffilename)
+            if refds is None:
+                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
+                return 'fail'
         refdata += refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
-    if not numpy.alltrue(data == refdata):
-        return 'fail'
+        if not numpy.alltrue(data == refdata):
+            return 'fail'
 
     return 'success'
 
@@ -386,7 +394,7 @@ def pixfun_diff_r():
         return 'fail'
     refdata2 = refds.GetRasterBand(1).ReadAsArray(10, 10, 5, 6)
 
-    if not numpy.alltrue(data == refdata1-refdata2):
+    if numpy_available and not numpy.alltrue(data == refdata1-refdata2):
         return 'fail'
 
     return 'success'
@@ -418,7 +426,7 @@ def pixfun_diff_c():
         return 'fail'
     refdata2 = refds.GetRasterBand(1).ReadAsArray(0, 0, 5, 6)
 
-    if not numpy.alltrue(data == refdata1-refdata2):
+    if numpy_available and not numpy.alltrue(data == refdata1-refdata2):
         return 'fail'
 
     return 'success'
@@ -436,17 +444,18 @@ def pixfun_mul_r():
         return 'fail'
     data = ds.GetRasterBand(1).ReadAsArray()
 
-    refdata = numpy.ones(data.shape, 'float')
-    for reffilename in ('data/uint16.tif', 'data/int32.tif',
-                        'data/float32.tif'):
-        refds = gdal.Open(reffilename)
-        if refds is None:
-            gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
-            return 'fail'
+    if numpy_available:
+        refdata = numpy.ones(data.shape, 'float')
+        for reffilename in ('data/uint16.tif', 'data/int32.tif',
+                            'data/float32.tif'):
+            refds = gdal.Open(reffilename)
+            if refds is None:
+                gdaltest.post_reason('Unable to open "%s" dataset.' % reffilename)
+                return 'fail'
         refdata *= refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata):
-        return 'fail'
+        if not numpy.alltrue(data == refdata):
+            return 'fail'
 
     return 'success'
 
@@ -470,7 +479,7 @@ def pixfun_mul_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata*refdata):
+    if numpy_available and not numpy.alltrue(data == refdata*refdata):
         return 'fail'
 
     return 'success'
@@ -495,7 +504,7 @@ def pixfun_cmul_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == refdata*refdata.conj()):
+    if numpy_available and not numpy.alltrue(data == refdata*refdata.conj()):
         return 'fail'
 
     return 'success'
@@ -529,7 +538,7 @@ def pixfun_cmul_r():
     refdata2 = refds.GetRasterBand(1).ReadAsArray()
     refdata2 = refdata2.astype('float64')
 
-    if not numpy.alltrue(data == refdata1 * refdata2.conj()):
+    if numpy_available and not numpy.alltrue(data == refdata1 * refdata2.conj()):
         return 'fail'
 
     return 'success'
@@ -555,7 +564,7 @@ def pixfun_inv_r():
     refdata = refds.GetRasterBand(1).ReadAsArray()
     refdata = refdata.astype('float64')
 
-    if not numpy.alltrue(data == 1./refdata):
+    if numpy_available and not numpy.alltrue(data == 1./refdata):
         return 'fail'
 
     return 'success'
@@ -582,9 +591,9 @@ def pixfun_inv_c():
     refdata = refdata.astype('complex')
     delta = data - 1./refdata
 
-    if not numpy.alltrue(abs(delta.real) < 1e-13):
+    if numpy_available and not numpy.alltrue(abs(delta.real) < 1e-13):
         return 'fail'
-    if not numpy.alltrue(abs(delta.imag) < 1e-13):
+    if numpy_available and not numpy.alltrue(abs(delta.imag) < 1e-13):
         return 'fail'
 
     return 'success'
@@ -609,7 +618,7 @@ def pixfun_intensity_c():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == (refdata*refdata.conj()).real):
+    if numpy_available and not numpy.alltrue(data == (refdata*refdata.conj()).real):
         return 'fail'
 
     return 'success'
@@ -634,7 +643,7 @@ def pixfun_intensity_r():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == (refdata*refdata.conj()).real):
+    if numpy_available and not numpy.alltrue(data == (refdata*refdata.conj()).real):
         return 'fail'
 
     return 'success'
@@ -659,7 +668,7 @@ def pixfun_sqrt():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.sqrt(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.sqrt(refdata)):
         return 'fail'
 
     return 'success'
@@ -684,7 +693,7 @@ def pixfun_log10():
         return 'fail'
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
-    if not numpy.alltrue(data == numpy.log10(refdata)):
+    if numpy_available and not numpy.alltrue(data == numpy.log10(refdata)):
         return 'fail'
 
     return 'success'
@@ -710,7 +719,7 @@ def pixfun_dB2amp():
     refdata = refds.GetRasterBand(1).ReadAsArray()
 
     #if not numpy.alltrue(data == 10.**(refdata/20.)):
-    if not numpy.allclose(data, 10.**(refdata/20.)):
+    if numpy_available and not numpy.allclose(data, 10.**(refdata/20.)):
         return 'fail'
 
     return 'success'
@@ -737,7 +746,7 @@ def pixfun_dB2pow():
     refdata = refdata.astype('float64')
 
     #if not numpy.allclose(data, 10.**(refdata/10.)):
-    if not numpy.alltrue(data == 10.**(refdata/10.)):
+    if numpy_available and not numpy.alltrue(data == 10.**(refdata/10.)):
         return 'fail'
 
     return 'success'