Skip to content

Commit

Permalink
feat: allow nested basins
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Dec 30, 2023
1 parent ffc4341 commit 1ee7009
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
0.55.8
0.56.0
- feat: allow nested basins
- fix: make sure basins are always closed on context exit (#238)
- enh: requests session pooling for fmt_http and fmt_dcor
- enh: implement context manager for RTDCBase
Expand Down
13 changes: 11 additions & 2 deletions dclab/rtdc_dataset/feat_basin.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,18 @@ def ds(self):

@property
def features(self):
"""Features made available by the basin"""
"""Features made available by the basin
.. versionchanged: 0.56.0
Return nested basin features
"""
if self._features is None:
self._features = self.ds.features_innate
# If features are not specified already, either by previous call
# to this method or during initialization from basin definition,
# then make the innate and *all* the basin features available.
self._features = sorted(set(self.ds.features_innate
+ self.ds.features_basin))
return self._features

def as_dict(self):
Expand Down

0 comments on commit 1ee7009

Please sign in to comment.