File tree Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ use crate::layout::*;
88use crate :: operator:: LinearOperator ;
99use crate :: types:: * ;
1010use crate :: UPLO ;
11- use std:: iter:: FromIterator ;
1211
1312/// Eigenvalue decomposition of Hermite matrix reference
1413pub 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
139139 // add the new eigenvector to the internal constrain matrix
140140 let new_constraints = if let Some ( ref constraints) = self . eig . constraints {
141141 let eigvecs_arr: Vec < _ > = constraints
142- . gencolumns ( )
142+ . columns ( )
143143 . into_iter ( )
144- . chain ( vecs. gencolumns ( ) . into_iter ( ) )
144+ . chain ( vecs. columns ( ) . into_iter ( ) )
145145 . collect ( ) ;
146146
147147 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>(
8181 let gram_yv = y. t ( ) . dot ( & v) ;
8282
8383 let u = gram_yv
84- . gencolumns ( )
84+ . columns ( )
8585 . into_iter ( )
8686 . map ( |x| {
8787 let res = cholesky_yy. solvec ( & x) . unwrap ( ) ;
@@ -222,7 +222,7 @@ pub fn lobpcg<
222222
223223 // calculate L2 norm of error for every eigenvalue
224224 let residual_norms = r
225- . gencolumns ( )
225+ . columns ( )
226226 . into_iter ( )
227227 . map ( |x| x. norm ( ) )
228228 . 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
6464 let mut ularge = self . problem . dot ( & vlarge) ;
6565
6666 ularge
67- . gencolumns_mut ( )
67+ . columns_mut ( )
6868 . into_iter ( )
6969 . zip ( values. iter ( ) )
7070 . for_each ( |( mut a, b) | a. mapv_inplace ( |x| x / * b) ) ;
@@ -75,7 +75,7 @@ impl<A: Float + PartialOrd + DivAssign<A> + 'static + MagnitudeCorrection> Trunc
7575
7676 let mut vlarge = self . problem . t ( ) . dot ( & ularge) ;
7777 vlarge
78- . gencolumns_mut ( )
78+ . columns_mut ( )
7979 . into_iter ( )
8080 . zip ( values. iter ( ) )
8181 . 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 {
140140 . eigvalsh( UPLO :: Upper )
141141 . unwrap( )
142142 . mapv( |elem| elem. ln( ) )
143- . scalar_sum ( ) ;
143+ . sum ( ) ;
144144 let det = ln_det. exp( ) ;
145145 assert_aclose!( a. factorizec( UPLO :: Upper ) . unwrap( ) . detc( ) , det, $atol) ;
146146 assert_aclose!( a. factorizec( UPLO :: Upper ) . unwrap( ) . ln_detc( ) , ln_det, $atol) ;
You can’t perform that action at this time.
0 commit comments