leaf_masks now inherits agg_op from mask_tree #163

jacanchaplais · Oct 11, 2023 · 86ebc39 · 86ebc39
1 parent b72b459
commit 86ebc39
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/graphicle/select.py b/graphicle/select.py
@@ -870,8 +870,7 @@ def _leaf_mask_iter(
         for name, mask in branch.items():
             if exclude_latent and name == "latent":
                 continue
-            # TODO: look into contravariant type for this
-            yield from _leaf_mask_iter(name, mask, exclude_latent)  # type: ignore
+            yield from _leaf_mask_iter(name, mask, exclude_latent)
 
 
 def leaf_masks(mask_tree: gcl.MaskGroup) -> gcl.MaskGroup[gcl.MaskArray]:
@@ -882,6 +881,9 @@ def leaf_masks(mask_tree: gcl.MaskGroup) -> gcl.MaskGroup[gcl.MaskArray]:
 
     .. versionadded:: 0.1.11
 
+    .. versionchanged 0.3.7
+       Output ``MaskGroup`` matches agg_op of ``mask_tree``.
+
     Parameters
     ----------
     mask_tree : MaskGroup
@@ -893,7 +895,7 @@ def leaf_masks(mask_tree: gcl.MaskGroup) -> gcl.MaskGroup[gcl.MaskArray]:
     MaskGroup
         Flat ``MaskGroup`` of only the leaves of ``mask_tree``.
     """
-    mask_group = gcl.MaskGroup(agg_op="or")  # type: ignore
+    mask_group = gcl.MaskGroup(agg_op=mask_tree.agg_op)
     for name, branch in mask_tree.items():
         mask_group.update(dict(_leaf_mask_iter(name, branch)))  # type: ignore
     return mask_group