bmap

Check-in Differences
Login

Check-in Differences

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Difference From bmap-0.1.0 To bmap-0.2.0

2024-03-21
09:02
Update changelog. check-in: 93c247c785 user: jan tags: trunk
08:57
Happy clippy. check-in: e5ebec2954 user: jan tags: bmap-0.2.0, trunk
08:54
Merge. check-in: ae8ad4dec1 user: jan tags: trunk
08:42
Make CountedBitmap::new() infallible. Add is_empty(). Happy clippy. check-in: cd0585a511 user: jan tags: trunk
2023-09-22
03:18
Happy clippy. check-in: 63435f651a user: jan tags: trunk
2022-05-29
19:06
Update readme. check-in: 3e98ced80f user: jan tags: bmap-0.1.0, trunk
18:54
Move from old repo. check-in: a1910fe0e2 user: jan tags: trunk

Changes to .efiles.

1
2


3
4
5
1
2
3
4
5
6



+
+


-
Cargo.toml
README.md
www/index.md
www/changelog.md
src/err.rs
src/lib.rs
www/index.md

Changes to Cargo.toml.

1
2
3

4
5

6
7
8
9
10
11
12
13
14
15
16




17
18
19
1
2

3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24


-
+


+











+
+
+
+



[package]
name = "bmap"
version = "0.1.0"
version = "0.2.0"
edition = "2021"
license = "0BSD"
# https://crates.io/category_slugs
categories = [ "data-structures" ]
keywords = [ "bitmap", "bitvec" ]
repository = "https://repos.qrnch.tech/pub/bmap"
description = "A bitmap with an internal counter."
exclude = [
  ".fossil-settings",
  "www",
  ".efiles",
  ".fslckout",
  "rustfmt.toml"
]

# https://doc.rust-lang.org/cargo/reference/manifest.html#the-badges-section
[badges]
maintenance = { status = "passively-maintained" }

[dependencies]

Changes to src/err.rs.

1
2
3
4
5
6
7
8
9
10
11
12

13
14
15
16
17
18
19
1
2
3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18
19











-
+







use std::fmt;

#[derive(Debug)]
pub enum Error {
  OutOfBounds
}

impl std::error::Error for Error {}

impl fmt::Display for Error {
  fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
    match &*self {
    match self {
      Error::OutOfBounds => {
        write!(f, "Out of bounds")
      }
    }
  }
}

Changes to src/lib.rs.

21
22
23
24
25
26
27
28

29
30
31
32
33

34
35

36
37
38
39
40
41


42
43
44
45
46

47

48
49
50
51
52
53

















54

55
56
57
58
59
60

61

62
63
64
65
66
67
68
69
70
71
72
73
74
75
76

77
78
79
80
81
82
83
84
85
86
87
88

89

90
91

92
93




94
95
96
97
98
99
100
101
102
103
104
105

106

107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125

126

127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146

147

148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182

183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202

203
204
205
206
207




208
209


210
211
212
213
214
215
216
217
218
219
220
221

222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241

242
243
244
245
246
247
248
21
22
23
24
25
26
27

28
29
30
31
32

33


34
35
36
37



38
39
40
41
42
43
44
45

46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69

70
71
72
73
74
75
76
77

78
79
80
81
82
83
84
85
86
87

88
89
90
91

92
93
94
95
96
97
98
99

100
101
102
103
104

105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120

121
122
123
124
125
126

127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

142
143
144
145
146

147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162

163
164
165
166
167

168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

187
188
189
190
191
192
193
194

195
196
197
198
199
200

201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220

221





222
223
224
225


226
227
228
229
230
231
232
233
234
235
236
237
238

239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258

259
260
261
262
263
264
265
266







-
+




-
+
-
-
+



-
-
-
+
+





+
-
+






+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+






+
-
+









-




-
+







-




+
-
+


+


+
+
+
+






-





+
-
+














-




+
-
+















-




+
-
+


















-








-






-
+



















-
+
-
-
-
-
-
+
+
+
+
-
-
+
+











-
+



















-
+







}


impl CountedBitmap {
  /// Create a new bit vector which can hold `bitcount` number of bits.
  ///
  /// All bits will be initialized to `0`.
  pub fn new(bitcount: usize) -> Result<Self, Error> {
  pub fn new(bitcount: usize) -> Self {
    let align = NUM_WORD_BITS; // number of bits in bitvec slot
    let num = bitcount;
    let len = (num + align - 1) / align;

    let mut bits = Vec::with_capacity(len);
    let bits = vec![0; len];
    bits.resize(len, 0);
    Ok(Self {
    Self {
      bits,
      length: bitcount,
      remain: bitcount
    })
  }

    }
  }

  /// Return the number of bits in bitmap.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let bmap = CountedBitmap::new(42).unwrap();
  /// let bmap = CountedBitmap::new(42);
  /// assert_eq!(bmap.len(), 42);
  /// ```
  #[inline(always)]
  pub fn len(&self) -> usize {
    self.length
  }
  /// Returns true if no bits have been set.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(42);
  /// assert!(bmap.is_empty());
  ///
  /// bmap.set(11);
  /// assert!(!bmap.is_empty());
  ///
  /// // Special case -- a zero-length bitmap is considered to be empty
  /// let bmap = CountedBitmap::new(0);
  /// assert!(bmap.is_empty());
  /// ```
  pub fn is_empty(&self) -> bool {
    self.remain == self.length

  }

  /// Return number of bits that have not been set.  (I.e. number of bits
  /// remaining to be set).
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// assert_eq!(bmap.remain(), 4);
  /// bmap.set(1);
  /// assert_eq!(bmap.remain(), 3);
  /// ```
  #[inline(always)]
  pub fn remain(&self) -> usize {
    self.remain
  }


  /// Return how many many bits are set to 1 in relative terms.  The returned
  /// value will be a value between 0.0 and 1.0 (inclusive-inclusive).  For a
  /// 0-length bit vector the value 1.0 will be returned.
  pub fn progress(&self) -> f64 {
    if self.len() == 0 {
    if self.is_empty() {
      1.0
    } else {
      let done = (self.length - self.remain) as f64;
      done / self.len() as f64
    }
  }


  /// Return a boolean indicating whether all bits have been set.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(2).unwrap();
  /// let mut bmap = CountedBitmap::new(2);
  /// assert!(bmap.is_finished() == false);
  /// bmap.set(0);
  /// assert!(bmap.is_finished() == false);
  /// bmap.set(1);
  /// assert!(bmap.is_finished() == true);
  ///
  /// // Special case: zero-length bitmap is always finished.
  /// let mut bmap = CountedBitmap::new(0);
  /// assert!(bmap.is_finished() == true);
  /// ```
  #[inline(always)]
  pub fn is_finished(&self) -> bool {
    self.remain == 0
  }


  /// Given a bit index, return `true` is the corresponding bit is set.  Return
  /// `false` otherwise.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(2).unwrap();
  /// let mut bmap = CountedBitmap::new(2);
  /// assert_eq!(bmap.is_set(0).unwrap(), false);
  /// bmap.set(0).unwrap();
  /// assert_eq!(bmap.is_set(0).unwrap(), true);
  /// ```
  #[inline(always)]
  pub fn is_set(&self, idx: usize) -> Result<bool, Error> {
    let (iword, bitval) = self.get_bidx(idx)?;

    // SAFETY: The index has been validated already.
    let v = unsafe { self.bits.get_unchecked(iword) };

    Ok(v & bitval != 0)
  }


  /// Set a bit.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(2).unwrap();
  /// ```
  #[inline(always)]
  pub fn set(&mut self, idx: usize) -> Result<(), Error> {
    let (iword, bitval) = self.get_bidx(idx)?;

    // SAFETY: The index has been validated already.
    let v = unsafe { self.bits.get_unchecked_mut(iword) };
    if *v & bitval == 0 {
      *v |= bitval;
      self.remain -= 1;
    }
    Ok(())
  }


  /// Clear a bit.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(2).unwrap();
  /// assert_eq!(bmap.is_set(2).unwrap(), true);
  /// bmap.unset(2).unwrap();
  /// assert_eq!(bmap.is_set(2).unwrap(), false);
  /// ```
  #[inline(always)]
  pub fn unset(&mut self, idx: usize) -> Result<(), Error> {
    let (iword, bitval) = self.get_bidx(idx)?;

    // SAFETY: The index has been validated already.
    let v = unsafe { self.bits.get_unchecked_mut(iword) };
    if *v & bitval != 0 {
      *v &= !bitval;
      self.remain += 1;
    }
    Ok(())
  }


  /// Clear the bitmap.
  ///
  /// Sets all bits to zero and resets the remaining counter.
  pub fn clear(&mut self) {
    self.bits.as_mut_slice().fill(0);
    self.remain = self.length;
  }


  /// If bit at the specified index is not set, then call closure.  If closure
  /// returns `true` then set bit.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  ///
  /// let mut bmap = CountedBitmap::new(1).unwrap();
  /// let mut bmap = CountedBitmap::new(1);
  /// let mut set_to_true = false;
  /// let ret = bmap
  ///   .cond_set(0, || {
  ///     set_to_true = true;
  ///     true
  ///   })
  ///   .unwrap();
  /// assert_eq!(ret, true);
  /// assert_eq!(bmap.is_finished(), true);
  /// assert_eq!(set_to_true, true);
  /// ```
  pub fn cond_set<F>(&mut self, idx: usize, mut f: F) -> Result<bool, Error>
  where
    F: FnMut() -> bool
  {
    let (iword, bitval) = self.get_bidx(idx)?;

    // SAFETY: The index has already been validated.
    let v = unsafe { self.bits.get_unchecked_mut(iword) };
    if *v & bitval == 0 {
    if *v & bitval == 0 && f() {
      if f() {
        *v |= bitval;
        self.remain -= 1;
        return Ok(true);
      }
      *v |= bitval;
      self.remain -= 1;
      Ok(true)
    } else {
    }
    Ok(false)
      Ok(false)
    }
  }
}


/// Iterators.
impl CountedBitmap {
  /// Return an iterator that returns each of the container's bit values as
  /// booleans.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(1).unwrap();
  /// bmap.set(2).unwrap();
  /// let mut it = bmap.iter().enumerate();
  /// assert_eq!(it.next(), Some((0, false)));
  /// assert_eq!(it.next(), Some((1, true)));
  /// assert_eq!(it.next(), Some((2, true)));
  /// assert_eq!(it.next(), Some((3, false)));
  /// assert_eq!(it.next(), None);
  /// ```
  pub fn iter(&self) -> BitIter {
    BitIter { bmap: self, idx: 0 }
  }


  /// Create an iterator that will return the indexes of all zeroes in the bit
  /// map.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(1).unwrap();
  /// bmap.set(2).unwrap();
  /// let mut it = bmap.iter_zeroes();
  /// assert_eq!(it.next(), Some(0));
  /// assert_eq!(it.next(), Some(3));
  /// assert_eq!(it.next(), None);
  /// ```
256
257
258
259
260
261
262
263

264
265
266
267
268
269
270
274
275
276
277
278
279
280

281
282
283
284
285
286
287
288







-
+









  /// Create an iterator that will return the indexes of all ones in the bit
  /// map.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(1).unwrap();
  /// bmap.set(2).unwrap();
  /// let mut it = bmap.iter_ones();
  /// assert_eq!(it.next(), Some(1));
  /// assert_eq!(it.next(), Some(2));
  /// assert_eq!(it.next(), None);
  /// ```
278
279
280
281
282
283
284
285

286
287
288
289
290
291
292
296
297
298
299
300
301
302

303
304
305
306
307
308
309
310







-
+









  /// Create an iterator that will return index ranges of contiguous blocks of
  /// zeroes.
  ///
  /// ```
  /// use bmap::CountedBitmap;
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(0).unwrap();
  /// bmap.set(1).unwrap();
  /// let mut it = bmap.iter_zeroes_block();
  /// assert_eq!(it.next(), Some((2, 3)));
  /// assert_eq!(it.next(), None);
  /// ```
  pub fn iter_zeroes_block(&self) -> BitBlocksIter {
300
301
302
303
304
305
306
307

308
309
310
311
312
313
314
318
319
320
321
322
323
324

325
326
327
328
329
330
331
332







-
+








  /// Create an iterator that will return index ranges of contiguous blocks of
  /// ones.
  ///
  ///
  /// ```
  /// use bmap::CountedBitmap;
  /// let mut bmap = CountedBitmap::new(4).unwrap();
  /// let mut bmap = CountedBitmap::new(4);
  /// bmap.set(0).unwrap();
  /// bmap.set(1).unwrap();
  /// let mut it = bmap.iter_ones_block();
  /// assert_eq!(it.next(), Some((0, 1)));
  /// assert_eq!(it.next(), None);
  /// ```
  pub fn iter_ones_block(&self) -> BitBlocksIter {
497
498
499
500
501
502
503
504

505
506
507
508

509
510
511
512
513

514
515
516
517

518
519
520
521
522

523
524
525
526
527
528
529
530


531
532
533


534
535

536
537
538
539
515
516
517
518
519
520
521

522
523
524
525

526
527
528
529
530

531
532
533
534

535
536
537
538
539

540
541
542
543
544
545
546


547
548
549


550
551
552

553
554
555
556
557







-
+



-
+




-
+



-
+




-
+






-
-
+
+

-
-
+
+

-
+





#[cfg(test)]
mod tests {
  use super::*;

  #[test]
  fn size() {
    let bmap = CountedBitmap::new(0).unwrap();
    let bmap = CountedBitmap::new(0);
    assert_eq!(bmap.len(), 0);
    assert_eq!(bmap.word_count(), 0);

    let bmap = CountedBitmap::new(1).unwrap();
    let bmap = CountedBitmap::new(1);
    assert_eq!(bmap.len(), 1);
    assert_eq!(bmap.word_count(), 1);

    let idx = NUM_WORD_BITS - 1;
    let bmap = CountedBitmap::new(idx).unwrap();
    let bmap = CountedBitmap::new(idx);
    assert_eq!(bmap.len(), idx);
    assert_eq!(bmap.word_count(), 1);

    let bmap = CountedBitmap::new(NUM_WORD_BITS).unwrap();
    let bmap = CountedBitmap::new(NUM_WORD_BITS);
    assert_eq!(bmap.len(), NUM_WORD_BITS);
    assert_eq!(bmap.word_count(), 1);

    let idx = NUM_WORD_BITS + 1;
    let bmap = CountedBitmap::new(idx).unwrap();
    let bmap = CountedBitmap::new(idx);
    assert_eq!(bmap.len(), idx);
    assert_eq!(bmap.word_count(), 2);
  }

  #[test]
  fn finished() {
    let bmap = CountedBitmap::new(0).unwrap();
    assert_eq!(bmap.is_finished(), true);
    let bmap = CountedBitmap::new(0);
    assert!(bmap.is_finished());

    let mut bmap = CountedBitmap::new(1).unwrap();
    assert_eq!(bmap.is_finished(), false);
    let mut bmap = CountedBitmap::new(1);
    assert!(!bmap.is_finished());
    bmap.set(0).unwrap();
    assert_eq!(bmap.is_finished(), true);
    assert!(bmap.is_finished());
  }
}

// vim: set ft=rust et sw=2 ts=2 sts=2 cinoptions=2 tw=79 :

Added www/changelog.md.


























1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Change Log

⚠️  indicates a breaking change.

## [Unreleased]

[Details](/vdiff?from=bmap-0.1.0&to=trunk)

### Added

- `CountedBitmap::is_empty()` returns `true` is no bits have been set in the
  bit map. 

### Changed

- ⚠️ `CountedBitmap::new()` made infallible.

### Removed

---

## [0.1.0]

Initial release.

Changes to www/index.md.

1














2
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

+
+
+
+
+
+
+
+
+
+
+
+
+
+

# CountedBitmap

`bmap::CountedBitmap` is an array of bits, with methods to set/clear bits by
index, and a built-in counter used to keep track of how many bits have been
set.

This crate has a very specific use case.  You are *probably* looking for the
[bitvec](https://crates.io/crates/bitvec) crate.


## Change log

The details of changes can always be found in the timeline, but for a
high-level view of changes between released versions there's a manually
maintained [Change Log](./changelog.md).