Implement display trait

Author: maxtremblay

src/matrix/concat.rs

@@ -28,8 +28,8 @@ fn concat_rows_horizontally(
     rows: EitherOrBoth<SparseBinSlice, SparseBinSlice>,
 ) -> Vec<usize> {
     match rows {
-        EitherOrBoth::Both(left_row, right_row) => left_row.concat(&right_row).take_inner_vec(),
-        EitherOrBoth::Left(row) => row.to_owned().take_inner_vec(),
+        EitherOrBoth::Both(left_row, right_row) => left_row.concat(&right_row).to_positions_vec(),
+        EitherOrBoth::Left(row) => row.to_owned().to_positions_vec(),
         EitherOrBoth::Right(row) => pad_right_row(pad, row.as_slice()),
     }
 }
@@ -46,7 +46,7 @@ pub(super) fn concat_vertically(
     let rows = top_matrix
         .rows()
         .chain(bottom_matrix.rows())
-        .map(|row| row.to_owned().take_inner_vec())
+        .map(|row| row.to_owned().to_positions_vec())
         .collect();
     SparseBinMat::new(top_matrix.number_of_columns(), rows)
 }

src/matrix/gauss_jordan.rs

@@ -82,7 +82,7 @@ impl GaussJordan {
                             self.number_of_columns,
                             &self.rows[row_index],
                         ))
-                        .take_inner_vec();
+                        .to_positions_vec();
                 if self.rows[row_index].is_empty() {
                     self.rows.swap_remove(row_index);
                     continue;

src/matrix/mod.rs

@@ -700,18 +700,14 @@ fn dimension_to_string(dimension: (usize, usize)) -> String {
     format!("({} x {})", dimension.0, dimension.1)
 }
 
-//impl std::fmt::Display for SparseBinMat {
-//fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-//for row in self.rows() {
-//write!(f, "[ ")?;
-//for column in row.iter() {
-//write!(f, "{} ", column)?;
-//}
-//write!(f, "]")?;
-//}
-//Ok(())
-//}
-//}
+impl std::fmt::Display for SparseBinMat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        for row in self.rows() {
+            writeln!(f, "{}", row)?;
+        }
+        Ok(())
+    }
+}
 
 #[cfg(test)]
 mod test {

src/matrix/nullspace.rs

@@ -36,7 +36,7 @@ fn reduce_to_normal_form(matrix: &SparseBinMat) -> SparseBinMat {
             while r.weight() > 1 && r.as_slice()[1] < matrix.number_of_rows() {
                 r = &r + &matrix.row(r.as_slice()[1]).unwrap();
             }
-            r.take_inner_vec()
+            r.to_positions_vec()
         })
         .collect();
     SparseBinMat::new(matrix.number_of_columns(), rows)

src/vector/mod.rs

@@ -1,6 +1,7 @@
 use crate::BinaryNumber;
 use is_sorted::IsSorted;
 use std::collections::HashMap;
+use std::fmt;
 use std::ops::{Add, Deref};
 
 mod bitwise_operations;
@@ -94,7 +95,18 @@ impl SparseBinVec {
         }
     }
 
-    pub(crate) fn take_inner_vec(self) -> Vec<usize> {
+    /// Converts the sparse binary vector to a `Vec` of
+    /// the non trivial positions.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use sparse_bin_mat::SparseBinVec;
+    /// let vector = SparseBinVec::new(3, vec![0, 2]);
+    ///
+    /// assert_eq!(vector.to_positions_vec(), vec![0, 2]);
+    /// ```
+    pub fn to_positions_vec(self) -> Vec<usize> {
         self.positions
     }
 }
@@ -439,6 +451,12 @@ where
     }
 }
 
+impl<T: Deref<Target = [usize]>> fmt::Display for SparseBinVecBase<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:?}", self.positions.deref())
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;