File tree 5 files changed +7
-8
lines changed
5 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ use crate::layout::*;
8
8
use crate :: operator:: LinearOperator ;
9
9
use crate :: types:: * ;
10
10
use crate :: UPLO ;
11
- use std:: iter:: FromIterator ;
12
11
13
12
/// Eigenvalue decomposition of Hermite matrix reference
14
13
pub trait Eigh {
Original file line number Diff line number Diff line change @@ -139,9 +139,9 @@ impl<A: Float + Scalar + ScalarOperand + Lapack + PartialOrd + Default> Iterator
139
139
// add the new eigenvector to the internal constrain matrix
140
140
let new_constraints = if let Some ( ref constraints) = self . eig . constraints {
141
141
let eigvecs_arr: Vec < _ > = constraints
142
- . gencolumns ( )
142
+ . columns ( )
143
143
. into_iter ( )
144
- . chain ( vecs. gencolumns ( ) . into_iter ( ) )
144
+ . chain ( vecs. columns ( ) . into_iter ( ) )
145
145
. collect ( ) ;
146
146
147
147
stack ( Axis ( 1 ) , & eigvecs_arr) . unwrap ( )
Original file line number Diff line number Diff line change @@ -81,7 +81,7 @@ fn apply_constraints<A: Scalar + Lapack>(
81
81
let gram_yv = y. t ( ) . dot ( & v) ;
82
82
83
83
let u = gram_yv
84
- . gencolumns ( )
84
+ . columns ( )
85
85
. into_iter ( )
86
86
. map ( |x| {
87
87
let res = cholesky_yy. solvec ( & x) . unwrap ( ) ;
@@ -222,7 +222,7 @@ pub fn lobpcg<
222
222
223
223
// calculate L2 norm of error for every eigenvalue
224
224
let residual_norms = r
225
- . gencolumns ( )
225
+ . columns ( )
226
226
. into_iter ( )
227
227
. map ( |x| x. norm ( ) )
228
228
. collect :: < Vec < A :: Real > > ( ) ;
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ impl<A: Float + PartialOrd + DivAssign<A> + 'static + MagnitudeCorrection> Trunc
64
64
let mut ularge = self . problem . dot ( & vlarge) ;
65
65
66
66
ularge
67
- . gencolumns_mut ( )
67
+ . columns_mut ( )
68
68
. into_iter ( )
69
69
. zip ( values. iter ( ) )
70
70
. for_each ( |( mut a, b) | a. mapv_inplace ( |x| x / * b) ) ;
@@ -75,7 +75,7 @@ impl<A: Float + PartialOrd + DivAssign<A> + 'static + MagnitudeCorrection> Trunc
75
75
76
76
let mut vlarge = self . problem . t ( ) . dot ( & ularge) ;
77
77
vlarge
78
- . gencolumns_mut ( )
78
+ . columns_mut ( )
79
79
. into_iter ( )
80
80
. zip ( values. iter ( ) )
81
81
. for_each ( |( mut a, b) | a. mapv_inplace ( |x| x / * b) ) ;
Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ macro_rules! cholesky_det {
140
140
. eigvalsh( UPLO :: Upper )
141
141
. unwrap( )
142
142
. mapv( |elem| elem. ln( ) )
143
- . scalar_sum ( ) ;
143
+ . sum ( ) ;
144
144
let det = ln_det. exp( ) ;
145
145
assert_aclose!( a. factorizec( UPLO :: Upper ) . unwrap( ) . detc( ) , det, $atol) ;
146
146
assert_aclose!( a. factorizec( UPLO :: Upper ) . unwrap( ) . ln_detc( ) , ln_det, $atol) ;
You can’t perform that action at this time.
0 commit comments