some change to speed up a little bit eddy anim

Author: AntSimi

src/py_eddy_tracker/appli.py

@@ -89,21 +89,14 @@ def setup(self, cmap="jet", nb_step=25, figsize=(8, 6)):
 
         # plot
         self.fig = pyplot.figure(figsize=figsize)
+        t0, t1 = self.period
+        self.fig.suptitle(f'{t0} -> {t1}')
         self.ax = self.fig.add_axes((0.05, 0.05, 0.9, 0.9))
         self.ax.set_xlim(x_min, x_max), self.ax.set_ylim(y_min, y_max)
         self.ax.set_aspect("equal")
         self.ax.grid()
         # init mappable
-        self.txt = self.ax.text(
-            x_min + 0.05 * d_x,
-            y_min + 0.05 * d_y,
-            "",
-            zorder=10,
-            bbox=dict(facecolor="w", alpha=0.85),
-        )
-        self.display_speed = self.ax.text(
-            x_min + 0.02 * d_x, y_max - 0.04 * d_y, "", fontsize=10
-        )
+        self.txt = self.ax.text(x_min + 0.05 * d_x, y_min + 0.05 * d_y, "", zorder=10)
         self.contour = LineCollection([], zorder=1)
         self.ax.add_collection(self.contour)
 
@@ -128,7 +121,7 @@ def show(self, infinity_loop=False):
                     dt_draw = (datetime.now() - d0).total_seconds()
                     dt = self.sleep_event - dt_draw
                     if dt < 0:
-                        self.sleep_event = dt_draw * 1.01
+                        # self.sleep_event = dt_draw * 1.01
                         dt = 1e-10
                 self.fig.canvas.start_event_loop(dt)
 
@@ -162,11 +155,10 @@ def draw_contour(self):
             self.segs.append(empty((0, 2)))
         self.contour.set_paths(self.segs)
         self.contour.set_color(self.colors[-len(self.segs) :])
-        self.txt.set_text(f"{t0} -> {self.now} -> {t1}")
-        self.display_speed.set_text(f"{1/self.sleep_event:.0f} frame/s")
+        self.contour.set_lw(arange(len(self.segs)) / len(self.segs) * 2.5)
+        self.txt.set_text(f"{self.now} - {1/self.sleep_event:.0f} frame/s")
         self.ax.draw_artist(self.contour)
         self.ax.draw_artist(self.txt)
-        self.ax.draw_artist(self.display_speed)
         # Remove first segment to keep only T contour
         if len(self.segs) > self.nb_step:
             self.segs.pop(0)

src/py_eddy_tracker/generic.py

@@ -36,6 +36,7 @@
     interp,
     where,
     isnan,
+    bool_,
 )
 from numba import njit, prange, types as numba_types
 from numpy.linalg import lstsq
@@ -291,6 +292,37 @@ def flatten_line_matrix(l_matrix):
     return out
 
 
+@njit(cache=True)
+def simplify(x, y, precision=0.1):
+    precision2 = precision ** 2
+    nb = x.shape[0]
+    x_previous, y_previous = x[0], y[0]
+    mask = ones(nb, dtype=bool_)
+    for i in range(1, nb):
+        x_, y_ = x[i], y[i]
+        d_x = x_ - x_previous
+        if d_x > precision:
+            x_previous, y_previous = x_, y_
+            continue
+        d_y = y_ - y_previous
+        if d_y > precision:
+            x_previous, y_previous = x_, y_
+            continue
+        d2 = d_x ** 2 + d_y ** 2
+        if d2 > precision2:
+            x_previous, y_previous = x_, y_
+            continue
+        mask[i] = False
+    new_nb = mask.sum()
+    new_x, new_y = empty(new_nb, dtype=x.dtype), empty(new_nb, dtype=y.dtype)
+    j = 0
+    for i in range(nb):
+        if mask[i]:
+            new_x[j], new_y[j] = x[i], y[i]
+            j += 1
+    return new_x, new_y
+
+
 @njit(cache=True)
 def split_line(x, y, i):
     """

src/py_eddy_tracker/observations/observation.py

@@ -738,12 +738,15 @@ def propagate(
         return next_obs
 
     @staticmethod
-    def intern(flag):
-        return (
+    def intern(flag, public_label=False):
+        labels = (
             ("contour_lon_s", "contour_lat_s")
             if flag
             else ("contour_lon_e", "contour_lat_e")
         )
+        if public_label:
+            labels = [VAR_DESCR[label]['nc_name'] for label in labels]
+        return labels
 
     def match(self, other, intern=False, cmin=0):
         """return index and score compute with area