Mercurial > octave-antonio
changeset 10142:829e69ec3110
make OCTAVE_QUIT a function
line wrap: on
line diff
--- a/libcruft/ChangeLog Wed Jan 20 09:32:02 2010 +0100 +++ b/libcruft/ChangeLog Wed Jan 20 10:38:00 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-20 Jaroslav Hajek <highegg@gmail.com> + + * misc/quit.h: Define inline-function variant of OCTAVE_QUIT in C++ + mode. + 2009-01-13 Rik <octave@nomad.inbox5.com> * STOP.patch: Remove unmaintained patch for Fortran code
--- a/libcruft/misc/quit.h Wed Jan 20 09:32:02 2010 +0100 +++ b/libcruft/misc/quit.h Wed Jan 20 10:38:00 2010 +0100 @@ -114,6 +114,20 @@ CRUFT_API extern void octave_rethrow_exception (void); +#ifdef __cplusplus +inline void octave_quit (void) +{ + if (octave_signal_caught) + { + octave_signal_caught = 0; + octave_handle_signal (); + } +}; + +#define OCTAVE_QUIT octave_quit () + +#else + #define OCTAVE_QUIT \ do \ { \ @@ -124,6 +138,7 @@ } \ } \ while (0) +#endif /* Normally, you just want to use
--- a/liboctave/Array.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Array.h Wed Jan 20 10:38:00 2010 +0100 @@ -659,7 +659,7 @@ octave_idx_type i; for (i = 0; i < len - 3; i += 4) { - OCTAVE_QUIT; + octave_quit (); p[i] = fcn (m[i]); p[i+1] = fcn (m[i+1]); @@ -667,7 +667,7 @@ p[i+3] = fcn (m[i+3]); } - OCTAVE_QUIT; + octave_quit (); for (; i < len; i++) p[i] = fcn (m[i]);
--- a/liboctave/CMatrix.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/CMatrix.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1352,7 +1352,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftf, ZFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1393,7 +1393,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftb, ZFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1437,7 +1437,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftf, ZFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1456,7 +1456,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -1503,7 +1503,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftb, ZFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1525,7 +1525,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -3886,7 +3886,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (c, m (i, j)); } @@ -3906,7 +3906,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (m (i, j), c); } @@ -3935,7 +3935,7 @@ int columns_are_real_only = 1; for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) { columns_are_real_only = 0; @@ -3952,7 +3952,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (a (i, j), b (i, j)); } } @@ -3974,7 +3974,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (c, m (i, j)); } @@ -3994,7 +3994,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (m (i, j), c); } @@ -4023,7 +4023,7 @@ int columns_are_real_only = 1; for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) { columns_are_real_only = 0; @@ -4035,7 +4035,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (std::real (a (i, j)), std::real (b (i, j))); } } @@ -4043,7 +4043,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (a (i, j), b (i, j)); } }
--- a/liboctave/CNDArray.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/CNDArray.cc Wed Jan 20 10:38:00 2010 +0100 @@ -238,7 +238,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -285,7 +285,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -331,7 +331,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -379,7 +379,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -427,7 +427,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -474,7 +474,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -933,7 +933,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (c, m (i)); } @@ -952,7 +952,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (c, m (i)); } @@ -978,7 +978,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (a (i), b (i)); } @@ -997,7 +997,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (c, m (i)); } @@ -1016,7 +1016,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (c, m (i)); } @@ -1042,7 +1042,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (a (i), b (i)); }
--- a/liboctave/CSparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/CSparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -824,7 +824,7 @@ for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); // place the 1 in the identity position octave_idx_type cx_colstart = cx; @@ -857,7 +857,7 @@ do { - OCTAVE_QUIT; + octave_quit (); rpX = retval.xridx(colXp); rpU = ridx(colUp); @@ -948,7 +948,7 @@ for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type iidx = rperm[i]; for (octave_idx_type j = 0; j < nr; j++) @@ -966,7 +966,7 @@ for (octave_idx_type k = cidx(jidx); k < cidx(jidx+1); k++) { - OCTAVE_QUIT; + octave_quit (); v -= work[ridx(k)] * data(k); } @@ -7431,7 +7431,7 @@ // add one to the printed indices to go from // zero-based to one-based arrays for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { os << a.ridx(i) + 1 << " " << j + 1 << " "; octave_write_complex (os, a.data(i)); @@ -7711,7 +7711,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) { @@ -7835,7 +7835,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) {
--- a/liboctave/ChangeLog Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/ChangeLog Wed Jan 20 10:38:00 2010 +0100 @@ -1,3 +1,39 @@ +2010-01-20 Jaroslav Hajek <highegg@gmail.com> + + * Array.h: Substitute OCTAVE_QUIT -> octave_quit (). + * CMatrix.cc: Ditto. + * CNDArray.cc: Ditto. + * CSparse.cc: Ditto. + * CmplxGEPBAL.cc: Ditto. + * MArrayN.cc: Ditto. + * MSparse.cc: Ditto. + * Sparse-diag-op-defs.h: Ditto. + * Sparse-op-defs.h: Ditto. + * Sparse-perm-op-defs.h: Ditto. + * Sparse.cc: Ditto. + * Sparse.h: Ditto. + * SparseCmplxQR.cc: Ditto. + * SparseQR.cc: Ditto. + * boolSparse.cc: Ditto. + * bsxfun-defs.cc: Ditto. + * dMatrix.cc: Ditto. + * dNDArray.cc: Ditto. + * dSparse.cc: Ditto. + * dbleGEPBAL.cc: Ditto. + * fCMatrix.cc: Ditto. + * fCNDArray.cc: Ditto. + * fCmplxGEPBAL.cc: Ditto. + * fMatrix.cc: Ditto. + * fNDArray.cc: Ditto. + * file-ops.cc: Ditto. + * floatGEPBAL.cc: Ditto. + * lo-utils.cc: Ditto. + * mx-op-defs.h: Ditto. + * oct-fftw.cc: Ditto. + * oct-norm.cc: Ditto. + * oct-rand.cc: Ditto. + * sparse-dmsolve.cc: Ditto. + 2010-01-20 Jaroslav Hajek <highegg@gmail.com> * bsxfun-defs.cc (BSXFUN_STDOP_DEFS_MXLOOP): Fix reversed min/max
--- a/liboctave/CmplxGEPBAL.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/CmplxGEPBAL.cc Wed Jan 20 10:38:00 2010 +0100 @@ -97,7 +97,7 @@ balancing_mat2 = Matrix (n, n, 0.0); for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); balancing_mat.elem (i ,i) = 1.0; balancing_mat2.elem (i ,i) = 1.0; }
--- a/liboctave/MArrayN.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/MArrayN.cc Wed Jan 20 10:38:00 2010 +0100 @@ -63,7 +63,7 @@ n = ext; } - OCTAVE_QUIT; + octave_quit (); octave_idx_type len = idx.length (n); idx.loop (len, _idxadds_helper<T> (this->fortran_vec (), val)); @@ -81,7 +81,7 @@ n = ext; } - OCTAVE_QUIT; + octave_quit (); octave_idx_type len = std::min (idx.length (n), vals.length ()); idx.loop (len, _idxadda_helper<T> (this->fortran_vec (), vals.data ()));
--- a/liboctave/MSparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/MSparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -68,7 +68,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) { @@ -141,7 +141,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) { @@ -299,11 +299,11 @@ \ for (octave_idx_type j = 0 ; j < b_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * b_nr; \ for (octave_idx_type i = b.cidx(j) ; i < b.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + b.ridx(i)) = a.data(0) OP b.data(i); \ } \ } \ @@ -320,11 +320,11 @@ \ for (octave_idx_type j = 0 ; j < a_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * a_nr; \ for (octave_idx_type i = a.cidx(j) ; i < a.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + a.ridx(i)) = a.data(i) OP b.data(0); \ } \ } \ @@ -351,7 +351,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) \ { \ @@ -417,7 +417,7 @@ \ for (octave_idx_type i = 0 ; i < b_nnz ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data (i) = a.data(0) OP r.data(i); \ } \ r.maybe_compress (); \ @@ -434,7 +434,7 @@ \ for (octave_idx_type i = 0 ; i < a_nnz ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data (i) = r.data(i) OP b.data(0); \ } \ r.maybe_compress (); \ @@ -460,7 +460,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) \ { \ @@ -523,11 +523,11 @@ r = MSparse<T> (b_nr, b_nc, fill); \ for (octave_idx_type j = 0 ; j < b_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * b_nr; \ for (octave_idx_type i = b.cidx(j) ; i < b.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + b.ridx(i)) = val OP b.data(i); \ } \ } \ @@ -551,11 +551,11 @@ r = MSparse<T> (a_nr, a_nc, fill); \ for (octave_idx_type j = 0 ; j < a_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * a_nr; \ for (octave_idx_type i = a.cidx(j) ; i < a.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + a.ridx(i)) = a.data(i) OP val; \ } \ } \ @@ -580,7 +580,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) \ { \
--- a/liboctave/Sparse-diag-op-defs.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Sparse-diag-op-defs.h Wed Jan 20 10:38:00 2010 +0100 @@ -132,7 +132,7 @@ for (octave_idx_type j = 0; j < nc; ++j) { - OCTAVE_QUIT; + octave_quit (); const octave_idx_type colend = a.cidx (j+1); r.xcidx (j) = k; octave_idx_type k_src = a.cidx (j), k_split;
--- a/liboctave/Sparse-op-defs.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Sparse-op-defs.h Wed Jan 20 10:38:00 2010 +0100 @@ -405,11 +405,11 @@ \ for (octave_idx_type j = 0 ; j < m2_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * m2_nr; \ for (octave_idx_type i = m2.cidx(j) ; i < m2.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + m2.ridx(i)) = m1.data(0) OP m2.data(i); \ } \ } \ @@ -426,11 +426,11 @@ \ for (octave_idx_type j = 0 ; j < m1_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * m1_nr; \ for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + m1.ridx(i)) = m1.data(i) OP m2.data(0); \ } \ } \ @@ -457,7 +457,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ { \ @@ -522,7 +522,7 @@ \ for (octave_idx_type i = 0 ; i < m2_nnz ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data (i) = m1.data(0) OP r.data(i); \ } \ r.maybe_compress (); \ @@ -539,7 +539,7 @@ \ for (octave_idx_type i = 0 ; i < m1_nnz ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data (i) = r.data(i) OP m2.data(0); \ } \ r.maybe_compress (); \ @@ -565,7 +565,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ { \ @@ -624,11 +624,11 @@ r = R (m2_nr, m2_nc, m1.elem(0,0) OP Complex ()); \ for (octave_idx_type j = 0 ; j < m2_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * m2_nr; \ for (octave_idx_type i = m2.cidx(j) ; i < m2.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + m2.ridx(i)) = m1.elem(0,0) OP m2.data(i); \ } \ } \ @@ -650,11 +650,11 @@ r = R (m1_nr, m1_nc, Complex() OP m2.elem(0,0)); \ for (octave_idx_type j = 0 ; j < m1_nc ; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type idxj = j * m1_nr; \ for (octave_idx_type i = m1.cidx(j) ; i < m1.cidx(j+1) ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(idxj + m1.ridx(i)) = m1.data(i) OP m2.elem(0,0); \ } \ } \ @@ -681,7 +681,7 @@ \ while (ja_lt_max || jb_lt_max ) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ if ((! jb_lt_max) || \ (ja_lt_max && (m1.ridx(ja) < m2.ridx(jb)))) \ { \ @@ -1849,13 +1849,13 @@ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(i) = s * a.data(i); \ r.ridx(i) = a.ridx(i); \ } \ for (octave_idx_type i = 0; i < a_nc + 1; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.cidx(i) = a.cidx(i); \ } \ \ @@ -1870,13 +1870,13 @@ \ for (octave_idx_type i = 0; i < nz; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.data(i) = m.data(i) * s; \ r.ridx(i) = m.ridx(i); \ } \ for (octave_idx_type i = 0; i < nc + 1; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ r.cidx(i) = m.cidx(i); \ } \ \ @@ -1910,7 +1910,7 @@ w[m.ridx(k)] = i + 1; \ nel++; \ } \ - OCTAVE_QUIT; \ + octave_quit (); \ } \ } \ retval.xcidx(i+1) = nel; \ @@ -1954,7 +1954,7 @@ for (octave_idx_type k = m.cidx(col) ; \ k < m.cidx(col+1); k++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type row = m.ridx(k); \ if (w[row] < i + 1) \ { \ @@ -1981,7 +1981,7 @@ for (octave_idx_type k = m.cidx(col) ; \ k < m.cidx(col+1); k++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ octave_idx_type row = m.ridx(k); \ if (w[row] < i + 1) \ { \ @@ -2028,7 +2028,7 @@ { \ for (octave_idx_type j = 0; j < a_nr; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ \ EL_TYPE tmpval = a.elem(j,i); \ for (octave_idx_type k = m.cidx(j) ; k < m.cidx(j+1); k++) \ @@ -2063,7 +2063,7 @@ { \ for (octave_idx_type j = 0; j < nc; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ \ EL_TYPE acc = ZERO; \ for (octave_idx_type k = m.cidx(j) ; k < m.cidx(j+1); k++) \ @@ -2097,7 +2097,7 @@ \ for (octave_idx_type i = 0; i < a_nc ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ { \ octave_idx_type col = a.ridx(j); \ @@ -2133,7 +2133,7 @@ \ for (octave_idx_type i = 0; i < a_nc ; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ for (octave_idx_type j = a.cidx(i); j < a.cidx(i+1); j++) \ { \ octave_idx_type col = a.ridx(j); \
--- a/liboctave/Sparse-perm-op-defs.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Sparse-perm-op-defs.h Wed Jan 20 10:38:00 2010 +0100 @@ -36,7 +36,7 @@ for (octave_idx_type k = 0; k < nent; ++k) { - OCTAVE_QUIT; + octave_quit (); r.xridx (k) = pcol[a.ridx (k)]; r.xdata (k) = a.data (k); } @@ -94,7 +94,7 @@ octave_idx_type k_src = 0; for (octave_idx_type j_src = 0; j_src < nc; ++j_src) { - OCTAVE_QUIT; + octave_quit (); const octave_idx_type j = prow[j_src]; const octave_idx_type kend_src = a.cidx (j_src + 1); for (k = r.xcidx (j); k_src < kend_src; ++k, ++k_src) @@ -129,7 +129,7 @@ octave_idx_type k = 0; for (octave_idx_type j = 0; j < nc; ++j) { - OCTAVE_QUIT; + octave_quit (); const octave_idx_type j_src = pcol[j]; octave_idx_type k_src; const octave_idx_type kend_src = a.cidx (j_src + 1);
--- a/liboctave/Sparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Sparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -345,7 +345,7 @@ sidx[i] = &sidxX[i]; octave_idx_type actual_nzmx = 0; - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < max_nzmx; i++) { octave_idx_type rowidx = (ri_scalar ? r(0) : r(i)); @@ -376,12 +376,12 @@ rep = new typename Sparse<T>::SparseRep (nr, nc); else { - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_sparse_sort_idxl *> lsort (octave_sparse_sidxl_comp); lsort.sort (sidx, actual_nzmx); - OCTAVE_QUIT; + octave_quit (); // Now count the unique non-zero values octave_idx_type real_nzmx = 1; @@ -398,7 +398,7 @@ xcidx (0) = 0; for (octave_idx_type i = 0; i < actual_nzmx; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type iidx = sidx[i]->idx; octave_idx_type rval = sidx[i]->r; octave_idx_type cval = sidx[i]->c; @@ -462,7 +462,7 @@ sidx[i] = &sidxX[i]; octave_idx_type actual_nzmx = 0; - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < max_nzmx; i++) { @@ -494,12 +494,12 @@ rep = new typename Sparse<T>::SparseRep (nr, nc); else { - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_sparse_sort_idxl *> lsort (octave_sparse_sidxl_comp); lsort.sort (sidx, actual_nzmx); - OCTAVE_QUIT; + octave_quit (); // Now count the unique non-zero values octave_idx_type real_nzmx = 1; @@ -516,7 +516,7 @@ xcidx (0) = 0; for (octave_idx_type i = 0; i < actual_nzmx; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type iidx = sidx[i]->idx; octave_idx_type rval = sidx[i]->r; octave_idx_type cval = sidx[i]->c; @@ -1003,7 +1003,7 @@ for (octave_idx_type i = c; i < c + a_cols; i++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) if (tmp.ridx(j) < r) @@ -1012,7 +1012,7 @@ ridx(ii++) = tmp.ridx(j); } - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = a.cidx(i-c); j < a.cidx(i-c+1); j++) { @@ -1020,7 +1020,7 @@ ridx(ii++) = r + a.ridx(j); } - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) if (tmp.ridx(j) >= r + a_rows) @@ -1183,7 +1183,7 @@ for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); if (i == idx_arg.elem (iidx)) { @@ -1212,7 +1212,7 @@ iidx = 0; for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); if (iidx < num_to_delete && i == idx_arg.elem (iidx)) iidx++; @@ -1236,7 +1236,7 @@ cidx(0) = 0; for (octave_idx_type i = 0; i < new_n; i++) { - OCTAVE_QUIT; + octave_quit (); if (ridx(ii) == i) ridx(ii++) = 0; cidx(i+1) = ii; @@ -1326,7 +1326,7 @@ for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); if (j == idx_j.elem (iidx)) { @@ -1352,7 +1352,7 @@ cidx(0) = 0; for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); if (iidx < num_to_delete && j == idx_j.elem (iidx)) iidx++; @@ -1401,7 +1401,7 @@ for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); if (i == idx_i.elem (iidx)) { @@ -1431,7 +1431,7 @@ iidx = 0; for (octave_idx_type j = tmp.cidx(i); j < tmp.cidx(i+1); j++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ri = tmp.ridx(j); @@ -1536,7 +1536,7 @@ for (octave_idx_type i = 0; i < nc; i++) for (octave_idx_type j = cidx(i); j < cidx(i+1); j++) { - OCTAVE_QUIT; + octave_quit (); retval.xdata(j) = data(j); retval.xridx(j) = ridx(j) + i * nr; } @@ -1578,7 +1578,7 @@ octave_idx_type ii = idx_arg.elem (i); if (ii == 0) { - OCTAVE_QUIT; + octave_quit (); retval.xdata(ic) = el; retval.xridx(ic++) = i % new_nr; } @@ -1592,7 +1592,7 @@ for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); retval.xdata(i) = el; retval.xridx(i) = i; } @@ -1625,7 +1625,7 @@ if (nr == 1) for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_arg.elem (i); if (ii < len) @@ -1639,7 +1639,7 @@ if (ii < len) for (octave_idx_type j = 0; j < nz; j++) { - OCTAVE_QUIT; + octave_quit (); if (ridx(j) == ii) new_nzmx++; @@ -1657,7 +1657,7 @@ retval.xcidx(0) = 0; for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_arg.elem (i); if (ii < len) @@ -1681,7 +1681,7 @@ if (ii < len) for (octave_idx_type j = 0; j < nz; j++) { - OCTAVE_QUIT; + octave_quit (); if (ridx(j) == ii) { @@ -1717,7 +1717,7 @@ retval.xcidx(0) = 0; for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_arg.elem (i); if (ii < len) @@ -1739,7 +1739,7 @@ if (ii < len) for (octave_idx_type j = 0; j < nz; j++) { - OCTAVE_QUIT; + octave_quit (); if (ridx(j) == ii) { @@ -1781,7 +1781,7 @@ { for (octave_idx_type i = 0; i < result_nr; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_arg.elem (kk++); if (ii < orig_len) @@ -1808,7 +1808,7 @@ { for (octave_idx_type i = 0; i < result_nr; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_arg.elem (kk++); if (ii < orig_len) @@ -1936,7 +1936,7 @@ octave_idx_type jj = idx_j.elem (j); for (octave_idx_type i = cidx(jj); i < cidx(jj+1); i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = itmp [ridx(i)]; if (ii >= 0) @@ -1988,7 +1988,7 @@ for (octave_idx_type i = cidx(jj); i < cidx(jj+1); i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = start_nodes [ridx(i)]; @@ -2024,7 +2024,7 @@ for (octave_idx_type i = cidx(jj); i < cidx(jj+1); i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = start_nodes [ridx(i)]; @@ -2489,7 +2489,7 @@ sidx[i]->idx = i; } - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_idx_vector_sort *> sort (octave_idx_vector_comp); @@ -2512,7 +2512,7 @@ // First count the number of non-zero elements for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = lhs_idx.elem (i); if (i < n - 1 && lhs_idx.elem (i + 1) == ii) @@ -2648,7 +2648,7 @@ new_nzmx += n; for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = lhs_idx.elem (i); if (ii < lhs_len && c_lhs.elem(ii) != LT ()) @@ -2773,7 +2773,7 @@ for (octave_idx_type i = 0; i < rhs.cols(); i++) for (octave_idx_type j = rhs.cidx(i); j < rhs.cidx(i+1); j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type k = jj; k <= i * rhs.rows() + rhs.ridx(j); k++) tmp.cidx(jj++) = ii; @@ -2889,7 +2889,7 @@ { for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_i.elem (i); @@ -3046,7 +3046,7 @@ sidx[i]->idx = i; } - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_idx_vector_sort *> sort (octave_idx_vector_comp); @@ -3085,7 +3085,7 @@ sidx[i]->idx = i; } - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_idx_vector_sort *> sort (octave_idx_vector_comp); @@ -3304,7 +3304,7 @@ sidx[i]->idx = i; } - OCTAVE_QUIT; + octave_quit (); octave_sort<octave_idx_vector_sort *> sort (octave_idx_vector_comp); @@ -3327,7 +3327,7 @@ // First count the number of non-zero elements for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_i.elem (i); if (i < len - 1 && idx_i.elem (i + 1) == ii) @@ -3426,7 +3426,7 @@ new_nzmx += len; for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type ii = idx_i.elem (i); if (ii < lhs_len && c_lhs.elem(ii) != LT ()) new_nzmx--;
--- a/liboctave/Sparse.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/Sparse.h Wed Jan 20 10:38:00 2010 +0100 @@ -531,7 +531,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = cidx(j); i < cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); /* Use data instead of elem for better performance. */ result.data (ridx (i) + j * nr) = fcn (data(i)); } @@ -558,7 +558,7 @@ result.data (ii) = val; result.ridx (ii++) = ridx (i); } - OCTAVE_QUIT; + octave_quit (); } result.cidx (j+1) = ii; }
--- a/liboctave/SparseCmplxQR.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/SparseCmplxQR.cc Wed Jan 20 10:38:00 2010 +0100 @@ -205,7 +205,7 @@ OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2); for (volatile octave_idx_type j = 0, idx = 0; j < b_nc; j++, idx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; #if defined(CS_VER) && (CS_VER >= 2) @@ -218,7 +218,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type i = 0; i < nm; i++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], reinterpret_cast<cs_complex_t *>(buf)); @@ -254,7 +254,7 @@ OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2); for (volatile octave_idx_type j = 0, idx = 0; j < nr; j++, idx+=nr) { - OCTAVE_QUIT; + octave_quit (); bvec[j] = OCTAVE_C99_ONE; volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -268,7 +268,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type i = 0; i < nm; i++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], reinterpret_cast<cs_complex_t *>(buf)); @@ -313,7 +313,7 @@ OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < q.S()->m2; j++) @@ -329,7 +329,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -368,7 +368,7 @@ #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < nbuf; j++) @@ -385,7 +385,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; #if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) @@ -443,7 +443,7 @@ OCTAVE_C99_COMPLEX (buf, q.S()->m2); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < q.S()->m2; j++) @@ -459,7 +459,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -521,7 +521,7 @@ #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < nbuf; j++) @@ -538,7 +538,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; #if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf); @@ -617,7 +617,7 @@ for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; i++, idx+=nc, bidx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = nr; j < q.S()->m2; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -629,7 +629,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -668,7 +668,7 @@ for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; i++, idx+=nc, bidx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = OCTAVE_C99_ZERO; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -681,7 +681,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; #if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf); @@ -738,7 +738,7 @@ OCTAVE_C99_COMPLEX (buf, q.S()->m2); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < q.S()->m2; j++) @@ -754,7 +754,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -815,7 +815,7 @@ #endif for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < nbuf; j++) @@ -832,7 +832,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; #if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2)) CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf);
--- a/liboctave/SparseQR.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/SparseQR.cc Wed Jan 20 10:38:00 2010 +0100 @@ -186,7 +186,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, S->m2); for (volatile octave_idx_type j = 0, idx = 0; j < b_nc; j++, idx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = nr; i < S->m2; i++) buf[i] = 0.; volatile octave_idx_type nm = (nr < nc ? nr : nc); @@ -200,7 +200,7 @@ for (volatile octave_idx_type i = 0; i < nm; i++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (N->L, i, N->B[i], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -235,7 +235,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, S->m2); for (volatile octave_idx_type j = 0, idx = 0; j < nr; j++, idx+=nr) { - OCTAVE_QUIT; + octave_quit (); bvec[j] = 1.0; for (octave_idx_type i = nr; i < S->m2; i++) buf[i] = 0.; @@ -250,7 +250,7 @@ for (volatile octave_idx_type i = 0; i < nm; i++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (N->L, i, N->B[i], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -294,7 +294,7 @@ for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; i++, idx+=nc, bidx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = nr; j < q.S()->m2; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -306,7 +306,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -335,7 +335,7 @@ for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc; i++, idx+=nc, bidx+=b_nr) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -348,7 +348,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -400,7 +400,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, q.S()->m2); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < q.S()->m2; j++) @@ -414,7 +414,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -464,7 +464,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, nbuf); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) Xx[j] = b.xelem(j,i); for (octave_idx_type j = nr; j < nbuf; j++) @@ -479,7 +479,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -549,7 +549,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, q.S()->m2); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) { Complex c = b.xelem (j,i); @@ -567,7 +567,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -589,7 +589,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -621,7 +621,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, nbuf); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) { Complex c = b.xelem (j,i); @@ -640,7 +640,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -664,7 +664,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -719,7 +719,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, q.S()->m2); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) { Complex c = b.xelem (j,i); @@ -737,7 +737,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -761,7 +761,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -812,7 +812,7 @@ OCTAVE_LOCAL_BUFFER (double, buf, nbuf); for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = 0; j < b_nr; j++) { Complex c = b.xelem (j,i); @@ -831,7 +831,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -855,7 +855,7 @@ END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = nr-1; j >= 0; j--) { - OCTAVE_QUIT; + octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_happly) (q.N()->L, j, q.N()->B[j], buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
--- a/liboctave/boolSparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/boolSparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -169,7 +169,7 @@ // zero-based to one-based arrays for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) os << a.ridx(i) + 1 << " " << j + 1 << " " << a.data(i) << "\n"; }
--- a/liboctave/bsxfun-defs.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/bsxfun-defs.cc Wed Jan 20 10:38:00 2010 +0100 @@ -117,7 +117,7 @@ OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, idx, nd, 0); for (octave_idx_type iter = 0; iter < niter; iter++) { - OCTAVE_QUIT; + octave_quit (); // Compute indices. // FIXME: performance impact noticeable?
--- a/liboctave/dMatrix.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/dMatrix.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1016,7 +1016,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftf, ZFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1057,7 +1057,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftb, ZFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1101,7 +1101,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftf, ZFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1120,7 +1120,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -1167,7 +1167,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (zfftb, ZFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1189,7 +1189,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -3296,7 +3296,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (d, m (i, j)); } @@ -3316,7 +3316,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (m (i, j), d); } @@ -3343,7 +3343,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (a (i, j), b (i, j)); } @@ -3363,7 +3363,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (d, m (i, j)); } @@ -3383,7 +3383,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (m (i, j), d); } @@ -3410,7 +3410,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (a (i, j), b (i, j)); }
--- a/liboctave/dNDArray.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/dNDArray.cc Wed Jan 20 10:38:00 2010 +0100 @@ -279,7 +279,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -326,7 +326,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -372,7 +372,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -420,7 +420,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -468,7 +468,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -515,7 +515,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -1000,7 +1000,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (d, m (i)); } @@ -1019,7 +1019,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (d, m (i)); } @@ -1045,7 +1045,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (a (i), b (i)); } @@ -1064,7 +1064,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (d, m (i)); } @@ -1083,7 +1083,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (d, m (i)); } @@ -1109,7 +1109,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (a (i), b (i)); }
--- a/liboctave/dSparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/dSparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -754,7 +754,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (x.ridx(ja) < y.ridx(jb)))) { @@ -922,7 +922,7 @@ for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); // place the 1 in the identity position octave_idx_type cx_colstart = cx; @@ -955,7 +955,7 @@ do { - OCTAVE_QUIT; + octave_quit (); rpX = retval.xridx(colXp); rpU = ridx(colUp); @@ -1045,7 +1045,7 @@ for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type iidx = rperm[i]; for (octave_idx_type j = 0; j < nr; j++) @@ -1063,7 +1063,7 @@ for (octave_idx_type k = cidx(jidx); k < cidx(jidx+1); k++) { - OCTAVE_QUIT; + octave_quit (); v -= work[ridx(k)] * data(k); } @@ -7573,7 +7573,7 @@ // add one to the printed indices to go from // zero-based to one-based arrays for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { os << a.ridx(i) + 1 << " " << j + 1 << " "; octave_write_double (os, a.data(i)); @@ -7821,7 +7821,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) { @@ -7971,7 +7971,7 @@ while (ja_lt_max || jb_lt_max ) { - OCTAVE_QUIT; + octave_quit (); if ((! jb_lt_max) || (ja_lt_max && (a.ridx(ja) < b.ridx(jb)))) {
--- a/liboctave/dbleGEPBAL.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/dbleGEPBAL.cc Wed Jan 20 10:38:00 2010 +0100 @@ -97,7 +97,7 @@ balancing_mat2 = Matrix (n, n, 0.0); for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); balancing_mat.elem (i ,i) = 1.0; balancing_mat2.elem (i ,i) = 1.0; }
--- a/liboctave/fCMatrix.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/fCMatrix.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1346,7 +1346,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1387,7 +1387,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1431,7 +1431,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1450,7 +1450,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -1497,7 +1497,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1519,7 +1519,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -3879,7 +3879,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (c, m (i, j)); } @@ -3899,7 +3899,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (m (i, j), c); } @@ -3928,7 +3928,7 @@ int columns_are_real_only = 1; for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) { columns_are_real_only = 0; @@ -3945,7 +3945,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (a (i, j), b (i, j)); } } @@ -3967,7 +3967,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (c, m (i, j)); } @@ -3987,7 +3987,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (m (i, j), c); } @@ -4016,7 +4016,7 @@ int columns_are_real_only = 1; for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); if (std::imag (a (i, j)) != 0.0 || std::imag (b (i, j)) != 0.0) { columns_are_real_only = 0; @@ -4028,7 +4028,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (std::real (a (i, j)), std::real (b (i, j))); } } @@ -4036,7 +4036,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (a (i, j), b (i, j)); } }
--- a/liboctave/fCNDArray.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/fCNDArray.cc Wed Jan 20 10:38:00 2010 +0100 @@ -233,7 +233,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -280,7 +280,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -326,7 +326,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -374,7 +374,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -422,7 +422,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -469,7 +469,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -928,7 +928,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (c, m (i)); } @@ -947,7 +947,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (c, m (i)); } @@ -973,7 +973,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (a (i), b (i)); } @@ -992,7 +992,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (c, m (i)); } @@ -1011,7 +1011,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (c, m (i)); } @@ -1037,7 +1037,7 @@ for (int i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (a (i), b (i)); }
--- a/liboctave/fCmplxGEPBAL.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/fCmplxGEPBAL.cc Wed Jan 20 10:38:00 2010 +0100 @@ -97,7 +97,7 @@ balancing_mat2 = FloatMatrix (n, n, 0.0); for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); balancing_mat.elem (i ,i) = 1.0; balancing_mat2.elem (i ,i) = 1.0; }
--- a/liboctave/fMatrix.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/fMatrix.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1015,7 +1015,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1056,7 +1056,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1100,7 +1100,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftf, CFFTF) (npts, &tmp_data[npts*j], pwsave); } @@ -1119,7 +1119,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -1166,7 +1166,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); F77_FUNC (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave); } @@ -1188,7 +1188,7 @@ for (octave_idx_type j = 0; j < nsamples; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; @@ -3295,7 +3295,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (d, m (i, j)); } @@ -3315,7 +3315,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (m (i, j), d); } @@ -3342,7 +3342,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmin (a (i, j), b (i, j)); } @@ -3362,7 +3362,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (d, m (i, j)); } @@ -3382,7 +3382,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (m (i, j), d); } @@ -3409,7 +3409,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = xmax (a (i, j), b (i, j)); }
--- a/liboctave/fNDArray.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/fNDArray.cc Wed Jan 20 10:38:00 2010 +0100 @@ -237,7 +237,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -284,7 +284,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem((i + k*npts)*stride + j*dist); @@ -330,7 +330,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -378,7 +378,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -426,7 +426,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -473,7 +473,7 @@ { for (octave_idx_type j = 0; j < howmany; j++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval ((l + k*npts)*stride + j*dist); @@ -958,7 +958,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (d, m (i)); } @@ -977,7 +977,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (d, m (i)); } @@ -1003,7 +1003,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmin (a (i), b (i)); } @@ -1022,7 +1022,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (d, m (i)); } @@ -1041,7 +1041,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (d, m (i)); } @@ -1067,7 +1067,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = xmax (a (i), b (i)); }
--- a/liboctave/file-ops.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/file-ops.cc Wed Jan 20 10:38:00 2010 +0100 @@ -330,7 +330,7 @@ for (octave_idx_type i = 0; i < dirlist.length (); i++) { - OCTAVE_QUIT; + octave_quit (); std::string nm = dirlist[i];
--- a/liboctave/floatGEPBAL.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/floatGEPBAL.cc Wed Jan 20 10:38:00 2010 +0100 @@ -97,7 +97,7 @@ balancing_mat2 = FloatMatrix (n, n, 0.0); for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); balancing_mat.elem (i ,i) = 1.0; balancing_mat2.elem (i ,i) = 1.0; }
--- a/liboctave/lo-utils.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/lo-utils.cc Wed Jan 20 10:38:00 2010 +0100 @@ -220,7 +220,7 @@ if (buf) free (buf); - OCTAVE_QUIT; + octave_quit (); return retval; }
--- a/liboctave/mx-op-defs.h Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/mx-op-defs.h Wed Jan 20 10:38:00 2010 +0100 @@ -560,7 +560,7 @@ \ for (octave_idx_type i = 0; i < nel; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = d OP m (i) ? d : m(i); \ } \ \ @@ -581,7 +581,7 @@ \ for (octave_idx_type i = 0; i < nel; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = m (i) OP d ? m(i) : d; \ } \ \ @@ -609,7 +609,7 @@ \ for (octave_idx_type i = 0; i < nel; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = a(i) OP b(i) ? a(i) : b(i); \ } \ \
--- a/liboctave/oct-fftw.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/oct-fftw.cc Wed Jan 20 10:38:00 2010 +0100 @@ -683,7 +683,7 @@ convert_packcomplex_1d (T *out, size_t nr, size_t nc, octave_idx_type stride, octave_idx_type dist) { - OCTAVE_QUIT; + octave_quit (); // Fill in the missing data. @@ -691,7 +691,7 @@ for (size_t j = nc/2+1; j < nc; j++) out[j*stride + i*dist] = conj(out[(nc - j)*stride + i*dist]); - OCTAVE_QUIT; + octave_quit (); } template <class T> @@ -704,7 +704,7 @@ size_t nrp = nr * np; T *ptr1, *ptr2; - OCTAVE_QUIT; + octave_quit (); // Create space for the missing elements. @@ -716,7 +716,7 @@ *ptr2++ = *ptr1++; } - OCTAVE_QUIT; + octave_quit (); // Fill in the missing data for the rank = 2 case directly for speed. @@ -730,7 +730,7 @@ out[j + i*nr*nc] = conj(out[(i*nr+1)*nc - j]); } - OCTAVE_QUIT; + octave_quit (); // Now do the permutations needed for rank > 2 cases. @@ -754,7 +754,7 @@ jstart = jmax; } - OCTAVE_QUIT; + octave_quit (); } int
--- a/liboctave/oct-norm.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/oct-norm.cc Wed Jan 20 10:38:00 2010 +0100 @@ -413,7 +413,7 @@ RR lambda = 0, mu = 0; for (octave_idx_type k = 0; k < m.columns (); k++) { - OCTAVE_QUIT; + octave_quit (); VectorT col (m.column (k)); if (k > 0) higham_subp (y, col, 4*k, p, lambda, mu); @@ -431,7 +431,7 @@ int iter = 0; while (iter < maxiter) { - OCTAVE_QUIT; + octave_quit (); y = m*x; gamma1 = gamma; gamma = vector_norm (y, p);
--- a/liboctave/oct-rand.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/oct-rand.cc Wed Jan 20 10:38:00 2010 +0100 @@ -562,7 +562,7 @@ double val; \ for (volatile octave_idx_type i = 0; i < len; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ RAND_FUNC (val); \ v[i] = val; \ } \
--- a/liboctave/sparse-dmsolve.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/liboctave/sparse-dmsolve.cc Wed Jan 20 10:38:00 2010 +0100 @@ -58,7 +58,7 @@ B.xcidx (j - cst) = nz; for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { @@ -81,7 +81,7 @@ B.xcidx (j - cst) = nz; for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { @@ -169,7 +169,7 @@ octave_idx_type boff = j * nr; for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); ax [Q [r + i] + aoff] = bx [i + boff]; } } @@ -228,7 +228,7 @@ for (octave_idx_type i = c; i < c + b_cols; i++) { - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = tmp.xcidx(i); j < tmp.xcidx(i+1); j++) if (Qinv [tmp.xridx(j)] < r || Qinv [tmp.xridx(j)] >= r + b_rows) @@ -237,7 +237,7 @@ a.xridx(ii++) = tmp.xridx(j); } - OCTAVE_QUIT; + octave_quit (); for (octave_idx_type j = b.cidx(i-c); j < b.cidx(i-c+1); j++) { @@ -286,7 +286,7 @@ octave_idx_type off = j * b_nr; for (octave_idx_type i = 0; i < b_nr; i++) { - OCTAVE_QUIT; + octave_quit (); Btx [p [i] + off] = Bx [ i + off]; } } @@ -323,7 +323,7 @@ { for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); octave_idx_type r = p [b.ridx (i)]; X [r] = b.data (i); a.xridx(nz++) = p [b.ridx (i)]; @@ -331,7 +331,7 @@ sort.sort (ri + a.xcidx (j), nz - a.xcidx (j)); for (octave_idx_type i = a.cidx (j); i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); a.xdata (i) = X [a.xridx (i)]; } a.xcidx(j+1) = nz;
--- a/src/ChangeLog Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ChangeLog Wed Jan 20 10:38:00 2010 +0100 @@ -1,3 +1,28 @@ +2010-01-20 Jaroslav Hajek <highegg@gmail.com> + + * data.cc: Substitute OCTAVE_QUIT -> octave_quit (). + * input.cc: Ditto. + * ls-mat-ascii.cc: Ditto. + * oct-stream.cc: Ditto. + * ov-base-int.cc: Ditto. + * ov-base-sparse.cc: Ditto. + * ov-bool-sparse.cc: Ditto. + * ov-cell.cc: Ditto. + * ov-cx-sparse.cc: Ditto. + * ov-flt-re-mat.cc: Ditto. + * ov-re-mat.cc: Ditto. + * ov-re-sparse.cc: Ditto. + * pr-output.cc: Ditto. + * pt-eval.cc: Ditto. + * pt-mat.cc: Ditto. + * sighandlers.cc: Ditto. + * sparse-xdiv.cc: Ditto. + * sparse-xpow.cc: Ditto. + * toplev.cc: Ditto. + * utils.cc: Ditto. + * xdiv.cc: Ditto. + * xpow.cc: Ditto. + 2010-01-20 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/bsxfun.cc: New tests.
--- a/src/data.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/data.cc Wed Jan 20 10:38:00 2010 +0100 @@ -202,7 +202,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x, y_data[i]); } @@ -221,7 +221,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x, y_data[i]); } @@ -240,7 +240,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x_data[i], y); } @@ -259,7 +259,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x_data[i], y); } @@ -281,7 +281,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x_data[i], y_data[i]); } @@ -303,7 +303,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); r_data[i] = f (x_data[i], y_data[i]); } @@ -325,7 +325,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = y.cidx (j); i < y.cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); retval.data (y.ridx(i) + j * nr) = f (x, y.data (i)); } @@ -342,7 +342,7 @@ { for (octave_idx_type i = y.cidx (j); i < y.cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); double val = f (x, y.data (i)); if (val != 0.0) @@ -375,7 +375,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = x.cidx (j); i < x.cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); retval.data (x.ridx(i) + j * nr) = f (x.data (i), y); } @@ -392,7 +392,7 @@ { for (octave_idx_type i = x.cidx (j); i < x.cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); double val = f (x.data (i), y); if (val != 0.0) @@ -433,7 +433,7 @@ { while (k1 < x.cidx(j+1) && k2 < y.cidx(j+1)) { - OCTAVE_QUIT; + octave_quit (); if (k1 >= x.cidx(j+1)) { retval.data (y.ridx(k2) + j * nr) = f (0.0, y.data (k2)); @@ -483,7 +483,7 @@ { while (k1 < x.cidx(j+1) && k2 < y.cidx(j+1)) { - OCTAVE_QUIT; + octave_quit (); double val; octave_idx_type r; if (k1 >= x.cidx(j+1)) @@ -1889,7 +1889,7 @@ \ for (int j = 1; j < n_args; j++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ \ TYPE ra = args(j).EXTRACTOR (); \ \
--- a/src/input.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/input.cc Wed Jan 20 10:38:00 2010 +0100 @@ -198,7 +198,7 @@ std::string gnu_readline (const std::string& s, bool force_readline) { - OCTAVE_QUIT; + octave_quit (); std::string retval; @@ -258,7 +258,7 @@ static std::string octave_gets (void) { - OCTAVE_QUIT; + octave_quit (); std::string retval; @@ -334,7 +334,7 @@ static std::string get_user_input (void) { - OCTAVE_QUIT; + octave_quit (); std::string retval; @@ -771,7 +771,7 @@ // Restore previous value of global_command. frame.run_top (2); - OCTAVE_QUIT; + octave_quit (); } } else
--- a/src/ls-mat-ascii.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ls-mat-ascii.cc Wed Jan 20 10:38:00 2010 +0100 @@ -118,7 +118,7 @@ while (is && ! error_state) { - OCTAVE_QUIT; + octave_quit (); std::string buf = get_mat_data_input_line (is); @@ -235,7 +235,7 @@ get_lines_and_columns (is, filename, nr, nc); - OCTAVE_QUIT; + octave_quit (); if (! error_state && nr > 0 && nc > 0) { @@ -254,7 +254,7 @@ for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); d = octave_read_value<double> (tmp_stream);
--- a/src/oct-stream.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/oct-stream.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1806,7 +1806,7 @@ for (;;) { - OCTAVE_QUIT; + octave_quit (); if (elt) { @@ -2623,7 +2623,7 @@ for (;;) { - OCTAVE_QUIT; + octave_quit (); if (elt) {
--- a/src/ov-base-int.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-base-int.cc Wed Jan 20 10:38:00 2010 +0100 @@ -143,7 +143,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); typename T::element_type tmp = this->matrix(i);
--- a/src/ov-base-sparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-base-sparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -297,7 +297,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); // FIXME -- is there an easy way to get the max row // and column indices so we can set the width appropriately
--- a/src/ov-bool-sparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-bool-sparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -237,14 +237,14 @@ // zero-based to one-based arrays for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.cidx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.ridx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } @@ -295,7 +295,7 @@ for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap) @@ -305,7 +305,7 @@ for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap)
--- a/src/ov-cell.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-cell.cc Wed Jan 20 10:38:00 2010 +0100 @@ -659,7 +659,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); std::ostringstream buf; buf << "[" << i+1 << "," << j+1 << "]";
--- a/src/ov-cx-sparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-cx-sparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -293,14 +293,14 @@ // zero-based to one-based arrays for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.cidx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.ridx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } @@ -348,7 +348,7 @@ for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap) @@ -358,7 +358,7 @@ for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap)
--- a/src/ov-flt-re-mat.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-flt-re-mat.cc Wed Jan 20 10:38:00 2010 +0100 @@ -276,7 +276,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); float d = matrix (i); @@ -698,7 +698,7 @@ for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); FloatComplex tmp = fcn (a(i)); if (tmp.imag () == 0.0) @@ -714,7 +714,7 @@ for (octave_idx_type j = i+1; j < n; j++) { - OCTAVE_QUIT; + octave_quit (); rc(j) = fcn (a(j)); }
--- a/src/ov-re-mat.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-re-mat.cc Wed Jan 20 10:38:00 2010 +0100 @@ -284,7 +284,7 @@ for (octave_idx_type i = 0; i < nel; i++) { - OCTAVE_QUIT; + octave_quit (); double d = matrix (i); @@ -727,7 +727,7 @@ for (octave_idx_type i = 0; i < n; i++) { - OCTAVE_QUIT; + octave_quit (); Complex tmp = fcn (a(i)); if (tmp.imag () == 0.0) @@ -743,7 +743,7 @@ for (octave_idx_type j = i+1; j < n; j++) { - OCTAVE_QUIT; + octave_quit (); rc(j) = fcn (a(j)); }
--- a/src/ov-re-sparse.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/ov-re-sparse.cc Wed Jan 20 10:38:00 2010 +0100 @@ -219,7 +219,7 @@ for (octave_idx_type i = matrix.cidx(j); i < matrix.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); double d = matrix.data (i); @@ -307,14 +307,14 @@ // zero-based to one-based arrays for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.cidx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); itmp = matrix.ridx(i); os.write (reinterpret_cast<char *> (&itmp), 4); } @@ -362,7 +362,7 @@ for (int i = 0; i < nc+1; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap) @@ -372,7 +372,7 @@ for (int i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); if (! is.read (reinterpret_cast<char *> (&tmp), 4)) return false; if (swap)
--- a/src/pr-output.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/pr-output.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1576,7 +1576,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, m(i,j)); } @@ -1634,7 +1634,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); if (i == 0 && j == 0) os << "[ "; @@ -1680,7 +1680,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); os << " "; @@ -1710,7 +1710,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, m(i,j)); } @@ -1768,7 +1768,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); if (j == 0) os << "[ "; @@ -1819,7 +1819,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); os << " "; @@ -1861,7 +1861,7 @@ \ for (octave_idx_type i = 0; i < m; i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ \ std::string nm = "ans"; \ \ @@ -1975,7 +1975,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, cm(i,j)); } @@ -2035,7 +2035,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); if (i == 0 && j == 0) os << "[ "; @@ -2081,7 +2081,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); os << " "; @@ -2111,7 +2111,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, cm(i,j)); } @@ -2171,7 +2171,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); if (j == 0) os << "[ "; @@ -2222,7 +2222,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); os << " "; @@ -2255,7 +2255,7 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, m(i,j)); } @@ -2315,7 +2315,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); if (j == 0) os << "[ "; @@ -2357,7 +2357,7 @@ for (octave_idx_type j = col; j < lim; j++) { - OCTAVE_QUIT; + octave_quit (); os << " "; @@ -2466,7 +2466,7 @@ { for (octave_idx_type i = 0; i < num_elem; i++) { - OCTAVE_QUIT; + octave_quit (); double val = base + i * increment; @@ -2539,7 +2539,7 @@ for (octave_idx_type i = col; i < lim; i++) { - OCTAVE_QUIT; + octave_quit (); double val = base + i * increment; @@ -2608,7 +2608,7 @@ { for (octave_idx_type i = 0; i < nstr; i++) { - OCTAVE_QUIT; + octave_quit (); std::string row = chm.row_as_string (i); @@ -2999,7 +2999,7 @@ { for (octave_idx_type jj = 0; jj < nc; jj++) { - OCTAVE_QUIT; + octave_quit (); pr_plus_format (os, page(ii,jj)); } @@ -3109,7 +3109,7 @@ { for (octave_idx_type jj = 0; jj < nc; jj++) { - OCTAVE_QUIT; + octave_quit (); os << " "; os << typename octave_print_conv<T>::print_conv_type (page(ii,jj)); } @@ -3137,7 +3137,7 @@ for (octave_idx_type jj = col; jj < lim; jj++) { - OCTAVE_QUIT; + octave_quit (); os << " "; pr_int (os, page(ii,jj), fw); }
--- a/src/pt-eval.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/pt-eval.cc Wed Jan 20 10:38:00 2010 +0100 @@ -240,7 +240,7 @@ static inline bool quit_loop_now (void) { - OCTAVE_QUIT; + octave_quit (); // Maybe handle `continue N' someday... @@ -720,7 +720,7 @@ if (elt) { - OCTAVE_QUIT; + octave_quit (); elt->accept (*this);
--- a/src/pt-mat.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/pt-mat.cc Wed Jan 20 10:38:00 2010 +0100 @@ -377,7 +377,7 @@ p != row.end (); p++) { - OCTAVE_QUIT; + octave_quit (); tree_expression *elt = *p; @@ -393,7 +393,7 @@ for (octave_idx_type i = 0; i < tlst.length (); i++) { - OCTAVE_QUIT; + octave_quit (); if (! do_init_element (elt, tlst(i), first_elem)) goto done; @@ -523,7 +523,7 @@ for (tree_matrix::const_iterator p = tm.begin (); p != tm.end (); p++) { - OCTAVE_QUIT; + octave_quit (); tree_argument_list *elt = *p; @@ -568,7 +568,7 @@ { for (iterator p = begin (); p != end (); p++) { - OCTAVE_QUIT; + octave_quit (); tm_row_const elt = *p; @@ -676,7 +676,7 @@ { for (const_iterator p = begin (); p != end (); p++) { - OCTAVE_QUIT; + octave_quit (); tree_argument_list *elt = *p; @@ -692,7 +692,7 @@ { for (const_iterator p = begin (); p != end (); p++) { - OCTAVE_QUIT; + octave_quit (); tree_argument_list *elt = *p; @@ -739,7 +739,7 @@ q != row.end (); q++) { - OCTAVE_QUIT; + octave_quit (); TYPE ra = octave_value_extract<TYPE> (*q); @@ -826,7 +826,7 @@ int j = 0; for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++) { - OCTAVE_QUIT; + octave_quit (); tm_row_const row = *p; @@ -978,14 +978,14 @@ { for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++) { - OCTAVE_QUIT; + octave_quit (); tm_row_const row = *p; for (tm_row_const::iterator q = row.begin (); q != row.end (); q++) { - OCTAVE_QUIT; + octave_quit (); ctmp = *q; @@ -1012,7 +1012,7 @@ for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++) { - OCTAVE_QUIT; + octave_quit (); tm_row_const row = *p; @@ -1020,7 +1020,7 @@ q != row.end (); q++) { - OCTAVE_QUIT; + octave_quit (); octave_value elt = *q;
--- a/src/sighandlers.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/sighandlers.cc Wed Jan 20 10:38:00 2010 +0100 @@ -101,7 +101,7 @@ // List of signals we have caught since last call to octave_signal_handler. static bool octave_signals_caught[NSIG]; -// Called from OCTAVE_QUIT to actually do something about the signals +// Called from octave_quit () to actually do something about the signals // we have caught. void
--- a/src/sparse-xdiv.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/sparse-xdiv.cc Wed Jan 20 10:38:00 2010 +0100 @@ -313,7 +313,7 @@ octave_idx_type k_result = 0; for (octave_idx_type j = 0; j < nc; ++j) { - OCTAVE_QUIT; + octave_quit (); const DM_elt_type s = d.dgelem (j); const octave_idx_type colend = a.cidx (j+1); r.xcidx (j) = k_result; @@ -386,7 +386,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.elem (b.ridx(i), j) = a / b.data (i); } @@ -404,7 +404,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.elem (b.ridx(i), j) = a / b.data (i); } @@ -422,7 +422,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.elem (b.ridx(i), j) = a / b.data (i); } @@ -440,7 +440,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.elem (b.ridx(i), j) = a / b.data (i); } @@ -580,7 +580,7 @@ octave_idx_type k_result = 0; for (octave_idx_type j = 0; j < a_nc; ++j) { - OCTAVE_QUIT; + octave_quit (); const octave_idx_type colend = a.cidx (j+1); r.xcidx (j) = k_result; for (octave_idx_type k = a.cidx (j); k < colend; ++k)
--- a/src/sparse-xpow.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/sparse-xpow.cc Wed Jan 20 10:38:00 2010 +0100 @@ -249,7 +249,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b(i,j)); } } @@ -264,7 +264,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b(i,j)); } } @@ -289,7 +289,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b(i,j)); } } @@ -325,7 +325,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); Complex atmp (a.data (i)); @@ -341,7 +341,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result (a.ridx(i), j) = std::pow (a.data (i), b); } @@ -354,7 +354,7 @@ for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); // FIXME -- avoid apparent GNU libm bug by // converting A and B to complex instead of just A. @@ -375,7 +375,7 @@ for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); result.data (i) = std::pow (a.data (i), b); } @@ -435,7 +435,7 @@ { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); complex_result.xelem(a.ridx(i), j) = std::pow (Complex(a.data(i)), Complex(b(a.ridx(i), j))); } @@ -451,7 +451,7 @@ { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.xelem(a.ridx(i), j) = std::pow (a.data(i), b (a.ridx(i), j)); } @@ -479,7 +479,7 @@ for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); result.data (i) = std::pow (Complex (a.data (i)), b); } @@ -512,7 +512,7 @@ { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.xelem(a.ridx(i), j) = std::pow (a.data(i), b (a.ridx(i), j)); } } @@ -535,7 +535,7 @@ { for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b (i, j); if (xisint (btmp)) result (i, j) = std::pow (a, static_cast<int> (btmp)); @@ -558,7 +558,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b (i, j)); } @@ -583,7 +583,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result (a.ridx(i), j) = std::pow (a.data (i), static_cast<int> (b)); } @@ -593,7 +593,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result (a.ridx(i), j) = std::pow (a.data (i), b); } } @@ -610,7 +610,7 @@ { for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); result.data (i) = std::pow (a.data (i), static_cast<int> (b)); } } @@ -618,7 +618,7 @@ { for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); result.data (i) = std::pow (a.data (i), b); } } @@ -652,7 +652,7 @@ { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b (a.ridx(i), j); Complex tmp; @@ -687,7 +687,7 @@ for (octave_idx_type i = 0; i < nz; i++) { - OCTAVE_QUIT; + octave_quit (); result.data (i) = std::pow (a.data (i), b); } @@ -720,7 +720,7 @@ { for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) { - OCTAVE_QUIT; + octave_quit (); result.xelem(a.ridx(i), j) = std::pow (a.data (i), b (a.ridx(i), j)); } }
--- a/src/toplev.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/toplev.cc Wed Jan 20 10:38:00 2010 +0100 @@ -579,7 +579,7 @@ global_command = 0; - OCTAVE_QUIT; + octave_quit (); if (! (interactive || forced_interactive)) {
--- a/src/utils.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/utils.cc Wed Jan 20 10:38:00 2010 +0100 @@ -1345,7 +1345,7 @@ octave_sleep (sec); octave_usleep (usec); - OCTAVE_QUIT; + octave_quit (); } } @@ -1450,7 +1450,7 @@ if (iscell[i]) new_args(i) = ccells[i](j); - OCTAVE_QUIT; + octave_quit (); const octave_value_list tmp = fun (new_args, nargout);
--- a/src/xdiv.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/xdiv.cc Wed Jan 20 10:38:00 2010 +0100 @@ -213,7 +213,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -231,7 +231,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -249,7 +249,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -267,7 +267,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -290,7 +290,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -304,7 +304,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -318,7 +318,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -332,7 +332,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -511,7 +511,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -529,7 +529,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -547,7 +547,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -565,7 +565,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = a / b (i, j); } @@ -588,7 +588,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -602,7 +602,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -616,7 +616,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); } @@ -630,7 +630,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = a / b (i); }
--- a/src/xpow.cc Wed Jan 20 09:32:02 2010 +0100 +++ b/src/xpow.cc Wed Jan 20 10:38:00 2010 +0100 @@ -649,7 +649,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b (i, j)); } @@ -662,7 +662,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b (i, j)); } @@ -685,7 +685,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b (i, j)); } @@ -752,7 +752,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); Complex atmp (a (i, j)); @@ -768,7 +768,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } @@ -800,7 +800,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); double atmp = a (i, j); double btmp = b (i, j); if (atmp < 0.0 && static_cast<int> (btmp) != btmp) @@ -819,7 +819,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); Complex atmp (a (i, j)); Complex btmp (b (i, j)); complex_result (i, j) = std::pow (atmp, btmp); @@ -834,7 +834,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b (i, j)); } @@ -856,7 +856,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (Complex (a (i, j)), b); } @@ -884,7 +884,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (Complex (a (i, j)), b (i, j)); } @@ -903,7 +903,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b (i, j); if (xisint (btmp)) result (i, j) = std::pow (a, static_cast<int> (btmp)); @@ -926,7 +926,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b (i, j)); } @@ -987,7 +987,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), static_cast<int> (b)); } } @@ -996,7 +996,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } } @@ -1025,7 +1025,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b (i, j); if (xisint (btmp)) result (i, j) = std::pow (a (i, j), static_cast<int> (btmp)); @@ -1048,7 +1048,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } @@ -1076,7 +1076,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b (i, j)); } @@ -1126,7 +1126,7 @@ ComplexNDArray result (b.dims ()); for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (atmp, b(i)); } @@ -1137,7 +1137,7 @@ NDArray result (b.dims ()); for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = std::pow (a, b(i)); } @@ -1156,7 +1156,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (atmp, b(i)); } @@ -1177,7 +1177,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); Complex atmp (a (i)); @@ -1191,7 +1191,7 @@ NDArray result (a.dims ()); for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } @@ -1222,7 +1222,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), ib); } } @@ -1254,7 +1254,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); double atmp = a(i); double btmp = b(i); if (atmp < 0.0 && static_cast<int> (btmp) != btmp) @@ -1272,7 +1272,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); Complex atmp (a(i)); Complex btmp (b(i)); complex_result(i) = std::pow (atmp, btmp); @@ -1286,7 +1286,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b(i)); } @@ -1304,7 +1304,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (Complex (a(i)), b); } @@ -1328,7 +1328,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (Complex (a(i)), b(i)); } @@ -1343,7 +1343,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b(i); if (xisint (btmp)) result(i) = std::pow (a, static_cast<int> (btmp)); @@ -1362,7 +1362,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a, b(i)); } @@ -1386,7 +1386,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), static_cast<int> (b)); } } @@ -1395,7 +1395,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } } @@ -1420,7 +1420,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); double btmp = b(i); if (xisint (btmp)) result(i) = std::pow (a(i), static_cast<int> (btmp)); @@ -1439,7 +1439,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } @@ -1463,7 +1463,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b(i)); } @@ -2053,7 +2053,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b (i, j)); } @@ -2066,7 +2066,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b (i, j)); } @@ -2089,7 +2089,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (atmp, b (i, j)); } @@ -2112,7 +2112,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); FloatComplex atmp (a (i, j)); @@ -2128,7 +2128,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } @@ -2160,7 +2160,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); float atmp = a (i, j); float btmp = b (i, j); if (atmp < 0.0 && static_cast<int> (btmp) != btmp) @@ -2179,7 +2179,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); FloatComplex atmp (a (i, j)); FloatComplex btmp (b (i, j)); complex_result (i, j) = std::pow (atmp, btmp); @@ -2194,7 +2194,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b (i, j)); } @@ -2216,7 +2216,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (FloatComplex (a (i, j)), b); } @@ -2244,7 +2244,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (FloatComplex (a (i, j)), b (i, j)); } @@ -2263,7 +2263,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); float btmp = b (i, j); if (xisint (btmp)) result (i, j) = std::pow (a, static_cast<int> (btmp)); @@ -2286,7 +2286,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a, b (i, j)); } @@ -2307,7 +2307,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), static_cast<int> (b)); } } @@ -2316,7 +2316,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } } @@ -2345,7 +2345,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); float btmp = b (i, j); if (xisint (btmp)) result (i, j) = std::pow (a (i, j), static_cast<int> (btmp)); @@ -2368,7 +2368,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b); } @@ -2396,7 +2396,7 @@ for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = 0; i < nr; i++) { - OCTAVE_QUIT; + octave_quit (); result (i, j) = std::pow (a (i, j), b (i, j)); } @@ -2446,7 +2446,7 @@ FloatComplexNDArray result (b.dims ()); for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (atmp, b(i)); } @@ -2457,7 +2457,7 @@ FloatNDArray result (b.dims ()); for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result (i) = std::pow (a, b(i)); } @@ -2476,7 +2476,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (atmp, b(i)); } @@ -2497,7 +2497,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); FloatComplex atmp (a (i)); @@ -2511,7 +2511,7 @@ FloatNDArray result (a.dims ()); for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } @@ -2542,7 +2542,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), ib); } } @@ -2574,7 +2574,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); float atmp = a(i); float btmp = b(i); if (atmp < 0.0 && static_cast<int> (btmp) != btmp) @@ -2592,7 +2592,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); FloatComplex atmp (a(i)); FloatComplex btmp (b(i)); complex_result(i) = std::pow (atmp, btmp); @@ -2606,7 +2606,7 @@ for (octave_idx_type i = 0; i < len; i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b(i)); } @@ -2624,7 +2624,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (FloatComplex (a(i)), b); } @@ -2648,7 +2648,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (FloatComplex (a(i)), b(i)); } @@ -2663,7 +2663,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); float btmp = b(i); if (xisint (btmp)) result(i) = std::pow (a, static_cast<int> (btmp)); @@ -2682,7 +2682,7 @@ for (octave_idx_type i = 0; i < b.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a, b(i)); } @@ -2706,7 +2706,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), static_cast<int> (b)); } } @@ -2715,7 +2715,7 @@ { for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } } @@ -2740,7 +2740,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); float btmp = b(i); if (xisint (btmp)) result(i) = std::pow (a(i), static_cast<int> (btmp)); @@ -2759,7 +2759,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b); } @@ -2783,7 +2783,7 @@ for (octave_idx_type i = 0; i < a.length (); i++) { - OCTAVE_QUIT; + octave_quit (); result(i) = std::pow (a(i), b(i)); }