Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/py3/interp/holefiller.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/py3/interp/holefiller.py (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/py3/interp/holefiller.py

@@ -1 @@
-import numpy as npy
+import numpy as np
 from scipy.spatial import cKDTree
 
@@ -30 +30 @@
         filled=data
         
-        XYGood=npy.dstack([x[goodids],y[goodids]])[0]
-        XYBad=npy.dstack([x[badids],y[badids]])[0]
+        XYGood=np.dstack([x[goodids],y[goodids]])[0]
+        XYBad=np.dstack([x[badids],y[badids]])[0]
         tree=cKDTree(XYGood)
         nearest=tree.query(XYBad,k=knn)[1]
@@ -42 +42 @@
                         for j in range(knn):
                                 neardat.append(filled[goodids][nearest[i][j]])
-                                filled[badids[i]]=npy.mean(neardat)
+                                filled[badids[i]]=np.mean(neardat)
                                 
         return filled