diff --git a/src/linalg/exp.rs b/src/linalg/exp.rs index f68cbe6c..e07ddd2f 100644 --- a/src/linalg/exp.rs +++ b/src/linalg/exp.rs @@ -3,7 +3,8 @@ use crate::{ base::{ allocator::Allocator, - dimension::{DimMin, DimMinimum, DimName}, + dimension::{Dim, DimMin, DimMinimum, U1}, + storage::Storage, DefaultAllocator, }, convert, try_convert, ComplexField, MatrixN, RealField, @@ -13,7 +14,7 @@ use crate::{ struct ExpmPadeHelper where N: RealField, - D: DimName + DimMin, + D: DimMin, DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, { use_exact_norm: bool, @@ -40,13 +41,14 @@ where impl ExpmPadeHelper where N: RealField, - D: DimName + DimMin, + D: DimMin, DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, { fn new(a: MatrixN, use_exact_norm: bool) -> Self { + let (nrows, ncols) = a.data.shape(); ExpmPadeHelper { use_exact_norm, - ident: MatrixN::::identity(), + ident: MatrixN::::identity_generic(nrows, ncols), a, a2: None, a4: None, @@ -321,10 +323,11 @@ fn factorial(n: u128) -> u128 { fn onenorm_matrix_power_nonm(a: &MatrixN, p: u64) -> N where N: RealField, - D: DimName, + D: Dim, DefaultAllocator: Allocator + Allocator, { - let mut v = crate::VectorN::::repeat(convert(1.0)); + let nrows = a.data.shape().0; + let mut v = crate::VectorN::::repeat_generic(nrows, U1, convert(1.0)); let m = a.transpose(); for _ in 0..p { @@ -337,7 +340,7 @@ where fn ell(a: &MatrixN, m: u64) -> u64 where N: RealField, - D: DimName, + D: Dim, DefaultAllocator: Allocator + Allocator, { // 2m choose m = (2m)!/(m! * (2m-m)!) @@ -367,7 +370,7 @@ where fn solve_p_q(u: MatrixN, v: MatrixN) -> MatrixN where N: ComplexField, - D: DimMin + DimName, + D: DimMin, DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, { let p = &u + &v; @@ -379,7 +382,7 @@ where fn one_norm(m: &MatrixN) -> N where N: RealField, - D: DimName, + D: Dim, DefaultAllocator: Allocator, { let mut col_sums = vec![N::zero(); m.ncols()]; @@ -396,7 +399,7 @@ where impl MatrixN where - D: DimMin + DimName, + D: DimMin, DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum> + Allocator, { diff --git a/tests/linalg/exp.rs b/tests/linalg/exp.rs index 37abc4d2..75122107 100644 --- a/tests/linalg/exp.rs +++ b/tests/linalg/exp.rs @@ -2,7 +2,7 @@ mod tests { //https://github.com/scipy/scipy/blob/c1372d8aa90a73d8a52f135529293ff4edb98fc8/scipy/sparse/linalg/tests/test_matfuncs.py #[test] - fn exp() { + fn exp_static() { use nalgebra::{Matrix1, Matrix2, Matrix3}; { @@ -98,4 +98,32 @@ mod tests { assert!(relative_eq!(f, m.exp(), epsilon = 1.0e-7)); } } + + #[test] + fn exp_dynamic() { + use nalgebra::DMatrix; + + let m = DMatrix::from_row_slice(3, 3, &[1.0, 3.0, 0.0, 0.0, 1.0, 5.0, 0.0, 0.0, 2.0]); + + let e1 = 1.0_f64.exp(); + let e2 = 2.0_f64.exp(); + + let f = DMatrix::from_row_slice( + 3, + 3, + &[ + e1, + 3.0 * e1, + 15.0 * (e2 - 2.0 * e1), + 0.0, + e1, + 5.0 * (e2 - e1), + 0.0, + 0.0, + e2, + ], + ); + + assert!(relative_eq!(f, m.exp(), epsilon = 1.0e-7)); + } }