Skip to content

Commit a63344f

Browse files
ludwigVonKoopaAntSimi
authored andcommitted
add new file for apidoc, change spliting_event, adding comment
change spliting_event to reflext what merging_event do
1 parent f66bfde commit a63344f

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

doc/api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ API reference
1414
py_eddy_tracker.observations.network
1515
py_eddy_tracker.observations.observation
1616
py_eddy_tracker.observations.tracking
17+
py_eddy_tracker.observations.groups
1718
py_eddy_tracker.eddy_feature
1819
py_eddy_tracker.generic
1920
py_eddy_tracker.gui

src/py_eddy_tracker/observations/groups.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ def filled_by_interpolation(self, mask):
102102
)
103103

104104
def insert_virtual(self):
105+
"""insert virtual observation on segments where observations were not found"""
105106

106107
dt_theorical = median(self.time[1:] - self.time[:-1])
107108
indices = self.get_missing_indices(dt_theorical)
@@ -118,14 +119,9 @@ def insert_virtual(self):
118119
mask = zeros(size_obs_corrected, dtype=bool)
119120
mask[indices_corrected] = 1
120121

121-
# time2 = np.empty(n.time.size+indices.size, dtype=n.time.dtype)
122-
# time2[mask] = -1
123-
# time2[~mask] = n.time
124-
125-
# new_TEO = TrackEddiesObservations.new_like(n, size_obs_corrected)
126122
new_TEO = self.new_like(self, size_obs_corrected)
127123
new_TEO.obs[~mask] = self.obs
128124
new_TEO.filled_by_interpolation(mask)
129125
new_TEO.virtual[:] = mask
130126
new_TEO.fix_next_previous_obs()
131-
return new_TEO
127+
return new_TEO

src/py_eddy_tracker/observations/network.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ def merging_event(self, triplet=False, only_index=False):
838838
else:
839839
return self.extract_event(idx_m1)
840840

841-
def spliting_event(self, triplet=False):
841+
def spliting_event(self, triplet=False, only_index=False):
842842
"""Return observation before a splitting event.
843843
844844
If `triplet=True` return the eddy before a splitting event, the eddy after the splitting event,
@@ -859,14 +859,23 @@ def spliting_event(self, triplet=False):
859859
idx_s1_start.append(i.start)
860860
idx_s1.append(next_obs[i_p])
861861
idx_s0.append(i_p)
862+
862863
if triplet:
863-
return (
864-
self.extract_event(list(idx_s0)),
865-
self.extract_event(list(idx_s1)),
866-
self.extract_event(list(idx_s1_start)),
867-
)
864+
if only_index:
865+
return (idx_s0, idx_s1, idx_s1_start)
866+
else:
867+
return (
868+
self.extract_event(list(idx_s0)),
869+
self.extract_event(list(idx_s1)),
870+
self.extract_event(list(idx_s1_start)),
871+
)
872+
868873
else:
869-
return self.extract_event(list(set(idx_s0)))
874+
idx_s0 = list(set(idx_s0))
875+
if only_index:
876+
return idx_s0
877+
else:
878+
return self.extract_event(idx_s0)
870879

871880
def dissociate_network(self):
872881
"""

0 commit comments

Comments
 (0)