Reuse bitwise in BitMatrix.

This commit is contained in:
Camille GILLOT 2023-09-24 09:05:18 +00:00
parent af7819477a
commit 0adfe207d7

View File

@ -1699,14 +1699,15 @@ pub fn union_rows(&mut self, read: R, write: R) -> bool {
let (read_start, read_end) = self.range(read);
let (write_start, write_end) = self.range(write);
let words = &mut self.words[..];
let mut changed = false;
let mut changed = 0;
for (read_index, write_index) in iter::zip(read_start..read_end, write_start..write_end) {
let word = words[write_index];
let new_word = word | words[read_index];
words[write_index] = new_word;
changed |= word != new_word;
// See `bitwise` for the rationale.
changed |= word ^ new_word;
}
changed
changed != 0
}
/// Adds the bits from `with` to the bits from row `write`, and
@ -1715,14 +1716,7 @@ pub fn union_row_with(&mut self, with: &BitSet<C>, write: R) -> bool {
assert!(write.index() < self.num_rows);
assert_eq!(with.domain_size(), self.num_columns);
let (write_start, write_end) = self.range(write);
let mut changed = false;
for (read_index, write_index) in iter::zip(0..with.words.len(), write_start..write_end) {
let word = self.words[write_index];
let new_word = word | with.words[read_index];
self.words[write_index] = new_word;
changed |= word != new_word;
}
changed
bitwise(&mut self.words[write_start..write_end], &with.words, |a, b| a | b)
}
/// Sets every cell in `row` to true.