jiri/LA_library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
jiri
2005-02-04 14:31:42 +00:00
parent a235d4cb98
commit 6e2727f595
14 changed files with 150 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mat.cc
View File

@@ -743,28 +743,38 @@ const complex<double> NRMat< complex<double> >::trace() const
//get diagonal; for compatibility with large matrices do not return newly created object
//for non-square get diagonal of A^TA, will be used as preconditioner
void NRMat<double>::diagonalof(NRVec<double> &r) const
void NRMat<double>::diagonalof(NRVec<double> &r, const bool divide) const
{
#ifdef DEBUG
if (r.size() != nn) laerror("diagonalof() incompatible vector");
#endif
double a;
r.copyonwrite();
if(nn==mm)
{
#ifdef MATPTR
for (int i=0; i< nn; i++) r[i] = v[i][i];
if(divide) for (int i=0; i< nn; i++) if((a=v[i][i])) r[i]/=a;
else for (int i=0; i< nn; i++) r[i] = v[i][i];
#else
{int i,j; for (i=j=0; j< nn; ++j, i+=nn+1) r[j] = v[i];}
if(divide) {int i,j; for (i=j=0; j< nn; ++j, i+=nn+1) if((a=v[i])) r[j] /=a;}
else {int i,j; for (i=j=0; j< nn; ++j, i+=nn+1) r[j] = v[i];}
#endif
}
else //non-square
{
for (int i=0; i< mm; i++)
{
#ifdef MATPTR
r[i] = cblas_ddot(nn,v[0]+i,mm,v[0]+i,mm);
a= cblas_ddot(nn,v[0]+i,mm,v[0]+i,mm);
#else
r[i] = cblas_ddot(nn,v+i,mm,v+i,mm);
a=cblas_ddot(nn,v+i,mm,v+i,mm);
#endif
if(divide) {if(a) r[i]/=a;}
else r[i] = a;
}
}
}