Mercurial > hg > octave-lyh
diff liboctave/dMatrix.cc @ 4153:6b96ce9f5743
[project @ 2002-11-06 20:38:49 by jwe]
| author | jwe |
|---|---|
| date | Wed, 06 Nov 2002 20:38:50 +0000 |
| parents | 7d9bda865012 |
| children | 5719210fff4c |
line wrap: on
line diff
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -49,6 +49,7 @@ #include "mx-dm-m.h" #include "mx-inlines.cc" #include "oct-cmplx.h" +#include "quit.h" #ifdef HAVE_FFTW #include "oct-fftw.h" @@ -681,6 +682,8 @@ for (size_t i = 0; i < nsamples; i++) { + OCTAVE_QUIT; + octave_fftw::fft (&in[npts * i], &out[npts * i], npts); } @@ -714,6 +717,8 @@ for (size_t i = 0; i < nsamples; i++) { + OCTAVE_QUIT; + octave_fftw::ifft (&in[npts * i], &out[npts * i], npts); } @@ -782,7 +787,11 @@ F77_FUNC (cffti, CFFTI) (npts, pwsave); for (int j = 0; j < nsamples; j++) - F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); + { + OCTAVE_QUIT; + + F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); + } return retval; } @@ -819,7 +828,11 @@ F77_FUNC (cffti, CFFTI) (npts, pwsave); for (int j = 0; j < nsamples; j++) - F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); + { + OCTAVE_QUIT; + + F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); + } for (int j = 0; j < npts*nsamples; j++) tmp_data[j] = tmp_data[j] / static_cast<double> (npts); @@ -859,7 +872,11 @@ F77_FUNC (cffti, CFFTI) (npts, pwsave); for (int j = 0; j < nsamples; j++) - F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); + { + OCTAVE_QUIT; + + F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); + } npts = nc; nsamples = nr; @@ -875,6 +892,8 @@ for (int j = 0; j < nsamples; j++) { + OCTAVE_QUIT; + for (int i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -919,7 +938,11 @@ F77_FUNC (cffti, CFFTI) (npts, pwsave); for (int j = 0; j < nsamples; j++) - F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); + { + OCTAVE_QUIT; + + F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); + } for (int j = 0; j < npts*nsamples; j++) tmp_data[j] = tmp_data[j] / static_cast<double> (npts); @@ -938,6 +961,8 @@ for (int j = 0; j < nsamples; j++) { + OCTAVE_QUIT; + for (int i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -1610,6 +1635,8 @@ for (int j = 0; j < nc; j++) retval(i,j) *= dscale(i) / dscale(j); + OCTAVE_QUIT; + // construct balancing permutation vector Array<int> ipermute (nc); for (int i = 0; i < nc; i++) @@ -1637,6 +1664,8 @@ Array<int> invpvec (nc); for (int i = 0; i < nc; i++) invpvec(ipermute(i)) = i; // Thanks to R. A. Lippert for this method + + OCTAVE_QUIT; Matrix tmpMat = retval; for (int i = 0; i < nc; i++)