single-utilities upgrade and consolidation of types

Author: Ian

Cargo.lock

@@ -4,7 +4,7 @@ description = "A Rust port of LAS2 from SVDLIBC"
 keywords = ["svd"]
 categories = ["algorithms", "data-structures", "mathematics", "science"]
 name = "single-svdlib"
-version = "1.0.8"
+version = "1.0.9"
 edition = "2021"
 license-file = "SVDLIBC-LICENSE.txt"
 
@@ -20,5 +20,5 @@ rand_distr = "0.5.1"
 rayon = "1.10.0"
 thiserror = "2.0.9"
 ndarray = "0.16"
-single-utilities = "0.8.7"
-nalgebra = {version = "0.34", features = ["rayon"] }
+single-utilities = { version = "0.9.0", features = ["convert"] }
+nalgebra = { version = "0.34", features = ["rayon"] }

Cargo.toml

@@ -1,5 +1,5 @@
 use crate::error::SvdLibError;
-use crate::{Diagnostics, IntoNdarray2, SMat, SvdFloat, SvdRec};
+use crate::{Diagnostics, SMat, SvdFloat, SvdRec};
 use nalgebra_sparse::na::{ComplexField, DMatrix, DVector, RealField};
 use ndarray::Array1;
 use rand::prelude::{Distribution, StdRng};
@@ -9,6 +9,7 @@ use rayon::iter::ParallelIterator;
 use rayon::prelude::IntoParallelIterator;
 use std::ops::Mul;
 use std::time::Instant;
+use single_utilities::traits::IntoNdarray2;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum PowerIterationNormalizer {

src/randomized/mod.rs

@@ -111,22 +111,3 @@ impl SvdFloat for f64 {
         (b - a).abs() < f64::EPSILON
     }
 }
-
-pub trait IntoNdarray2 {
-    type Out;
-
-    fn into_ndarray2(self) -> Self::Out;
-}
-
-impl<N: Scalar> IntoNdarray2 for nalgebra::Matrix<N, Dyn, Dyn, nalgebra::VecStorage<N, Dyn, Dyn>>
-where
-    nalgebra::DefaultAllocator:
-    nalgebra::allocator::Allocator<Dyn, Dyn, Buffer<N> = nalgebra::VecStorage<N, Dyn, Dyn>>,
-{
-    type Out = ndarray::Array2<N>;
-
-    fn into_ndarray2(self) -> Self::Out {
-        ndarray::Array2::from_shape_vec(self.shape().strides(self.strides()), self.data.into())
-            .unwrap()
-    }
-}