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
2006-10-27 13:40:09 +00:00
parent bfb320e302
commit 4f3d079afa
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conjgrad.h
View File

@@ -13,7 +13,7 @@
template<typename T, typename Matrix>
extern void conjgrad(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess, const double tol, const int itmax, const bool verbose, bool issquare,const bool precondition)
extern bool conjgrad(const Matrix &bigmat, const NRVec<T> &b, NRVec<T> &x, const bool doguess, const double tol, const int itmax, const bool verbose, bool issquare,const bool precondition)
{
int m=bigmat.nrows();
int n=bigmat.ncols();
@@ -47,7 +47,11 @@ for(int iter=0; iter<= itmax; iter++)
if(verbose) cout << "conjgrad: iter= "<<iter<<" err= "<<
setiosflags(ios::scientific)<<setprecision(8) <<err<<
resetiosflags(ios::scientific)<<setprecision(12)<<"\n";
if(err <= tol) break;
if(err <= tol)
{
if(!issquare) delete r;
return true;
}
bigmat.gemv(0,q,'n',1,p); //q.gemv(0,bigmat,'n',1,p);
tt= (*r) * rr;
@@ -66,6 +70,6 @@ for(int iter=0; iter<= itmax; iter++)
}
if(!issquare) delete r;
return false;
}