Skip to content

Commit b1e8448

Browse files
blagininclaude
andauthored
Duplicate handling in Mask::from_excluded_indices (#11164)
Fix `Mask::from_excluded_indices` to count duplicate indices only once --------- Signed-off-by: blaginin <[email protected]> Co-authored-by: Claude Mythos 5.1 <[email protected]>
1 parent ce6ccb8 commit b1e8448

2 files changed

Lines changed: 30 additions & 11 deletions

File tree

‎vortex-mask/src/lib.rs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -280,27 +280,28 @@ impl Mask {
280280
}
281281

282282
/// Create a new [`Mask`] from an [`IntoIterator<Item = usize>`] of indices to be excluded.
283+
///
284+
/// Indices may be in any order and duplicates are ignored.
285+
///
286+
/// # Panics
287+
///
288+
/// Panics if an index is out of bounds.
283289
pub fn from_excluded_indices(len: usize, indices: impl IntoIterator<Item = usize>) -> Self {
284290
let mut buf = BitBufferMut::new_set(len);
285-
286-
let mut false_count: usize = 0;
287-
indices.into_iter().for_each(|idx| {
288-
buf.unset(idx);
289-
false_count += 1;
290-
});
291-
debug_assert_eq!(buf.len(), len);
292-
let true_count = len - false_count;
291+
indices.into_iter().for_each(|idx| buf.unset(idx));
292+
let buffer = buf.freeze();
293+
let true_count = buffer.true_count();
293294

294295
// Return optimized variants when appropriate
295-
if false_count == 0 {
296+
if true_count == len {
296297
return Self::AllTrue(len);
297298
}
298-
if false_count == len {
299+
if true_count == 0 {
299300
return Self::AllFalse(len);
300301
}
301302

302303
Self::Values(Arc::new(MaskValues {
303-
buffer: buf.freeze(),
304+
buffer,
304305
indices: Default::default(),
305306
slices: Default::default(),
306307
true_count,

‎vortex-mask/src/tests.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,3 +789,21 @@ fn mask_iter_matches_value(#[case] mask: Mask, #[case] expected: Vec<bool>) {
789789
assert_eq!(it.len(), mask.len() - 1);
790790
}
791791
}
792+
793+
/// `from_excluded_indices` must count each excluded position once: `[0, 0]` excludes a single row.
794+
#[rstest]
795+
#[case::fewer_than_len(vec![0, 0], vec![1, 2])]
796+
#[case::equal_to_len(vec![0, 0, 0], vec![1, 2])]
797+
#[case::more_than_len(vec![0, 0, 0, 0], vec![1, 2])]
798+
#[case::non_adjacent(vec![2, 0, 2], vec![1])]
799+
#[case::all_excluded(vec![2, 0, 2, 1], vec![])]
800+
fn from_excluded_indices_counts_duplicates_once(
801+
#[case] excluded: Vec<usize>,
802+
#[case] included: Vec<usize>,
803+
) {
804+
let mask = Mask::from_excluded_indices(3, excluded);
805+
assert_eq!(mask.true_count(), included.len());
806+
let expected = Mask::from_indices(3, included);
807+
assert_eq!(mask, expected);
808+
assert_eq!(mask.density(), expected.density());
809+
}

0 commit comments

Comments
 (0)