Merge create_vertice and custom_concat function

Author: AntSimi

examples/06_grid_manipulation/pet_hide_pixel_out_eddies.py

@@ -7,8 +7,9 @@
 from matplotlib import pyplot as plt
 from matplotlib.path import Path
 from numpy import ones
-from py_eddy_tracker.observations.observation import EddiesObservations, custom_concat
+from py_eddy_tracker.observations.observation import EddiesObservations
 from py_eddy_tracker.dataset.grid import RegularGridDataset
+from py_eddy_tracker.poly import create_vertice
 from py_eddy_tracker import data
 
 # %%
@@ -35,7 +36,7 @@
 adt = g.grid("adt")
 mask = ones(adt.shape, dtype='bool')
 for eddy in a:
-    i, j = Path(custom_concat(eddy[x_name], eddy[y_name])).pixels_in(g)
+    i, j = Path(create_vertice(eddy[x_name], eddy[y_name])).pixels_in(g)
     mask[i, j] = False
 adt.mask[:] += ~mask
 g.display(ax, "adt")

src/py_eddy_tracker/observations/observation.py

@@ -59,7 +59,7 @@
 from matplotlib.path import Path as BasePath
 from .. import VAR_DESCR, VAR_DESCR_inv
 from ..generic import distance_grid, distance, flatten_line_matrix, wrap_longitude
-from ..poly import bbox_intersection, common_area
+from ..poly import bbox_intersection, common_area, create_vertice
 
 logger = logging.getLogger("pet")
 
@@ -123,16 +123,6 @@ def shifted_ellipsoid_degrees_mask2(lon0, lat0, lon1, lat1, minor=1.5, major=1.5
     return m
 
 
-@njit(cache=True, fastmath=True)
-def custom_concat(x, y):
-    nb = x.shape[0]
-    a = empty((nb, 2))
-    for i in range(nb):
-        a[i, 0] = x[i]
-        a[i, 1] = y[i]
-    return a
-
-
 class EddiesObservations(object):
     """
     Class to hold eddy properties *amplitude* and counts of
@@ -761,10 +751,10 @@ def cost_function_common_area(cls, xy_in, xy_out, distance, intern=False):
                 continue
 
             x_in_, x_out_ = x_in[i], x_out[i]
-            p_in = Polygon(custom_concat(x_in_, y_in[i]))
+            p_in = Polygon(create_vertice(x_in_, y_in[i]))
             if abs(x_in_[0] - x_out_[0]) > 180:
                 x_out_ = (x_out[i] - (x_in_[0] - 180)) % 360 + x_in_[0] - 180
-            p_out = Polygon(custom_concat(x_out_, y_out[i]))
+            p_out = Polygon(create_vertice(x_out_, y_out[i]))
             costs[i] = 1 - (p_in & p_out).area() / min(p_in.area(), p_out.area())
         costs.mask = costs == 1
         return costs
@@ -1288,7 +1278,7 @@ def grid_count(self, bins, intern=False, center=False):
         else:
             x, y = (self[x_name] - x0) % 360 + x0, self[y_name]
             for x_, y_ in zip(x, y):
-                i, j = BasePath(custom_concat(x_, y_)).pixels_in(regular_grid)
+                i, j = BasePath(create_vertice(x_, y_)).pixels_in(regular_grid)
                 grid_count_(grid, i, j)
             grid.mask = grid == 0
         return regular_grid

src/py_eddy_tracker/poly.py

@@ -121,7 +121,7 @@ def bbox_intersection(x0, y0, x1, y1):
     return array(i), array(j)
 
 
-@njit(cache=True, fastmath=True)
+@njit(cache=True)
 def create_vertice(x, y):
     nb = x.shape[0]
     v = empty((nb, 2))