phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add indicators

Browse Source
This commit is contained in:
conrad
2021-04-30 19:42:28 +10:00
parent dfbc0f9f13
commit 943792dccb
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/newarp_GenEigsSolver_meat.hpp
+7 -7
View File
@@ -29,7 +29,7 @@ GenEigsSolver<eT, SelectionRule, OpType>::factorise_from(uword from_k, uword to_
fac_f = fk;
Col<eT> w(dim_n);
Col<eT> w(dim_n, arma_zeros_indicator());
eT beta = norm(fac_f);
// Keep the upperleft k x k submatrix of H and set other elements to 0
fac_H.tail_cols(ncv - from_k).zeros();
@@ -154,7 +154,7 @@ GenEigsSolver<eT, SelectionRule, OpType>::restart(uword k)
// V -> VQ
// Q has some elements being zero
// The first (ncv - k + i) elements of the i-th column of Q are non-zero
Mat<eT> Vs(dim_n, k + 1);
Mat<eT> Vs(dim_n, k + 1, arma_nozeros_indicator());
uword nnz;
for(uword i = 0; i < k; i++)
{
@@ -278,8 +278,8 @@ GenEigsSolver<eT, SelectionRule, OpType>::sort_ritzpair()
std::vector<uword> ind = sorting.index();
Col< std::complex<eT> > new_ritz_val(ncv);
Mat< std::complex<eT> > new_ritz_vec(ncv, nev);
Col< std::complex<eT> > new_ritz_val(ncv, arma_zeros_indicator() );
Mat< std::complex<eT> > new_ritz_vec(ncv, nev, arma_nozeros_indicator());
std::vector<bool> new_ritz_conv(nev);
for(uword i = 0; i < nev; i++)
@@ -342,7 +342,7 @@ GenEigsSolver<eT, SelectionRule, OpType>::init(eT* init_resid)
arma_check( (rnorm < eps), "newarp::GenEigsSolver::init(): initial residual vector cannot be zero" );
v = r / rnorm;
Col<eT> w(dim_n);
Col<eT> w(dim_n, arma_zeros_indicator());
op.perform_op(v.memptr(), w.memptr());
nmatop++;
@@ -407,7 +407,7 @@ GenEigsSolver<eT, SelectionRule, OpType>::eigenvalues()
arma_extra_debug_sigprint();
uword nconv = std::count(ritz_conv.begin(), ritz_conv.end(), true);
Col< std::complex<eT> > res(nconv);
Col< std::complex<eT> > res(nconv, arma_zeros_indicator());
if(nconv > 0)
{
@@ -440,7 +440,7 @@ GenEigsSolver<eT, SelectionRule, OpType>::eigenvectors(uword nvec)
if(nvec > 0)
{
Mat< std::complex<eT> > ritz_vec_conv(ncv, nvec);
Mat< std::complex<eT> > ritz_vec_conv(ncv, nvec, arma_zeros_indicator());
uword j = 0;
for(uword i = 0; (i < nev) && (j < nvec); i++)
{
include/armadillo_bits/newarp_SymEigsSolver_meat.hpp
+7 -7
View File
@@ -29,7 +29,7 @@ SymEigsSolver<eT, SelectionRule, OpType>::factorise_from(uword from_k, uword to_
fac_f = fk;
Col<eT> w(dim_n);
Col<eT> w(dim_n, arma_zeros_indicator());
// Norm of f
eT beta = norm(fac_f);
// Used to test beta~=0
@@ -159,7 +159,7 @@ SymEigsSolver<eT, SelectionRule, OpType>::restart(uword k)
// V -> VQ, only need to update the first k+1 columns
// Q has some elements being zero
// The first (ncv - k + i) elements of the i-th column of Q are non-zero
Mat<eT> Vs(dim_n, k + 1);
Mat<eT> Vs(dim_n, k + 1, arma_nozeros_indicator());
uword nnz;
for(uword i = 0; i < k; i++)
{
@@ -291,8 +291,8 @@ SymEigsSolver<eT, SelectionRule, OpType>::sort_ritzpair()
std::vector<uword> ind = sorting.index();
Col<eT> new_ritz_val(ncv);
Mat<eT> new_ritz_vec(ncv, nev);
Col<eT> new_ritz_val(ncv, arma_zeros_indicator() );
Mat<eT> new_ritz_vec(ncv, nev, arma_nozeros_indicator());
std::vector<bool> new_ritz_conv(nev);
for(uword i = 0; i < nev; i++)
@@ -356,7 +356,7 @@ SymEigsSolver<eT, SelectionRule, OpType>::init(eT* init_resid)
arma_check( (rnorm < near0), "newarp::SymEigsSolver::init(): initial residual vector cannot be zero" );
v = r / rnorm;
Col<eT> w(dim_n);
Col<eT> w(dim_n, arma_zeros_indicator());
op.perform_op(v.memptr(), w.memptr());
nmatop++;
@@ -425,7 +425,7 @@ SymEigsSolver<eT, SelectionRule, OpType>::eigenvalues()
arma_extra_debug_sigprint();
uword nconv = std::count(ritz_conv.begin(), ritz_conv.end(), true);
Col<eT> res(nconv);
Col<eT> res(nconv, arma_zeros_indicator());
if(nconv > 0)
{
@@ -458,7 +458,7 @@ SymEigsSolver<eT, SelectionRule, OpType>::eigenvectors(uword nvec)
if(nvec > 0)
{
Mat<eT> ritz_vec_conv(ncv, nvec);
Mat<eT> ritz_vec_conv(ncv, nvec, arma_zeros_indicator());
uword j = 0;
for(uword i = 0; i < nev && j < nvec; i++)
include/armadillo_bits/newarp_UpperHessenbergEigen_meat.hpp
+1 -1
View File
@@ -122,7 +122,7 @@ UpperHessenbergEigen<eT>::eigenvectors()
arma_debug_check( (computed == false), "newarp::UpperHessenbergEigen::eigenvectors(): need to call compute() first" );
// Lapack will set the imaginary parts of real eigenvalues to be exact zero
Mat< std::complex<eT> > evecs(n, n);
Mat< std::complex<eT> > evecs(n, n, arma_zeros_indicator());
std::complex<eT>* col_ptr = evecs.memptr();
include/armadillo_bits/newarp_UpperHessenbergQR_meat.hpp
+1 -1
View File
@@ -273,7 +273,7 @@ TridiagQR<eT>::matrix_RQ()
arma_debug_check( (this->computed == false), "newarp::TridiagQR::matrix_RQ(): need to call compute() first" );
// Make a copy of the R matrix
Mat<eT> RQ(this->n, this->n, fill::zeros);
Mat<eT> RQ(this->n, this->n, arma_zeros_indicator());
RQ.diag() = this->mat_T.diag();
RQ.diag(1) = this->mat_T.diag(1);