Skip to content

Commit 4a572e8

Browse files
committed
move method
1 parent 61190bd commit 4a572e8

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

src/py_eddy_tracker/observations/network.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,7 @@ def get_group_array(self, results, nb_obs):
886886
g0, g1 = g1, g0
887887
merge_id.append((g0, g1))
888888

889+
# FIXME: how it's work when several merge ? like (0,1), (0,2), (1,3)
889890
gr_transfer = arange(id_free, dtype="u4")
890891
for i, j in set(merge_id):
891892
gr_i, gr_j = gr_transfer[i], gr_transfer[j]

src/py_eddy_tracker/observations/observation.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
convexs,
6666
create_vertice,
6767
get_pixel_in_regular,
68+
reduce_size,
6869
vertice_overlap,
6970
winding_number_poly,
7071
)
@@ -2200,26 +2201,6 @@ def grid_count_pixel_in(
22002201
grid_count_(grid, i, j)
22012202

22022203

2203-
@njit(cache=True)
2204-
def reduce_size(x, y):
2205-
"""
2206-
Reduce array size if last position is repeated, in order to save compute time
2207-
2208-
:param array x: longitude
2209-
:param array y: latitude
2210-
2211-
:return: reduce arrays x,y
2212-
:rtype: ndarray,ndarray
2213-
"""
2214-
i = x.shape[0]
2215-
x0, y0 = x[0], y[0]
2216-
while True:
2217-
i -= 1
2218-
if x[i] != x0 or y[i] != y0:
2219-
i += 1
2220-
return x[:i], y[:i]
2221-
2222-
22232204
@njit(cache=True)
22242205
def poly_indexs(x_p, y_p, x_c, y_c):
22252206
"""

src/py_eddy_tracker/poly.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,3 +765,23 @@ def visvalingam(x, y, fixed_size=18):
765765
x_new[j:] = x_new[0]
766766
y_new[j:] = y_new[0]
767767
return x_new, y_new
768+
769+
770+
@njit(cache=True)
771+
def reduce_size(x, y):
772+
"""
773+
Reduce array size if last position is repeated, in order to save compute time
774+
775+
:param array x: longitude
776+
:param array y: latitude
777+
778+
:return: reduce arrays x,y
779+
:rtype: ndarray,ndarray
780+
"""
781+
i = x.shape[0]
782+
x0, y0 = x[0], y[0]
783+
while True:
784+
i -= 1
785+
if x[i] != x0 or y[i] != y0:
786+
i += 1
787+
return x[:i], y[:i]

0 commit comments

Comments
 (0)