Merge branch 'master' of kirikou.dynare.org:/srv/d_kirikou/git/dynare

time-shift
Stéphane Adjemian (Scylla) 2010-05-19 10:38:39 +02:00
commit ba013638db
2 changed files with 12 additions and 3 deletions

View File

@ -102,8 +102,14 @@ GeneralizedSchurDecomposition::getGeneralizedEigenvalues(Vec1 &eig_real, Vec2 &e
*per = eig_real.getData(), *pei = eig_cmplx.getData(); *per = eig_real.getData(), *pei = eig_cmplx.getData();
while (par < alphar + n) while (par < alphar + n)
{ {
*per = *par++ / *pb; *per = *par / *pb;
*pei = *pai++ / *pb++; if (*pai == 0.0 && *pb == 0.0)
*pei = 0.0;
else
*pei = *pai / *pb;
par++;
pai++;
pb++;
per += eig_real.getStride(); per += eig_real.getStride();
pei += eig_cmplx.getStride(); pei += eig_cmplx.getStride();
} }

View File

@ -61,7 +61,10 @@ mjdgges(double *a, double *b, double *z, double *n, double *sdim, double *eval_r
for (per = eval_r; per <= &eval_r[i_n-1]; ++per) for (per = eval_r; per <= &eval_r[i_n-1]; ++per)
{ {
*per = *par / *pb; *per = *par / *pb;
*pei = *pai / *pb; if (*pai == 0.0 && *pb == 0.0)
*pei = 0.0;
else
*pei = *pai / *pb;
++par; ++par;
++pai; ++pai;
++pb; ++pb;