diff --git a/conjgrad.h b/conjgrad.h index b9b9031..b265367 100644 --- a/conjgrad.h +++ b/conjgrad.h @@ -31,6 +31,7 @@ namespace LA { //matrix can be any class which has nrows(), ncols(), diagonalof() and gemv() available //does not even have to be explicitly stored //Conjugate gradient algorithm, cf. Bulirsch-Stoer book +//complex T: hermitian positive (semi)definite matrix, conjugated inner products, A^H for the guess and the normal equations template @@ -42,7 +43,8 @@ int n=bigmat.ncols(); if(x.size()!=n || b.size() != m) laerror("incompatible vectors and matrix sizes in conjgrad"); if(m!=n) issquare=0; -double t,tt,bscal,ascal; +T t,tt,bscal,ascal; +const char transc= LA_traits::is_complex()? 'c':'t'; NRVec p,rr, *r; NRVec q(m),s(m); @@ -50,17 +52,18 @@ if(issquare) r=&s; else r = new NRVec(n); //A^T s if(doguess) { - bigmat.gemv(0,x,'t',-1.,b); //x.gemv(0,bigmat,'t',-1.,b); + bigmat.gemv(0,x,transc,-1.,b); //x.gemv(0,bigmat,'t',-1.,b); if(precondition) bigmat.diagonalof(x,true); x.normalize(); } bigmat.gemv(0,s,'n',-1.,x); //s.gemv(0,bigmat,'n',-1.,x); s+=b; -if(!issquare) bigmat.gemv(0,*r,'t',1,s); //(*r).gemv(0,bigmat,'t',1,s); +if(!issquare) bigmat.gemv(0,*r,transc,1,s); //(*r).gemv(0,bigmat,'t',1,s); rr= *r; if(precondition) bigmat.diagonalof(rr,true); p=rr; +tt= (*r) * rr; //r^dagger z, kept between iterations for(int iter=0; iter<= itmax; iter++) { @@ -79,17 +82,18 @@ for(int iter=0; iter<= itmax; iter++) } bigmat.gemv(0,q,'n',1,p); //q.gemv(0,bigmat,'n',1,p); - tt= (*r) * rr; t=issquare?p*q:q*q; - if(!t) {if(!issquare) delete r; laerror("conjgrad: singular matrix 1");} + if(t==(T)0) {if(!issquare) delete r; laerror("conjgrad: singular matrix 1");} ascal=tt/t; x.axpy(ascal,p); s.axpy(-ascal,q); - if(!issquare) bigmat.gemv(0,*r,'t',1,s); //(*r).gemv(0,bigmat,'t',1,s); + if(!issquare) bigmat.gemv(0,*r,transc,1,s); //(*r).gemv(0,bigmat,'t',1,s); rr= *r; if(precondition) bigmat.diagonalof(rr,true); - if(!tt) {if(!issquare) delete r; laerror("conjgrad: singular matrix 2");} - bscal= ((*r)*rr)/tt; + if(tt==(T)0) {if(!issquare) delete r; laerror("conjgrad: singular matrix 2");} + T rznew= (*r) * rr; + bscal= rznew/tt; + tt= rznew; rr.axpy(bscal,p); p=rr; } diff --git a/gmres.h b/gmres.h index bd00077..56f824a 100644 --- a/gmres.h +++ b/gmres.h @@ -44,7 +44,7 @@ void gmres_backsubstitute(const NRMat &R, NRVec &c, const NRVec &d, con c.copyonwrite(); if(R(k,k)==0.) laerror("singular matrix in gmres triangular solution"); c[k] = d[k]/R(k,k); -for (int i=k-1;i>=0;i--) c[i] = (d[i]-xdot(k-i,&R(i,i+1),1,&c[i+1],1)) / R(i,i); +for (int i=k-1;i>=0;i--) c[i] = (d[i]-xdot(k-i,&R(i,i+1),1,&c[i+1],1,false)) / R(i,i); } //rotate columns 0..k of H to the triangular R (rotations 0..k), solve R c = -d and add the k+1 Krylov vectors to x @@ -57,7 +57,7 @@ for(int i=0;i<=k;i++) for(int j=i;j<=k;j++) { T a = H(i,j); - H(i,j) = ci*a+si*H(i+1,j); + H(i,j) = LA_traits::conjugate(ci)*a+LA_traits::conjugate(si)*H(i+1,j); //unitary rotation, for real T the usual one H(i+1,j) = -si*a+ci*H(i+1,j); } } @@ -98,9 +98,10 @@ T ci,si; v = new NRVec[incore?MAXIT+1:1]; st = incore?NULL:new AuxStorage; +const char transc= LA_traits::is_complex()? 'c':'t'; if(doguess) { - bigmat.gemv(0,x,'t',-1.,b); //x.gemv(0,bigmat,'t',-1.,b); + bigmat.gemv(0,x,transc,-1.,b); //x.gemv(0,bigmat,'t',-1.,b); if(precondition) bigmat.diagonalof(x,true); x.normalize(); } @@ -116,8 +117,8 @@ for (int l=0;l dum(zeilen); bigmat.gemv(0,dum,'n',1,x); //dum.gemv(0,bigmat,'n',1,x); - bigmat.gemv(0,r_k,'t',1,dum); //r_k.gemv(0,bigmat,'t',1,dum); - bigmat.gemv(0,z,'t',-1.,b); //z.gemv(0,bigmat,'t',-1.,b); + bigmat.gemv(0,r_k,transc,1,dum); //r_k.gemv(0,bigmat,'t',1,dum); + bigmat.gemv(0,z,transc,-1.,b); //z.gemv(0,bigmat,'t',-1.,b); r_k += z; } @@ -145,7 +146,7 @@ for (int l=0;l dum(zeilen); bigmat.gemv(0,dum,'n',1,v[incore?k:0]); //dum.gemv(0,bigmat,'n',1,v[incore?k:0]); - bigmat.gemv(0,z,'t',1,dum); //z.gemv(0,bigmat,'t',1,dum); + bigmat.gemv(0,z,transc,1,dum); //z.gemv(0,bigmat,'t',1,dum); } if(precondition) bigmat.diagonalof(z,true); @@ -153,7 +154,7 @@ for (int l=0;lget(v[0],i); - H(i,k) = z*v[incore?i:0]; + H(i,k) = v[incore?i:0]*z; //v_i^dagger z z.axpy(-H(i,k),v[incore?i:0]); } @@ -178,16 +179,16 @@ for (int l=0;l::conjugate(ci)*a+LA_traits::conjugate(si)*d[i+1]; d[i+1] = -si*a+ci*d[i+1]; } //phi[k]= atan(d[k+1]/d[k]); - ci=hypot(d[k],d[k+1]); - if(ci==0) {cci[k]=1; ssi[k]=0;} //singular + double rho=hypot(std::abs(d[k]),std::abs(d[k+1])); + if(rho==0) {cci[k]=1; ssi[k]=0;} //singular else { - cci[k]=d[k]/ci; - ssi[k]=d[k+1]/ci; + cci[k]=d[k]/rho; + ssi[k]=d[k+1]/rho; } //berechne neuen d-Vektor @@ -197,7 +198,7 @@ for (int l=0;l::conjugate(ci)*a+LA_traits::conjugate(si)*d[i+1]; d[i+1] = -si*a+ci*d[i+1]; }