//! ```
#![no_std]
-
#![cfg_attr(all(test, feature = "nightly"), feature(test))]
-#[cfg(all(test, feature = "nightly"))] extern crate test;
-#[cfg(all(test, feature = "nightly"))] extern crate rand;
extern crate bit_vec;
+#[cfg(all(test, feature = "nightly"))]
+extern crate rand;
+#[cfg(all(test, feature = "nightly"))]
+extern crate test;
#[cfg(test)]
#[macro_use]
extern crate std;
-use bit_vec::{BitVec, Blocks, BitBlock};
-use core::cmp::Ordering;
+use bit_vec::{BitBlock, BitVec, Blocks};
use core::cmp;
+use core::cmp::Ordering;
use core::fmt;
use core::hash;
use core::iter::{self, Chain, Enumerate, FromIterator, Repeat, Skip, Take};
// Take two BitVec's, and return iterators of their words, where the shorter one
// has been padded with 0's
-fn match_words<'a, 'b, B: BitBlock>(a: &'a BitVec<B>, b: &'b BitVec<B>)
- -> (MatchWords<'a, B>, MatchWords<'b, B>)
-{
+fn match_words<'a, 'b, B: BitBlock>(
+ a: &'a BitVec<B>,
+ b: &'b BitVec<B>,
+) -> (MatchWords<'a, B>, MatchWords<'b, B>) {
let a_len = a.storage().len();
let b_len = b.storage().len();
// have to uselessly pretend to pad the longer one for type matching
if a_len < b_len {
- (a.blocks().enumerate().chain(iter::repeat(B::zero()).enumerate().take(b_len).skip(a_len)),
- b.blocks().enumerate().chain(iter::repeat(B::zero()).enumerate().take(0).skip(0)))
+ (
+ a.blocks()
+ .enumerate()
+ .chain(iter::repeat(B::zero()).enumerate().take(b_len).skip(a_len)),
+ b.blocks()
+ .enumerate()
+ .chain(iter::repeat(B::zero()).enumerate().take(0).skip(0)),
+ )
} else {
- (a.blocks().enumerate().chain(iter::repeat(B::zero()).enumerate().take(0).skip(0)),
- b.blocks().enumerate().chain(iter::repeat(B::zero()).enumerate().take(a_len).skip(b_len)))
+ (
+ a.blocks()
+ .enumerate()
+ .chain(iter::repeat(B::zero()).enumerate().take(0).skip(0)),
+ b.blocks()
+ .enumerate()
+ .chain(iter::repeat(B::zero()).enumerate().take(a_len).skip(b_len)),
+ )
}
}
impl<B: BitBlock> Default for BitSet<B> {
#[inline]
- fn default() -> Self { BitSet { bit_vec: Default::default() } }
+ fn default() -> Self {
+ BitSet {
+ bit_vec: Default::default(),
+ }
+ }
}
impl<B: BitBlock> FromIterator<usize> for BitSet<B> {
}
pub fn from_bytes(bytes: &[u8]) -> Self {
- BitSet { bit_vec: BitVec::from_bytes(bytes) }
+ BitSet {
+ bit_vec: BitVec::from_bytes(bytes),
+ }
}
}
impl<B: BitBlock> BitSet<B> {
-
/// Returns the capacity in bits for this bit vector. Inserting any
/// element less than this amount will not trigger a resizing.
///
}
#[inline]
- fn other_op<F>(&mut self, other: &Self, mut f: F) where F: FnMut(B, B) -> B {
+ fn other_op<F>(&mut self, other: &Self, mut f: F)
+ where
+ F: FnMut(B, B) -> B,
+ {
// Unwrap BitVecs
let self_bit_vec = &mut self.bit_vec;
let other_bit_vec = &other.bit_vec;
// Obtain original length
let old_len = bit_vec.storage().len();
// Obtain coarse trailing zero length
- let n = bit_vec.storage().iter().rev().take_while(|&&n| n == B::zero()).count();
+ let n = bit_vec
+ .storage()
+ .iter()
+ .rev()
+ .take_while(|&&n| n == B::zero())
+ .count();
// Truncate
let trunc_len = cmp::max(old_len - n, 1);
unsafe {
/// ```
#[inline]
pub fn union<'a>(&'a self, other: &'a Self) -> Union<'a, B> {
- fn or<B: BitBlock>(w1: B, w2: B) -> B { w1 | w2 }
+ fn or<B: BitBlock>(w1: B, w2: B) -> B {
+ w1 | w2
+ }
Union(BlockIter::from_blocks(TwoBitPositions {
set: self.bit_vec.blocks(),
/// ```
#[inline]
pub fn intersection<'a>(&'a self, other: &'a Self) -> Intersection<'a, B> {
- fn bitand<B: BitBlock>(w1: B, w2: B) -> B { w1 & w2 }
+ fn bitand<B: BitBlock>(w1: B, w2: B) -> B {
+ w1 & w2
+ }
let min = cmp::min(self.bit_vec.len(), other.bit_vec.len());
- Intersection(BlockIter::from_blocks(TwoBitPositions {
- set: self.bit_vec.blocks(),
- other: other.bit_vec.blocks(),
- merge: bitand,
- }).take(min))
+ Intersection(
+ BlockIter::from_blocks(TwoBitPositions {
+ set: self.bit_vec.blocks(),
+ other: other.bit_vec.blocks(),
+ merge: bitand,
+ })
+ .take(min),
+ )
}
/// Iterator over each usize stored in the `self` setminus `other`.
/// ```
#[inline]
pub fn difference<'a>(&'a self, other: &'a Self) -> Difference<'a, B> {
- fn diff<B: BitBlock>(w1: B, w2: B) -> B { w1 & !w2 }
+ fn diff<B: BitBlock>(w1: B, w2: B) -> B {
+ w1 & !w2
+ }
Difference(BlockIter::from_blocks(TwoBitPositions {
set: self.bit_vec.blocks(),
/// ```
#[inline]
pub fn symmetric_difference<'a>(&'a self, other: &'a Self) -> SymmetricDifference<'a, B> {
- fn bitxor<B: BitBlock>(w1: B, w2: B) -> B { w1 ^ w2 }
+ fn bitxor<B: BitBlock>(w1: B, w2: B) -> B {
+ w1 ^ w2
+ }
SymmetricDifference(BlockIter::from_blocks(TwoBitPositions {
set: self.bit_vec.blocks(),
self.other_op(other, |w1, w2| w1 ^ w2);
}
-/*
- /// Moves all elements from `other` into `Self`, leaving `other` empty.
- ///
- /// # Examples
- ///
- /// ```
- /// use bit_set::BitSet;
- ///
- /// let mut a = BitSet::new();
- /// a.insert(2);
- /// a.insert(6);
- ///
- /// let mut b = BitSet::new();
- /// b.insert(1);
- /// b.insert(3);
- /// b.insert(6);
- ///
- /// a.append(&mut b);
- ///
- /// assert_eq!(a.len(), 4);
- /// assert_eq!(b.len(), 0);
- /// assert_eq!(a, BitSet::from_bytes(&[0b01110010]));
- /// ```
- pub fn append(&mut self, other: &mut Self) {
- self.union_with(other);
- other.clear();
- }
-
- /// Splits the `BitSet` into two at the given key including the key.
- /// Retains the first part in-place while returning the second part.
- ///
- /// # Examples
- ///
- /// ```
- /// use bit_set::BitSet;
- ///
- /// let mut a = BitSet::new();
- /// a.insert(2);
- /// a.insert(6);
- /// a.insert(1);
- /// a.insert(3);
- ///
- /// let b = a.split_off(3);
- ///
- /// assert_eq!(a.len(), 2);
- /// assert_eq!(b.len(), 2);
- /// assert_eq!(a, BitSet::from_bytes(&[0b01100000]));
- /// assert_eq!(b, BitSet::from_bytes(&[0b00010010]));
- /// ```
- pub fn split_off(&mut self, at: usize) -> Self {
- let mut other = BitSet::new();
-
- if at == 0 {
- swap(self, &mut other);
- return other;
- } else if at >= self.bit_vec.len() {
- return other;
+ /*
+ /// Moves all elements from `other` into `Self`, leaving `other` empty.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use bit_set::BitSet;
+ ///
+ /// let mut a = BitSet::new();
+ /// a.insert(2);
+ /// a.insert(6);
+ ///
+ /// let mut b = BitSet::new();
+ /// b.insert(1);
+ /// b.insert(3);
+ /// b.insert(6);
+ ///
+ /// a.append(&mut b);
+ ///
+ /// assert_eq!(a.len(), 4);
+ /// assert_eq!(b.len(), 0);
+ /// assert_eq!(a, BitSet::from_bytes(&[0b01110010]));
+ /// ```
+ pub fn append(&mut self, other: &mut Self) {
+ self.union_with(other);
+ other.clear();
}
- // Calculate block and bit at which to split
- let w = at / BITS;
- let b = at % BITS;
+ /// Splits the `BitSet` into two at the given key including the key.
+ /// Retains the first part in-place while returning the second part.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use bit_set::BitSet;
+ ///
+ /// let mut a = BitSet::new();
+ /// a.insert(2);
+ /// a.insert(6);
+ /// a.insert(1);
+ /// a.insert(3);
+ ///
+ /// let b = a.split_off(3);
+ ///
+ /// assert_eq!(a.len(), 2);
+ /// assert_eq!(b.len(), 2);
+ /// assert_eq!(a, BitSet::from_bytes(&[0b01100000]));
+ /// assert_eq!(b, BitSet::from_bytes(&[0b00010010]));
+ /// ```
+ pub fn split_off(&mut self, at: usize) -> Self {
+ let mut other = BitSet::new();
+
+ if at == 0 {
+ swap(self, &mut other);
+ return other;
+ } else if at >= self.bit_vec.len() {
+ return other;
+ }
- // Pad `other` with `w` zero blocks,
- // append `self`'s blocks in the range from `w` to the end to `other`
- other.bit_vec.storage_mut().extend(repeat(0u32).take(w)
- .chain(self.bit_vec.storage()[w..].iter().cloned()));
- other.bit_vec.nbits = self.bit_vec.nbits;
+ // Calculate block and bit at which to split
+ let w = at / BITS;
+ let b = at % BITS;
- if b > 0 {
- other.bit_vec.storage_mut()[w] &= !0 << b;
- }
+ // Pad `other` with `w` zero blocks,
+ // append `self`'s blocks in the range from `w` to the end to `other`
+ other.bit_vec.storage_mut().extend(repeat(0u32).take(w)
+ .chain(self.bit_vec.storage()[w..].iter().cloned()));
+ other.bit_vec.nbits = self.bit_vec.nbits;
- // Sets `bit_vec.len()` and fixes the last block as well
- self.bit_vec.truncate(at);
+ if b > 0 {
+ other.bit_vec.storage_mut()[w] &= !0 << b;
+ }
- other
- }
-*/
+ // Sets `bit_vec.len()` and fixes the last block as well
+ self.bit_vec.truncate(at);
+
+ other
+ }
+ */
/// Returns the number of set bits in this set.
#[inline]
- pub fn len(&self) -> usize {
- self.bit_vec.blocks().fold(0, |acc, n| acc + n.count_ones() as usize)
+ pub fn len(&self) -> usize {
+ self.bit_vec
+ .blocks()
+ .fold(0, |acc, n| acc + n.count_ones() as usize)
}
/// Returns whether there are no bits set in this set
tail: T,
}
-impl<T, B: BitBlock> BlockIter<T, B> where T: Iterator<Item=B> {
+impl<T, B: BitBlock> BlockIter<T, B>
+where
+ T: Iterator<Item = B>,
+{
fn from_blocks(mut blocks: T) -> BlockIter<T, B> {
let h = blocks.next().unwrap_or(B::zero());
- BlockIter {tail: blocks, head: h, head_offset: 0}
+ BlockIter {
+ tail: blocks,
+ head: h,
+ head_offset: 0,
+ }
}
}
#[derive(Clone)]
pub struct SymmetricDifference<'a, B: 'a>(BlockIter<TwoBitPositions<'a, B>, B>);
-impl<'a, T, B: BitBlock> Iterator for BlockIter<T, B> where T: Iterator<Item=B> {
+impl<'a, T, B: BitBlock> Iterator for BlockIter<T, B>
+where
+ T: Iterator<Item = B>,
+{
type Item = usize;
fn next(&mut self) -> Option<usize> {
while self.head == B::zero() {
match self.tail.next() {
Some(w) => self.head = w,
- None => return None
+ None => return None,
}
self.head_offset += B::bits();
}
fn size_hint(&self) -> (usize, Option<usize>) {
match self.tail.size_hint() {
(_, Some(h)) => (0, Some(1 + h * B::bits())),
- _ => (0, None)
+ _ => (0, None),
}
}
}
(Some(a), Some(b)) => Some((self.merge)(a, b)),
(Some(a), None) => Some((self.merge)(a, B::zero())),
(None, Some(b)) => Some((self.merge)(B::zero(), b)),
- _ => return None
+ _ => return None,
}
}
let upper = match (au, bu) {
(Some(au), Some(bu)) => Some(cmp::max(au, bu)),
- _ => None
+ _ => None,
};
(cmp::max(a, b), upper)
impl<'a, B: BitBlock> Iterator for Iter<'a, B> {
type Item = usize;
- #[inline] fn next(&mut self) -> Option<usize> { self.0.next() }
- #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
+ #[inline]
+ fn next(&mut self) -> Option<usize> {
+ self.0.next()
+ }
+ #[inline]
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.0.size_hint()
+ }
}
impl<'a, B: BitBlock> Iterator for Union<'a, B> {
type Item = usize;
- #[inline] fn next(&mut self) -> Option<usize> { self.0.next() }
- #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
+ #[inline]
+ fn next(&mut self) -> Option<usize> {
+ self.0.next()
+ }
+ #[inline]
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.0.size_hint()
+ }
}
impl<'a, B: BitBlock> Iterator for Intersection<'a, B> {
type Item = usize;
- #[inline] fn next(&mut self) -> Option<usize> { self.0.next() }
- #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
+ #[inline]
+ fn next(&mut self) -> Option<usize> {
+ self.0.next()
+ }
+ #[inline]
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.0.size_hint()
+ }
}
impl<'a, B: BitBlock> Iterator for Difference<'a, B> {
type Item = usize;
- #[inline] fn next(&mut self) -> Option<usize> { self.0.next() }
- #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
+ #[inline]
+ fn next(&mut self) -> Option<usize> {
+ self.0.next()
+ }
+ #[inline]
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.0.size_hint()
+ }
}
impl<'a, B: BitBlock> Iterator for SymmetricDifference<'a, B> {
type Item = usize;
- #[inline] fn next(&mut self) -> Option<usize> { self.0.next() }
- #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
+ #[inline]
+ fn next(&mut self) -> Option<usize> {
+ self.0.next()
+ }
+ #[inline]
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.0.size_hint()
+ }
}
impl<'a, B: BitBlock> IntoIterator for &'a BitSet<B> {
#[cfg(test)]
mod tests {
- use std::cmp::Ordering::{Equal, Greater, Less};
use super::BitSet;
use bit_vec::BitVec;
+ use std::cmp::Ordering::{Equal, Greater, Less};
use std::vec::Vec;
#[test]
assert_eq!(idxs, [0, 2, 3]);
let long: BitSet = (0..10000).filter(|&n| n % 2 == 0).collect();
- let real: Vec<_> = (0..10000/2).map(|x| x*2).collect();
+ let real: Vec<_> = (0..10000 / 2).map(|x| x * 2).collect();
let idxs: Vec<_> = long.iter().collect();
assert_eq!(idxs, real);
for &l in &lengths {
let bitset = BitSet::from_bit_vec(BitVec::from_elem(l, b));
assert_eq!(bitset.contains(1), b);
- assert_eq!(bitset.contains((l-1)), b);
+ assert_eq!(bitset.contains((l - 1)), b);
assert!(!bitset.contains(l));
}
}
assert!(b.contains(1000));
}
-/*
- #[test]
- fn test_bit_set_append() {
- let mut a = BitSet::new();
- a.insert(2);
- a.insert(6);
+ /*
+ #[test]
+ fn test_bit_set_append() {
+ let mut a = BitSet::new();
+ a.insert(2);
+ a.insert(6);
- let mut b = BitSet::new();
- b.insert(1);
- b.insert(3);
- b.insert(6);
+ let mut b = BitSet::new();
+ b.insert(1);
+ b.insert(3);
+ b.insert(6);
- a.append(&mut b);
+ a.append(&mut b);
- assert_eq!(a.len(), 4);
- assert_eq!(b.len(), 0);
- assert!(b.capacity() >= 6);
+ assert_eq!(a.len(), 4);
+ assert_eq!(b.len(), 0);
+ assert!(b.capacity() >= 6);
- assert_eq!(a, BitSet::from_bytes(&[0b01110010]));
- }
+ assert_eq!(a, BitSet::from_bytes(&[0b01110010]));
+ }
- #[test]
- fn test_bit_set_split_off() {
- // Split at 0
- let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01101011, 0b10101101]);
+ #[test]
+ fn test_bit_set_split_off() {
+ // Split at 0
+ let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01101011, 0b10101101]);
- let b = a.split_off(0);
+ let b = a.split_off(0);
- assert_eq!(a.len(), 0);
- assert_eq!(b.len(), 21);
+ assert_eq!(a.len(), 0);
+ assert_eq!(b.len(), 21);
- assert_eq!(b, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01101011, 0b10101101]);
+ assert_eq!(b, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01101011, 0b10101101]);
- // Split behind last element
- let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01101011, 0b10101101]);
+ // Split behind last element
+ let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01101011, 0b10101101]);
- let b = a.split_off(50);
+ let b = a.split_off(50);
- assert_eq!(a.len(), 21);
- assert_eq!(b.len(), 0);
+ assert_eq!(a.len(), 21);
+ assert_eq!(b.len(), 0);
- assert_eq!(a, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01101011, 0b10101101]));
+ assert_eq!(a, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01101011, 0b10101101]));
- // Split at arbitrary element
- let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01101011, 0b10101101]);
+ // Split at arbitrary element
+ let mut a = BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01101011, 0b10101101]);
- let b = a.split_off(34);
+ let b = a.split_off(34);
- assert_eq!(a.len(), 12);
- assert_eq!(b.len(), 9);
+ assert_eq!(a.len(), 12);
+ assert_eq!(b.len(), 9);
- assert_eq!(a, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
- 0b00110011, 0b01000000]));
- assert_eq!(b, BitSet::from_bytes(&[0, 0, 0, 0,
- 0b00101011, 0b10101101]));
- }
-*/
+ assert_eq!(a, BitSet::from_bytes(&[0b10100000, 0b00010010, 0b10010010,
+ 0b00110011, 0b01000000]));
+ assert_eq!(b, BitSet::from_bytes(&[0, 0, 0, 0,
+ 0b00101011, 0b10101101]));
+ }
+ */
}
#[cfg(all(test, feature = "nightly"))]
mod bench {
use super::BitSet;
use bit_vec::BitVec;
- use rand::{Rng, thread_rng, ThreadRng};
+ use rand::{thread_rng, Rng, ThreadRng};
- use test::{Bencher, black_box};
+ use test::{black_box, Bencher};
const BENCH_BITS: usize = 1 << 14;
const BITS: usize = 32;
#[bench]
fn bench_bit_vecset_iter(b: &mut Bencher) {
- let bit_vec = BitSet::from_bit_vec(BitVec::from_fn(BENCH_BITS,
- |idx| {idx % 3 == 0}));
+ let bit_vec = BitSet::from_bit_vec(BitVec::from_fn(BENCH_BITS, |idx| idx % 3 == 0));
b.iter(|| {
let mut sum = 0;
for idx in &bit_vec {
projects / bit-set.git / commitdiff