Solve bug due to a method name changed not reported everywhere

Author: AntSimi

examples/02_eddy_identification/pet_eddy_detection_gulf_stream.py

@@ -101,12 +101,12 @@ def update_axes(ax, mappable=None):
 update_axes(ax)
 
 # %%
-# Criteria for rejecting a contour
-# 0. - Accepted (green)
-# 1. - Rejection for shape error (red)
-# 2. - Masked value within contour (blue)
-# 3. - Under or over the pixel limit bounds (black)
-# 4. - Amplitude criterion (yellow)
+# Criteria for rejecting a contour :
+#  0. Accepted (green)
+#  1. Rejection for shape error (red)
+#  2. Masked value within contour (blue)
+#  3. Under or over the pixel limit bounds (black)
+#  4. Amplitude criterion (yellow)
 ax = start_axes("Contours' rejection criteria")
 g.contours.display(ax, only_unused=True, lw=0.5, display_criterion=True)
 update_axes(ax)

examples/08_tracking_manipulation/pet_track_anim.py

@@ -20,13 +20,13 @@
 
 # %%
 # Run animation
-# Key shortcut
-#   Escape => exit
-#   SpaceBar => pause
-#   left arrow => t - 1
-#   right arrow => t + 1
-#   + => speed increase of 10 %
-#   - => speed decrease of 10 %
+# Key shortcut :
+#  * Escape => exit
+#  * SpaceBar => pause
+#  * left arrow => t - 1
+#  * right arrow => t + 1
+#  * \+ => speed increase of 10 %
+#  * \- => speed decrease of 10 %
 a = Anim(eddy, sleep_event=1e-10, intern=True, figsize=(8, 3.5), cmap="viridis")
 a.txt.set_position((17, 34.6))
 a.ax.set_xlim(16.5, 23)

examples/10_tracking_diagnostics/pet_groups.py

@@ -31,7 +31,7 @@
 def stats_compilation(dataset, groups, field, bins, filter=None):
     datas = dict(ref=dataset.bins_stat(field, bins=bins, mask=filter)[1], y=dict())
     for k, index in groups.items():
-        i = dataset.merge_indexs(filter, index)
+        i = dataset.merge_filters(filter, index)
         x, datas["y"][k] = dataset.bins_stat(field, bins=bins, mask=i)
     datas["x"], datas["bins"] = x, bins
     return datas

notebooks/python_module/02_eddy_identification/pet_eddy_detection_gulf_stream.ipynb

@@ -26,7 +26,7 @@
       },
       "outputs": [],
       "source": [
-        "from numpy import arange\nfrom datetime import datetime\nfrom matplotlib import pyplot as plt\nfrom py_eddy_tracker.dataset.grid import RegularGridDataset\nfrom py_eddy_tracker import data\nfrom py_eddy_tracker.eddy_feature import Contours"
+        "from datetime import datetime\n\nfrom matplotlib import pyplot as plt\nfrom numpy import arange\n\nfrom py_eddy_tracker import data\nfrom py_eddy_tracker.dataset.grid import RegularGridDataset\nfrom py_eddy_tracker.eddy_feature import Contours"
       ]
     },
     {
@@ -170,7 +170,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "Criteria for rejecting a contour\n0. - Accepted (green)\n1. - Rejection for shape error (red)\n2. - Masked value within contour (blue)\n3. - Under or over the pixel limit bounds (black)\n4. - Amplitude criterion (yellow)\n\n"
+        "Criteria for rejecting a contour :\n 0. Accepted (green)\n 1. Rejection for shape error (red)\n 2. Masked value within contour (blue)\n 3. Under or over the pixel limit bounds (black)\n 4. Amplitude criterion (yellow)\n\n"
       ]
     },
     {

notebooks/python_module/08_tracking_manipulation/pet_track_anim.ipynb

@@ -26,7 +26,7 @@
       },
       "outputs": [],
       "source": [
-        "from py_eddy_tracker.observations.tracking import TrackEddiesObservations\nfrom py_eddy_tracker.appli.gui import Anim\nimport py_eddy_tracker_sample"
+        "import py_eddy_tracker_sample\n\nfrom py_eddy_tracker.appli.gui import Anim\nfrom py_eddy_tracker.observations.tracking import TrackEddiesObservations"
       ]
     },
     {
@@ -51,7 +51,7 @@
       "cell_type": "markdown",
       "metadata": {},
       "source": [
-        "Run animation\nKey shortcut\n  Escape => exit\n  SpaceBar => pause\n  left arrow => t - 1\n  right arrow => t + 1\n  + => speed increase of 10 %\n  - => speed decrease of 10 %\n\n"
+        "Run animation\nKey shortcut :\n * Escape => exit\n * SpaceBar => pause\n * left arrow => t - 1\n * right arrow => t + 1\n * \\+ => speed increase of 10 %\n * \\- => speed decrease of 10 %\n\n"
       ]
     },
     {

notebooks/python_module/10_tracking_diagnostics/pet_groups.ipynb

@@ -80,7 +80,7 @@
       },
       "outputs": [],
       "source": [
-        "def stats_compilation(dataset, groups, field, bins, filter=None):\n    datas = dict(ref=dataset.bins_stat(field, bins=bins, mask=filter)[1], y=dict())\n    for k, index in groups.items():\n        i = dataset.merge_indexs(filter, index)\n        x, datas[\"y\"][k] = dataset.bins_stat(field, bins=bins, mask=i)\n    datas[\"x\"], datas[\"bins\"] = x, bins\n    return datas\n\n\ndef plot_stats(ax, bins, x, y, ref, box=False, cmap=None, percentiles=None, **kw):\n    base, ref = ones(x.shape) * 100.0, ref / 100.0\n    x = arange(bins.shape[0]).repeat(2)[1:-1] if box else x\n    y0 = base\n    if cmap is not None:\n        cmap, nb_groups = plt.get_cmap(cmap), len(y)\n    keys = tuple(y.keys())\n    for i, k in enumerate(keys[::-1]):\n        y1 = y0 - y[k] / ref\n        args = (y0.repeat(2), y1.repeat(2)) if box else (y0, y1)\n        if cmap is not None:\n            kw[\"color\"] = cmap(1 - i / (nb_groups - 1))\n        ax.fill_between(x, *args, label=k, **kw)\n        y0 = y1\n    if percentiles:\n        for b in bins:\n            ax.axvline(b, **percentiles)"
+        "def stats_compilation(dataset, groups, field, bins, filter=None):\n    datas = dict(ref=dataset.bins_stat(field, bins=bins, mask=filter)[1], y=dict())\n    for k, index in groups.items():\n        i = dataset.merge_filters(filter, index)\n        x, datas[\"y\"][k] = dataset.bins_stat(field, bins=bins, mask=i)\n    datas[\"x\"], datas[\"bins\"] = x, bins\n    return datas\n\n\ndef plot_stats(ax, bins, x, y, ref, box=False, cmap=None, percentiles=None, **kw):\n    base, ref = ones(x.shape) * 100.0, ref / 100.0\n    x = arange(bins.shape[0]).repeat(2)[1:-1] if box else x\n    y0 = base\n    if cmap is not None:\n        cmap, nb_groups = plt.get_cmap(cmap), len(y)\n    keys = tuple(y.keys())\n    for i, k in enumerate(keys[::-1]):\n        y1 = y0 - y[k] / ref\n        args = (y0.repeat(2), y1.repeat(2)) if box else (y0, y1)\n        if cmap is not None:\n            kw[\"color\"] = cmap(1 - i / (nb_groups - 1))\n        ax.fill_between(x, *args, label=k, **kw)\n        y0 = y1\n    if percentiles:\n        for b in bins:\n            ax.axvline(b, **percentiles)"
       ]
     },
     {

src/py_eddy_tracker/observations/observation.py

@@ -1786,7 +1786,7 @@ def bins_stat(self, xname, bins=None, yname=None, method=None, mask=None):
         .. minigallery:: py_eddy_tracker.EddiesObservations.bins_stat
         """
         v = self[xname] if isinstance(xname, str) else xname
-        mask = self.merge_indexs(mask)
+        mask = self.merge_filters(mask)
         v = v[mask]
         if bins is None:
             bins = arange(v.min(), v.max() + 2)