From 6620604587d8413119a74ba7dcf7b42008fbbfa4 Mon Sep 17 00:00:00 2001 From: Cori Pegliasco Date: Thu, 19 Nov 2020 17:01:04 +0100 Subject: [PATCH 1/2] add test for lifetime (item) --- tests/test_track.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_track.py b/tests/test_track.py index ac10b749..f1d5903e 100644 --- a/tests/test_track.py +++ b/tests/test_track.py @@ -45,3 +45,6 @@ def test_area_tracking_parameter(): c.to_netcdf(h) c_reloaded = Correspondances.from_netcdf(h) assert class_kw == c_reloaded.class_kw + + # test access to the lifetime (item) + eddies_tracked["lifetime"] From 88fa7f61f590481b4281019c426365ded5f3bc0d Mon Sep 17 00:00:00 2001 From: Cori Pegliasco Date: Thu, 19 Nov 2020 17:02:43 +0100 Subject: [PATCH 2/2] add lifetime as attribut (item) --- src/py_eddy_tracker/observations/observation.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/py_eddy_tracker/observations/observation.py b/src/py_eddy_tracker/observations/observation.py index f4c53336..5702e5e8 100644 --- a/src/py_eddy_tracker/observations/observation.py +++ b/src/py_eddy_tracker/observations/observation.py @@ -288,6 +288,8 @@ def __getitem__(self, attr: str): return self.obs[attr] elif attr in VAR_DESCR_inv: return self.obs[VAR_DESCR_inv[attr]] + elif attr in ("lifetime", "age"): + return getattr(self, attr) raise KeyError("%s unknown" % attr) def __getattr__(self, attr): @@ -1104,12 +1106,7 @@ def cost_function(records_in, records_out, distance): def shifted_ellipsoid_degrees_mask(self, other, minor=1.5, major=1.5): return shifted_ellipsoid_degrees_mask2( - self.lon, - self.lat, - other.lon, - other.lat, - minor, - major, + self.lon, self.lat, other.lon, other.lat, minor, major, ) def fixed_ellipsoid_mask(