Use BitVec

Cargo.toml

@@ -5,3 +5,4 @@ authors = ["Michael Neumann <mneumann@ntecs.de>"]
 
 [dependencies]
 nalgebra = "*"
+bit-vec = "*"

src/lib.rs

@@ -11,35 +11,40 @@
 
 
 // TODO:
-//    * Use bitarrays for Coverage.
 //    * Implement SquareMatrix. Get rid of nalgebra.
 //    * Reuse path Vec in step5
 //    * Cleanup
 
 extern crate nalgebra as na;
+extern crate bit_vec;
 
 use na::{DMat, BaseNum};
 use std::ops::{Neg, Sub};
 use std::num::Zero;
 use std::cmp;
 use square_matrix::SquareMatrix;
+use bit_vec::BitVec;
 
 mod square_matrix;
 
 #[derive(Debug)]
 struct Coverage {
-    n: usize,
+    rows: BitVec,
-    rows: Vec<bool>,
+    cols: BitVec,
-    cols: Vec<bool>,
 }
 
 impl Coverage {
-    fn n(&self) -> usize { self.n }
+    // XXX: Is this needed?
+    fn n(&self) -> usize {
+        let n1 = self.rows.len();
+        let n2 = self.cols.len();
+        assert!(n1 == n2);
+        return n1;
+    }
 
     fn new(n: usize) -> Coverage {
-        Coverage {n: n,
+        Coverage {rows: BitVec::from_elem(n, false),
-                  rows: (0..n).map(|_| false).collect(),
+                  cols: BitVec::from_elem(n, false)}
-                  cols: (0..n).map(|_| false).collect(),}
     }
 
     fn is_covered(&self, pos: (usize, usize)) -> bool {
@@ -70,20 +75,20 @@ impl Coverage {
     }
 
     fn cover_col(&mut self, col: usize) {
-        self.cols[col] = true;
+        self.cols.set(col, true);
     }
 
     fn uncover_col(&mut self, col: usize) {
-        self.cols[col] = false;
+        self.cols.set(col, false);
     }
 
     fn cover_row(&mut self, row: usize) {
-        self.rows[row] = true;
+        self.rows.set(row, true);
     }
 
     fn clear(&mut self) {
-       for e in self.rows.iter_mut() { *e = false; }
+       self.rows.clear();
-       for e in self.cols.iter_mut() { *e = false; }
+       self.cols.clear();
     } 
 }