-minor english

Author: CoriPegliasco

src/py_eddy_tracker/featured_tracking/old_tracker_reference.py

@@ -21,13 +21,13 @@ def cost_function(records_in, records_out, distance):
         return distance
 
     def mask_function(self, other, distance):
-        """We mask link with ellips and ratio"""
-        # Compute Parameter of ellips
+        """We mask link with ellipse and ratio"""
+        # Compute Parameter of ellipse
         minor, major = 1.05, 1.5
-        y = self.basic_formula_ellips_major_axis(
+        y = self.basic_formula_ellipse_major_axis(
             self.lat, degrees=True, c0=minor, cmin=minor, cmax=major, lat1=23, lat2=5
         )
-        # mask from ellips
+        # mask from ellipse
         mask = self.shifted_ellipsoid_degrees_mask(
             other, minor=minor, major=y  # Minor can be bigger than major??
         )

src/py_eddy_tracker/observations/network.py

@@ -513,7 +513,6 @@ def relatives(self, obs, order=2):
             else:
                 segments_connexion[seg][0] = i_slice
 
-
             if i_p != -1:
 
                 if p_seg not in segments_connexion:
@@ -531,12 +530,7 @@ def relatives(self, obs, order=2):
                 segments_connexion[seg][1].append(n_seg)
                 segments_connexion[n_seg][1].append(seg)
 
-
-        i_obs = (
-            [obs]
-            if not hasattr(obs, "__iter__")
-            else obs
-        )
+        i_obs = [obs] if not hasattr(obs, "__iter__") else obs
         import numpy as np
 
         distance = zeros(segment.size, dtype=np.uint16) - 1

src/py_eddy_tracker/observations/observation.py

@@ -87,7 +87,7 @@ def shifted_ellipsoid_degrees_mask2(lon0, lat0, lon1, lat1, minor=1.5, major=1.5
     # Focal
     f_right = lon0
     f_left = f_right - (c - minor)
-    # Ellips center
+    # Ellipse center
     x_c = (f_left + f_right) * 0.5
 
     nb_0, nb_1 = lat0.shape[0], lat1.shape[0]
@@ -1248,7 +1248,7 @@ def shifted_ellipsoid_degrees_mask(self, other, minor=1.5, major=1.5):
         )
 
     def fixed_ellipsoid_mask(
-        self, other, minor=50, major=100, only_east=False, shifted_ellips=False
+        self, other, minor=50, major=100, only_east=False, shifted_ellipse=False
     ):
         dist = self.distance(other).T
         accepted = dist < minor
@@ -1272,13 +1272,13 @@ def fixed_ellipsoid_mask(
             )
 
             lon_self = self.lon[index_self]
-            if shifted_ellips:
-                x_center_ellips = lon_self - (major - minor) / 2
+            if shifted_ellipse:
+                x_center_ellipse = lon_self - (major - minor) / 2
             else:
-                x_center_ellips = lon_self
+                x_center_ellipse = lon_self
 
-            lon_left_f = x_center_ellips - f_degree
-            lon_right_f = x_center_ellips + f_degree
+            lon_left_f = x_center_ellipse - f_degree
+            lon_right_f = x_center_ellipse + f_degree
 
             dist_left_f = distance(
                 lon_left_f,
@@ -1302,7 +1302,7 @@ def fixed_ellipsoid_mask(
         return accepted.T
 
     @staticmethod
-    def basic_formula_ellips_major_axis(
+    def basic_formula_ellipse_major_axis(
         lats, cmin=1.5, cmax=10.0, c0=1.5, lat1=13.5, lat2=5.0, degrees=False
     ):
         """Give major axis in km with a given latitude"""
@@ -2054,8 +2054,8 @@ def contains(self, x, y, intern=False):
         :rtype: array[int32]
         """
         xname, yname = self.intern(intern)
-        m = ~ (isnan(x) + isnan(y))
-        i = -ones(x.shape, dtype='i4')
+        m = ~(isnan(x) + isnan(y))
+        i = -ones(x.shape, dtype="i4")
         i[m] = poly_indexs(x[m], y[m], self[xname], self[yname])
         return i
 

src/py_eddy_tracker/poly.py

@@ -522,9 +522,9 @@ def fit_circle(x, y):
 
 
 @njit(cache=True)
-def fit_ellips(x, y):
+def fit_ellipse(x, y):
     r"""
-    From a polygon, function will fit an ellips.
+    From a polygon, function will fit an ellipse.
 
     Must be call with local coordinates (in m, to get a radius in m).