Mercurial > octave
changeset 22402:4caa7b28d183
maint: Style check C++ code in liboctave/
* Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc,
Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc,
Array-util.h, Array-voidp.cc, Array.cc, Array.h, CColVector.cc, CColVector.h,
CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h,
CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc,
DiagArray2.h, MArray-C.cc, MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc,
MArray-s.cc, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse-C.cc,
MSparse-d.cc, MSparse.cc, MSparse.h, Matrix.h, MatrixType.cc, MatrixType.h,
PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-C.cc, Sparse-b.cc,
Sparse-d.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc,
boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.cc, chMatrix.h,
chNDArray.cc, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc,
dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc,
dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h,
fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc,
fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h,
fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc,
fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc,
idx-vector.h, int16NDArray.cc, int16NDArray.h, int32NDArray.cc, int32NDArray.h,
int64NDArray.cc, int64NDArray.h, int8NDArray.cc, int8NDArray.h, intNDArray.cc,
intNDArray.h, uint16NDArray.cc, uint16NDArray.h, uint32NDArray.cc,
uint32NDArray.h, uint64NDArray.h, uint8NDArray.h, blaswrap.c, cquit.c,
f77-extern.cc, f77-fcn.c, f77-fcn.h, lo-error.c, lo-error.h, quit.cc, quit.h,
liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h,
DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h,
DASSL.cc, DASSL.h, DET.h, EIG.cc, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h,
ODES.cc, ODES.h, ODESFunc.h, Quad.cc, Quad.h, aepbalance.cc, aepbalance.h,
base-dae.h, base-de.h, base-min.h, bsxfun-decl.h, bsxfun-defs.cc, bsxfun.h,
chol.cc, chol.h, eigs-base.cc, eigs-base.h, fEIG.cc, fEIG.h, gepbalance.cc,
gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-amos-proto.h,
lo-arpack-proto.h, lo-blas-proto.h, lo-fftpack-proto.h, lo-lapack-proto.h,
lo-mappers.cc, lo-mappers.h, lo-qrupdate-proto.h, lo-ranlib-proto.h,
lo-slatec-proto.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc,
oct-fftw.cc, oct-fftw.h, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-dmsolve.cc, sparse-dmsolve.h,
sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h,
Sparse-diag-op-defs.h, Sparse-op-decls.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-base.h, mx-defs.h, mx-ext.h, mx-inlines.cc,
mx-op-decl.h, mx-op-defs.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h,
oct-passwd.cc, oct-passwd.h, oct-syscalls.cc, oct-time.cc, oct-time.h,
oct-uname.cc, oct-uname.h, action-container.h, base-list.h, byte-swap.h,
caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc,
data-conv.h, f2c-main.c, functor.h, glob-match.cc, glob-match.h, kpse.cc,
kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc,
lo-array-gripes.h, lo-cutils.c, lo-cutils.h, lo-hash.cc, lo-hash.h, lo-ieee.cc,
lo-ieee.h, lo-macros.h, lo-math.h, lo-regexp.cc, lo-regexp.h, lo-traits.h,
lo-utils.cc, lo-utils.h, oct-alloc.h, oct-base64.cc, oct-binmap.h, oct-cmplx.h,
oct-glob.cc, oct-glob.h, oct-inttypes-fwd.h, oct-inttypes.cc, oct-inttypes.h,
oct-locbuf.cc, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-rl-edit.c,
oct-rl-edit.h, oct-rl-hist.c, oct-rl-hist.h, oct-shlib.cc, oct-shlib.h,
oct-sort.cc, oct-sort.h, oct-sparse.h, oct-string.cc, oct-string.h,
pathsearch.cc, pathsearch.h, singleton-cleanup.cc, singleton-cleanup.h,
sparse-sort.cc, sparse-sort.h, sparse-util.cc, sparse-util.h, str-vec.cc,
str-vec.h, sun-utils.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h, areadlink-wrapper.c, areadlink-wrapper.h,
async-system-wrapper.c, async-system-wrapper.h, base64-wrappers.c,
base64-wrappers.h, canonicalize-file-name-wrapper.c,
canonicalize-file-name-wrapper.h, dirent-wrappers.c, dirent-wrappers.h,
fcntl-wrappers.c, fcntl-wrappers.h, filepos-wrappers.c, filepos-wrappers.h,
fpucw-wrappers.c, fpucw-wrappers.h, gen-tempname-wrapper.c,
gen-tempname-wrapper.h, getopt-wrapper.c, glob-wrappers.c, hash-wrappers.c,
hash-wrappers.h, math-wrappers.c, math-wrappers.h, mkostemp-wrapper.c,
mkostemp-wrapper.h, nanosleep-wrapper.c, nanosleep-wrapper.h, nproc-wrapper.c,
nproc-wrapper.h, octave-popen2.c, octave-popen2.h, putenv-wrapper.c,
putenv-wrapper.h, set-program-name-wrapper.c, set-program-name-wrapper.h,
signal-wrappers.c, signal-wrappers.h, stat-wrappers.c, stat-wrappers.h,
strdup-wrapper.c, strdup-wrapper.h, strftime-wrapper.c, strftime-wrapper.h,
strmode-wrapper.c, strmode-wrapper.h, strptime-wrapper.c, strptime-wrapper.h,
time-wrappers.c, time-wrappers.h, tmpfile-wrapper.c, tmpfile-wrapper.h,
uname-wrapper.c, uname-wrapper.h, unistd-wrappers.c, unistd-wrappers.h,
unsetenv-wrapper.c, unsetenv-wrapper.h, vasprintf-wrapper.c,
vasprintf-wrapper.h, wait-for-input.c, wait-for-input.h, wait-wrappers.c,
wait-wrappers.h:
Wrap long lines < 80 characters. Update incorrect indentation.
line wrap: on
line diff
--- a/liboctave/array/Array-C.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-C.cc Mon Aug 29 11:09:25 2016 -0700 @@ -101,3 +101,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<Complex>; +
--- a/liboctave/array/Array-b.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-b.cc Mon Aug 29 11:09:25 2016 -0700 @@ -126,3 +126,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<bool>; +
--- a/liboctave/array/Array-ch.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-ch.cc Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<char>; +
--- a/liboctave/array/Array-d.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-d.cc Mon Aug 29 11:09:25 2016 -0700 @@ -172,3 +172,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<double>; +
--- a/liboctave/array/Array-f.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-f.cc Mon Aug 29 11:09:25 2016 -0700 @@ -172,3 +172,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<float>; +
--- a/liboctave/array/Array-fC.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-fC.cc Mon Aug 29 11:09:25 2016 -0700 @@ -101,3 +101,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<FloatComplex>; +
--- a/liboctave/array/Array-i.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-i.cc Mon Aug 29 11:09:25 2016 -0700 @@ -76,3 +76,4 @@ #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<int>; +
--- a/liboctave/array/Array-idx-vec.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-idx-vec.cc Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ NO_INSTANTIATE_ARRAY_SORT (idx_vector); INSTANTIATE_ARRAY (idx_vector, OCTAVE_API); +
--- a/liboctave/array/Array-s.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-s.cc Mon Aug 29 11:09:25 2016 -0700 @@ -47,3 +47,4 @@ #include "DiagArray2.cc" template class DiagArray2<short>; +
--- a/liboctave/array/Array-str.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-str.cc Mon Aug 29 11:09:25 2016 -0700 @@ -42,3 +42,4 @@ template class OCTAVE_API octave_sort<std::string>; INSTANTIATE_ARRAY (std::string, OCTAVE_API); +
--- a/liboctave/array/Array-util.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-util.cc Mon Aug 29 11:09:25 2016 -0700 @@ -558,7 +558,7 @@ ("sub2ind: lengths of indices must match"); if (idx.extent (n) > n) - octave::err_index_out_of_range (len, i+1, idx.extent (n), n); + octave::err_index_out_of_range (len, i+1, idx.extent (n), n); } catch (octave::index_exception& e) { @@ -668,3 +668,4 @@ return pva->pidx > pvb->pidx; } +
--- a/liboctave/array/Array-util.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-util.h Mon Aug 29 11:09:25 2016 -0700 @@ -115,3 +115,4 @@ extern int OCTAVE_API permute_vector_compare (const void *a, const void *b); #endif +
--- a/liboctave/array/Array-voidp.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array-voidp.cc Mon Aug 29 11:09:25 2016 -0700 @@ -40,3 +40,4 @@ NO_INSTANTIATE_ARRAY_SORT (void *); INSTANTIATE_ARRAY (void *, OCTAVE_API); +
--- a/liboctave/array/Array.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array.cc Mon Aug 29 11:09:25 2016 -0700 @@ -857,7 +857,8 @@ for (int i = 0; i < ial; i++) { if (ia(i).extent (dv(i)) != dv(i)) - octave::err_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws + octave::err_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), + dimensions); // throws all_colons = all_colons && ia(i).is_colon (); } @@ -2869,3 +2870,4 @@ return os; } +
--- a/liboctave/array/Array.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Array.h Mon Aug 29 11:09:25 2016 -0700 @@ -916,3 +916,4 @@ operator << (std::ostream& os, const Array<T>& a); #endif +
--- a/liboctave/array/CColVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CColVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -489,3 +489,4 @@ } return is; } +
--- a/liboctave/array/CColVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CColVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -151,3 +151,4 @@ MARRAY_FORWARD_DEFS (MArray, ComplexColumnVector, Complex) #endif +
--- a/liboctave/array/CDiagMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CDiagMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -511,3 +511,4 @@ } return os; } +
--- a/liboctave/array/CDiagMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CDiagMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -158,3 +158,4 @@ MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, ComplexDiagMatrix, Complex) #endif +
--- a/liboctave/array/CMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -856,7 +856,8 @@ if (octave::math::isnan (anorm) || octave::math::isinf (anorm)) info = -1; else - F77_XFCN (zgetrf, ZGETRF, (nc, nc, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (nc, nc, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, + info)); // Throw-away extra info LAPACK gives so as to not change output. rcon = 0.0; @@ -942,7 +943,8 @@ { ComplexMatrix retval; - octave::math::svd<ComplexMatrix> result (*this, octave::math::svd<ComplexMatrix>::Type::economy); + octave::math::svd<ComplexMatrix> result (*this, + octave::math::svd<ComplexMatrix>::Type::economy); DiagMatrix S = result.singular_values (); ComplexMatrix U = result.left_singular_matrix (); @@ -1105,7 +1107,8 @@ { octave_quit (); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } return retval; @@ -1146,7 +1149,8 @@ { octave_quit (); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -1190,7 +1194,8 @@ { octave_quit (); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } npts = nc; @@ -1212,7 +1217,8 @@ for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) tmp_data[i*nr + j] = prow[i]; @@ -1256,7 +1262,8 @@ { octave_quit (); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -1281,7 +1288,8 @@ for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) tmp_data[i*nr + j] = prow[i] / static_cast<double> (npts); @@ -1407,7 +1415,8 @@ if (octave::math::isnan (anorm)) info = -1; else - F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, + info)); // Throw-away extra info LAPACK gives so as to not change output. rcon = 0.0; @@ -1601,7 +1610,8 @@ if (octave::math::isnan (anorm)) info = -1; else - F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, + info)); if (info != 0) { @@ -1930,7 +1940,8 @@ if (octave::math::isnan (anorm) || octave::math::isinf (anorm)) info = -2; else - F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (nr, nr, F77_DBLE_CMPLX_ARG (tmp_data), nr, pipvt, + info)); // Throw-away extra info LAPACK gives so as to not change output. rcon = 0.0; @@ -2430,7 +2441,8 @@ Array<octave_idx_type> iwork (dim_vector (liwork, 1)); octave_idx_type* piwork = iwork.fortran_vec (); - F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, F77_DBLE_CMPLX_ARG (pretval), maxmn, + F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, + F77_DBLE_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_DBLE_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2467,7 +2479,8 @@ lwork = static_cast<octave_idx_type> (octave::math::real (work(0))); work.resize (dim_vector (lwork, 1)); - F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, F77_DBLE_CMPLX_ARG (pretval), + F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, + F77_DBLE_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_DBLE_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2618,7 +2631,8 @@ Array<octave_idx_type> iwork (dim_vector (liwork, 1)); octave_idx_type* piwork = iwork.fortran_vec (); - F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, F77_DBLE_CMPLX_ARG (pretval), maxmn, + F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, + F77_DBLE_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_DBLE_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2627,7 +2641,8 @@ rwork.resize (dim_vector (static_cast<octave_idx_type> (rwork(0)), 1)); iwork.resize (dim_vector (iwork(0), 1)); - F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, F77_DBLE_CMPLX_ARG (pretval), + F77_XFCN (zgelsd, ZGELSD, (m, n, nrhs, F77_DBLE_CMPLX_ARG (tmp_data), m, + F77_DBLE_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_DBLE_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -3257,7 +3272,11 @@ double cc; Complex cs, temp_r; - F77_FUNC (zlartg, ZLARTG) (F77_CONST_DBLE_CMPLX_ARG (&x), F77_CONST_DBLE_CMPLX_ARG (&y), cc, F77_DBLE_CMPLX_ARG (&cs), F77_DBLE_CMPLX_ARG (&temp_r)); + F77_FUNC (zlartg, ZLARTG) (F77_CONST_DBLE_CMPLX_ARG (&x), + F77_CONST_DBLE_CMPLX_ARG (&y), + cc, + F77_DBLE_CMPLX_ARG (&cs), + F77_DBLE_CMPLX_ARG (&temp_r)); ComplexMatrix g (2, 2); @@ -3443,15 +3462,18 @@ { if (cja == cjb) { - F77_FUNC (xzdotu, XZDOTU) (a_nc, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, + F77_FUNC (xzdotu, XZDOTU) (a_nc, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, + F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, F77_DBLE_CMPLX_ARG (c)); if (cja) *c = octave::math::conj (*c); } else if (cja) - F77_FUNC (xzdotc, XZDOTC) (a_nc, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, + F77_FUNC (xzdotc, XZDOTC) (a_nc, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, + F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, F77_DBLE_CMPLX_ARG (c)); else - F77_FUNC (xzdotc, XZDOTC) (a_nc, F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, + F77_FUNC (xzdotc, XZDOTC) (a_nc, F77_CONST_DBLE_CMPLX_ARG (b.data ()), 1, + F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_DBLE_CMPLX_ARG (c)); } else if (b_nc == 1 && ! cjb) @@ -3477,7 +3499,8 @@ F77_XFCN (zgemm, ZGEMM, (F77_CONST_CHAR_ARG2 (&ctra, 1), F77_CONST_CHAR_ARG2 (&ctrb, 1), a_nr, b_nc, a_nc, 1.0, F77_CONST_DBLE_CMPLX_ARG (a.data ()), - lda, F77_CONST_DBLE_CMPLX_ARG (b.data ()), ldb, 0.0, F77_DBLE_CMPLX_ARG (c), a_nr + lda, F77_CONST_DBLE_CMPLX_ARG (b.data ()), ldb, 0.0, F77_DBLE_CMPLX_ARG (c), + a_nr F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); } @@ -3554,7 +3577,8 @@ if (columns_are_real_only) { for (octave_idx_type i = 0; i < nr; i++) - result(i, j) = octave::math::min (octave::math::real (a(i, j)), octave::math::real (b(i, j))); + result(i, j) = octave::math::min (octave::math::real (a(i, j)), + octave::math::real (b(i, j))); } else { @@ -3628,7 +3652,8 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result(i, j) = octave::math::max (octave::math::real (a(i, j)), octave::math::real (b(i, j))); + result(i, j) = octave::math::max (octave::math::real (a(i, j)), + octave::math::real (b(i, j))); } } else @@ -3689,3 +3714,4 @@ MM_CMP_OPS (ComplexMatrix, ComplexMatrix) MM_BOOL_OPS (ComplexMatrix, ComplexMatrix) +
--- a/liboctave/array/CMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -469,3 +469,4 @@ MARRAY_FORWARD_DEFS (MArray, ComplexMatrix, Complex) #endif +
--- a/liboctave/array/CNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -227,7 +227,8 @@ for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem ((i + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (tmp), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (tmp), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) retval((i + k*npts)*stride + j*dist) = tmp[i]; @@ -274,7 +275,8 @@ for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem ((i + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (tmp), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (tmp), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) retval((i + k*npts)*stride + j*dist) = tmp[i] / @@ -320,7 +322,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = prow[l]; @@ -368,7 +371,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = @@ -416,7 +420,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = prow[l]; @@ -463,7 +468,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = @@ -559,7 +565,8 @@ if (i_val < min_val) min_val = i_val; - if (octave::math::x_nint (r_val) != r_val || octave::math::x_nint (i_val) != i_val) + if (octave::math::x_nint (r_val) != r_val + || octave::math::x_nint (i_val) != i_val) return false; } @@ -891,3 +898,4 @@ BSXFUN_STDREL_DEFS_MXLOOP (ComplexNDArray) BSXFUN_OP_DEF_MXLOOP (pow, ComplexNDArray, mx_inline_pow) +
--- a/liboctave/array/CNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -176,3 +176,4 @@ BSXFUN_OP_DECL (pow, ComplexNDArray, OCTAVE_API) #endif +
--- a/liboctave/array/CRowVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CRowVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -413,7 +413,8 @@ if (len != a_len) octave::err_nonconformant ("operator *", len, a_len); if (len != 0) - F77_FUNC (xzdotu, XZDOTU) (len, F77_CONST_DBLE_CMPLX_ARG (v.data ()), 1, F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_DBLE_CMPLX_ARG (&retval)); + F77_FUNC (xzdotu, XZDOTU) (len, F77_CONST_DBLE_CMPLX_ARG (v.data ()), 1, + F77_CONST_DBLE_CMPLX_ARG (a.data ()), 1, F77_DBLE_CMPLX_ARG (&retval)); return retval; } @@ -440,3 +441,4 @@ return retval; } +
--- a/liboctave/array/CRowVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CRowVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -142,3 +142,4 @@ MARRAY_FORWARD_DEFS (MArray, ComplexRowVector, Complex) #endif +
--- a/liboctave/array/CSparse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CSparse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -180,7 +180,9 @@ return false; } -static const Complex Complex_NaN_result (octave::numeric_limits<double>::NaN (), octave::numeric_limits<double>::NaN ()); +static const Complex + Complex_NaN_result (octave::numeric_limits<double>::NaN (), + octave::numeric_limits<double>::NaN ()); SparseComplexMatrix SparseComplexMatrix::max (int dim) const @@ -1031,7 +1033,9 @@ Qinit(i) = i; MatrixType tmp_typ (MatrixType::Upper); - octave::math::sparse_lu<SparseComplexMatrix> fact (*this, Qinit, Matrix (), false, false); + octave::math::sparse_lu<SparseComplexMatrix> fact (*this, + Qinit, Matrix (), + false, false); rcond = fact.rcond (); double rcond2; SparseComplexMatrix InvL = fact.L ().transpose (). @@ -3684,7 +3688,8 @@ retval = ComplexMatrix (b); Complex *result = retval.fortran_vec (); - F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (result), b.rows (), err)); if (err != 0) @@ -3741,7 +3746,8 @@ retval = ComplexMatrix (b); Complex *result = retval.fortran_vec (); - F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), b.rows (), err)); if (err != 0) @@ -3840,7 +3846,8 @@ } } - F77_XFCN (zgttrf, ZGTTRF, (nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, err)); + F77_XFCN (zgttrf, ZGTTRF, (nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, err)); if (err != 0) { @@ -3876,7 +3883,8 @@ F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), - nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, + nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), + F77_DBLE_CMPLX_ARG (DU2), pipvt, F77_DBLE_CMPLX_ARG (work), b.rows (), err F77_CHAR_ARG_LEN (1))); @@ -3984,7 +3992,8 @@ retval = ComplexMatrix (b); Complex *result = retval.fortran_vec (); - F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (result), b_nr, err)); if (err != 0) @@ -4042,7 +4051,8 @@ retval = ComplexMatrix (b); Complex *result = retval.fortran_vec (); - F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), b_nr, err)); if (err != 0) @@ -4139,7 +4149,8 @@ } } - F77_XFCN (zgttrf, ZGTTRF, (nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, err)); + F77_XFCN (zgttrf, ZGTTRF, (nr, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), + F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, err)); if (err != 0) { @@ -4177,7 +4188,8 @@ F77_XFCN (zgttrs, ZGTTRS, (F77_CONST_CHAR_ARG2 (&job, 1), - nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (DU2), pipvt, + nr, 1, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), + F77_DBLE_CMPLX_ARG (DU2), pipvt, F77_DBLE_CMPLX_ARG (Bx), b_nr, err F77_CHAR_ARG_LEN (1))); @@ -4394,7 +4406,8 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - F77_XFCN (zgbtrf, ZGBTRF, (nr, nc, n_lower, n_upper, F77_DBLE_CMPLX_ARG (tmp_data), + F77_XFCN (zgbtrf, ZGBTRF, (nr, nc, n_lower, n_upper, + F77_DBLE_CMPLX_ARG (tmp_data), ldm, pipvt, err)); // Throw-away extra info LAPACK gives so as to not @@ -4673,7 +4686,8 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, F77_DBLE_CMPLX_ARG (tmp_data), + F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, + F77_DBLE_CMPLX_ARG (tmp_data), ldm, pipvt, err)); if (err != 0) @@ -4954,7 +4968,8 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, F77_DBLE_CMPLX_ARG (tmp_data), + F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, + F77_DBLE_CMPLX_ARG (tmp_data), ldm, pipvt, err)); if (err != 0) @@ -5238,7 +5253,8 @@ Array<octave_idx_type> ipvt (dim_vector (nr, 1)); octave_idx_type *pipvt = ipvt.fortran_vec (); - F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, F77_DBLE_CMPLX_ARG (tmp_data), + F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, + F77_DBLE_CMPLX_ARG (tmp_data), ldm, pipvt, err)); if (err != 0) @@ -6799,7 +6815,7 @@ retval = qrsolve (*this, b, err); #else retval = dmsolve<SparseComplexMatrix, SparseComplexMatrix, - SparseComplexMatrix> (*this, b, err); + SparseComplexMatrix> (*this, b, err); #endif } @@ -7188,7 +7204,8 @@ if (i_val < min_val) min_val = i_val; - if (octave::math::x_nint (r_val) != r_val || octave::math::x_nint (i_val) != i_val) + if (octave::math::x_nint (r_val) != r_val + || octave::math::x_nint (i_val) != i_val) return false; } @@ -7756,3 +7773,4 @@ SPARSE_SMSM_CMP_OPS (SparseComplexMatrix, 0.0, real, SparseComplexMatrix, 0.0, real) SPARSE_SMSM_BOOL_OPS (SparseComplexMatrix, SparseComplexMatrix, 0.0) +
--- a/liboctave/array/CSparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/CSparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -552,3 +552,4 @@ SPARSE_FORWARD_DEFS (MSparse, SparseComplexMatrix, ComplexMatrix, Complex) #endif +
--- a/liboctave/array/DiagArray2.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/DiagArray2.cc Mon Aug 29 11:09:25 2016 -0700 @@ -145,3 +145,4 @@ return ok; } +
--- a/liboctave/array/DiagArray2.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/DiagArray2.h Mon Aug 29 11:09:25 2016 -0700 @@ -188,3 +188,4 @@ }; #endif +
--- a/liboctave/array/MArray-C.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-C.cc Mon Aug 29 11:09:25 2016 -0700 @@ -41,3 +41,4 @@ template class OCTAVE_API MDiagArray2<Complex>; INSTANTIATE_MDIAGARRAY2_FRIENDS (Complex, OCTAVE_API) +
--- a/liboctave/array/MArray-d.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-d.cc Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ template class OCTAVE_API MDiagArray2<double>; INSTANTIATE_MDIAGARRAY2_FRIENDS (double, OCTAVE_API) +
--- a/liboctave/array/MArray-f.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-f.cc Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ template class OCTAVE_API MDiagArray2<float>; INSTANTIATE_MDIAGARRAY2_FRIENDS (float, OCTAVE_API) +
--- a/liboctave/array/MArray-fC.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-fC.cc Mon Aug 29 11:09:25 2016 -0700 @@ -41,3 +41,4 @@ template class OCTAVE_API MDiagArray2<FloatComplex>; INSTANTIATE_MDIAGARRAY2_FRIENDS (FloatComplex, OCTAVE_API) +
--- a/liboctave/array/MArray-i.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-i.cc Mon Aug 29 11:09:25 2016 -0700 @@ -76,3 +76,4 @@ template class OCTAVE_API MDiagArray2<int>; INSTANTIATE_MDIAGARRAY2_FRIENDS (int, OCTAVE_API) +
--- a/liboctave/array/MArray-s.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray-s.cc Mon Aug 29 11:09:25 2016 -0700 @@ -46,3 +46,4 @@ template class OCTAVE_API MDiagArray2<short>; INSTANTIATE_MDIAGARRAY2_FRIENDS (short, OCTAVE_API) +
--- a/liboctave/array/MArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -86,7 +86,7 @@ } template <typename T, T op (typename ref_param<T>::type, - typename ref_param<T>::type)> + typename ref_param<T>::type)> struct _idxbinop_helper { T *array; @@ -359,3 +359,4 @@ { return do_mx_unary_op<T, T> (a, mx_inline_uminus); } +
--- a/liboctave/array/MArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -262,3 +262,4 @@ #endif +
--- a/liboctave/array/MDiagArray2.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MDiagArray2.cc Mon Aug 29 11:09:25 2016 -0700 @@ -70,7 +70,7 @@ operator * (const T& s, const MDiagArray2<T>& a) { return MDiagArray2<T> (do_sm_binary_op<T, T, T> (s, a, mx_inline_mul), - a.d1, a.d2); + a.d1, a.d2); } // Element by element MDiagArray2 by MDiagArray2 ops. @@ -106,3 +106,4 @@ return MDiagArray2<T> (do_mx_unary_op<T, T> (a, mx_inline_uminus), a.d1, a.d2); } +
--- a/liboctave/array/MDiagArray2.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MDiagArray2.h Mon Aug 29 11:09:25 2016 -0700 @@ -175,3 +175,4 @@ } #endif +
--- a/liboctave/array/MSparse-C.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MSparse-C.cc Mon Aug 29 11:09:25 2016 -0700 @@ -32,3 +32,4 @@ template class OCTAVE_API MSparse<Complex>; INSTANTIATE_SPARSE_FRIENDS (Complex, OCTAVE_API); +
--- a/liboctave/array/MSparse-d.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MSparse-d.cc Mon Aug 29 11:09:25 2016 -0700 @@ -30,3 +30,4 @@ template class OCTAVE_API MSparse<double>; INSTANTIATE_SPARSE_FRIENDS (double, OCTAVE_API); +
--- a/liboctave/array/MSparse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MSparse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -606,3 +606,4 @@ retval.data (i) = - retval.data (i); return retval; } +
--- a/liboctave/array/MSparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MSparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -210,3 +210,4 @@ R, dynamic_cast<const B<T>&>, R) #endif +
--- a/liboctave/array/Matrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Matrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #include "mx-ops.h" #endif +
--- a/liboctave/array/MatrixType.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MatrixType.cc Mon Aug 29 11:09:25 2016 -0700 @@ -982,3 +982,4 @@ template MatrixType::MatrixType (const MSparse<double>&); template MatrixType::MatrixType (const MSparse<Complex>&); +
--- a/liboctave/array/MatrixType.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/MatrixType.h Mon Aug 29 11:09:25 2016 -0700 @@ -186,3 +186,4 @@ }; #endif +
--- a/liboctave/array/PermMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/PermMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -233,3 +233,4 @@ return r; } +
--- a/liboctave/array/PermMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/PermMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -131,3 +131,4 @@ operator * (const PermMatrix& a, const PermMatrix& b); #endif +
--- a/liboctave/array/Range.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Range.cc Mon Aug 29 11:09:25 2016 -0700 @@ -581,3 +581,4 @@ clear_cache (); } +
--- a/liboctave/array/Range.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Range.h Mon Aug 29 11:09:25 2016 -0700 @@ -62,7 +62,8 @@ : rng_base (b), rng_limit (b + (n-1) * i), rng_inc (i), rng_numel (n), cache () { - if (! octave::math::finite (b) || ! octave::math::finite (i) || ! octave::math::finite (rng_limit)) + if (! octave::math::finite (b) || ! octave::math::finite (i) + || ! octave::math::finite (rng_limit)) rng_numel = -2; else { @@ -155,7 +156,8 @@ : rng_base (b), rng_limit (l), rng_inc (i), rng_numel (n), cache () { - if (! octave::math::finite (b) || ! octave::math::finite (i) || ! octave::math::finite (l)) + if (! octave::math::finite (b) || ! octave::math::finite (i) + || ! octave::math::finite (l)) rng_numel = -2; } }; @@ -175,3 +177,4 @@ extern OCTAVE_API Range operator * (const Range& r, double x); #endif +
--- a/liboctave/array/Sparse-C.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Sparse-C.cc Mon Aug 29 11:09:25 2016 -0700 @@ -62,3 +62,4 @@ #if 0 template std::ostream& operator << (std::ostream&, const Sparse<Complex>&); #endif +
--- a/liboctave/array/Sparse-b.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Sparse-b.cc Mon Aug 29 11:09:25 2016 -0700 @@ -42,3 +42,4 @@ #if 0 template std::ostream& operator << (std::ostream&, const Sparse<bool>&); #endif +
--- a/liboctave/array/Sparse-d.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Sparse-d.cc Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ #if 0 template std::ostream& operator << (std::ostream&, const Sparse<double>&); #endif +
--- a/liboctave/array/Sparse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Sparse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -3016,3 +3016,4 @@ template std::istream& \ read_sparse_matrix<T> (std::istream& is, Sparse<T>& a, \ T (*read_fcn) (std::istream&)); +
--- a/liboctave/array/Sparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/Sparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -705,3 +705,4 @@ T (*read_fcn) (std::istream&)); #endif +
--- a/liboctave/array/boolMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -88,3 +88,4 @@ MS_BOOL_OPS (boolMatrix, bool) SM_BOOL_OPS (bool, boolMatrix) MM_CMP_OPS (boolMatrix, boolMatrix) +
--- a/liboctave/array/boolMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -92,3 +92,4 @@ MM_CMP_OP_DECLS (boolMatrix, boolMatrix, OCTAVE_API) #endif +
--- a/liboctave/array/boolNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -168,3 +168,4 @@ BSXFUN_OP_DEF_MXLOOP (and, boolNDArray, mx_inline_and) BSXFUN_OP_DEF_MXLOOP (or, boolNDArray, mx_inline_or) +
--- a/liboctave/array/boolNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -120,3 +120,4 @@ BSXFUN_OP_DECL (or, boolNDArray, OCTAVE_API); #endif +
--- a/liboctave/array/boolSparse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolSparse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -328,3 +328,4 @@ SPARSE_SMSM_EQNE_OPS (SparseBoolMatrix, false, , SparseBoolMatrix, false, ) SPARSE_SMSM_BOOL_OPS (SparseBoolMatrix, SparseBoolMatrix, false) +
--- a/liboctave/array/boolSparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/boolSparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -148,3 +148,4 @@ SPARSE_SMSM_BOOL_OP_DECLS (SparseBoolMatrix, SparseBoolMatrix, OCTAVE_API) #endif +
--- a/liboctave/array/chMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/chMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -138,3 +138,4 @@ MM_CMP_OPS (charMatrix, charMatrix) MM_BOOL_OPS (charMatrix, charMatrix) +
--- a/liboctave/array/chMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/chMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -110,3 +110,4 @@ MM_BOOL_OP_DECLS (charMatrix, charMatrix, OCTAVE_API) #endif +
--- a/liboctave/array/chNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/chNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -257,3 +257,4 @@ NDND_BOOL_OPS (charNDArray, charNDArray) BSXFUN_STDREL_DEFS_MXLOOP (charNDArray) +
--- a/liboctave/array/chNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/chNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -124,3 +124,4 @@ BSXFUN_STDREL_DECLS (charNDArray, OCTAVE_API) #endif +
--- a/liboctave/array/dColVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dColVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -300,3 +300,4 @@ } return is; } +
--- a/liboctave/array/dColVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dColVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -123,3 +123,4 @@ MARRAY_FORWARD_DEFS (MArray, ColumnVector, double) #endif +
--- a/liboctave/array/dDiagMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dDiagMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -345,3 +345,4 @@ } return os; } +
--- a/liboctave/array/dDiagMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dDiagMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -125,3 +125,4 @@ MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, DiagMatrix, double) #endif +
--- a/liboctave/array/dMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -645,7 +645,8 @@ Matrix Matrix::pseudo_inverse (double tol) const { - octave::math::svd<Matrix> result (*this, octave::math::svd<Matrix>::Type::economy); + octave::math::svd<Matrix> result (*this, + octave::math::svd<Matrix>::Type::economy); DiagMatrix S = result.singular_values (); Matrix U = result.left_singular_matrix (); @@ -804,7 +805,8 @@ { octave_quit (); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } return retval; @@ -845,7 +847,8 @@ { octave_quit (); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -889,7 +892,8 @@ { octave_quit (); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } npts = nc; @@ -911,7 +915,8 @@ for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) tmp_data[i*nr + j] = prow[i]; @@ -955,7 +960,8 @@ { octave_quit (); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (&tmp_data[npts*j]), + F77_DBLE_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -980,7 +986,8 @@ for (octave_idx_type i = 0; i < npts; i++) prow[i] = tmp_data[i*nr + j]; - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) tmp_data[i*nr + j] = prow[i] / static_cast<double> (npts); @@ -3102,3 +3109,4 @@ MM_CMP_OPS (Matrix, Matrix) MM_BOOL_OPS (Matrix, Matrix) +
--- a/liboctave/array/dMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -402,3 +402,4 @@ void read_int (std::istream& is, bool swap_bytes, T& val); #endif +
--- a/liboctave/array/dNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -268,7 +268,8 @@ for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem ((i + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (tmp), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (tmp), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) retval((i + k*npts)*stride + j*dist) = tmp[i]; @@ -315,7 +316,8 @@ for (octave_idx_type i = 0; i < npts; i++) tmp[i] = elem ((i + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (tmp), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (tmp), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type i = 0; i < npts; i++) retval((i + k*npts)*stride + j*dist) = tmp[i] / @@ -361,7 +363,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = prow[l]; @@ -409,7 +412,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = @@ -457,7 +461,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftf, ZFFTF) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = prow[l]; @@ -504,7 +509,8 @@ for (octave_idx_type l = 0; l < npts; l++) prow[l] = retval((l + k*npts)*stride + j*dist); - F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), F77_DBLE_CMPLX_ARG (pwsave)); + F77_FUNC (zfftb, ZFFTB) (npts, F77_DBLE_CMPLX_ARG (prow), + F77_DBLE_CMPLX_ARG (pwsave)); for (octave_idx_type l = 0; l < npts; l++) retval((l + k*npts)*stride + j*dist) = @@ -903,3 +909,4 @@ NDArray, mx_inline_pow) BSXFUN_OP2_DEF_MXLOOP (pow, ComplexNDArray, NDArray, ComplexNDArray, mx_inline_pow) +
--- a/liboctave/array/dNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -194,3 +194,4 @@ ComplexNDArray, OCTAVE_API) #endif +
--- a/liboctave/array/dRowVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dRowVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -311,3 +311,4 @@ ComplexRowVector tmp (v); return tmp * a; } +
--- a/liboctave/array/dRowVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dRowVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -119,3 +119,4 @@ MARRAY_FORWARD_DEFS (MArray, RowVector, double) #endif +
--- a/liboctave/array/dSparse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dSparse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -999,7 +999,7 @@ else pivot = data (cidx (jidx)); if (pivot == 0.) - (*current_liboctave_error_handler) ("division by zero"); + (*current_liboctave_error_handler) ("division by zero"); work[j] = v / pivot; } @@ -1111,7 +1111,9 @@ Qinit(i) = i; MatrixType tmp_typ (MatrixType::Upper); - octave::math::sparse_lu<SparseMatrix> fact (*this, Qinit, Matrix (), false, false); + octave::math::sparse_lu<SparseMatrix> fact (*this, + Qinit, Matrix (), + false, false); rcond = fact.rcond (); double rcond2; SparseMatrix InvL = fact.L ().transpose ().tinverse (tmp_typ, @@ -4063,7 +4065,8 @@ retval = b; Complex *result = retval.fortran_vec (); - F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zptsv, ZPTSV, (nr, b_nc, D, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (result), b_nr, err)); if (err != 0) @@ -4121,7 +4124,8 @@ retval = b; Complex *result = retval.fortran_vec (); - F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), + F77_XFCN (zgtsv, ZGTSV, (nr, b_nc, F77_DBLE_CMPLX_ARG (DL), + F77_DBLE_CMPLX_ARG (D), F77_DBLE_CMPLX_ARG (DU), F77_DBLE_CMPLX_ARG (result), b_nr, err)); if (err != 0) @@ -7885,3 +7889,4 @@ SPARSE_SMSM_CMP_OPS (SparseMatrix, 0.0, , SparseMatrix, 0.0, ) SPARSE_SMSM_BOOL_OPS (SparseMatrix, SparseMatrix, 0.0) +
--- a/liboctave/array/dSparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dSparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -510,3 +510,4 @@ SPARSE_FORWARD_DEFS (MSparse, SparseMatrix, Matrix, double) #endif +
--- a/liboctave/array/dim-vector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dim-vector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -310,3 +310,4 @@ return retval; } } +
--- a/liboctave/array/dim-vector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/dim-vector.h Mon Aug 29 11:09:25 2016 -0700 @@ -570,3 +570,4 @@ } #endif +
--- a/liboctave/array/fCColVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCColVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -490,3 +490,4 @@ } return is; } +
--- a/liboctave/array/fCColVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCColVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -158,3 +158,4 @@ MARRAY_FORWARD_DEFS (MArray, FloatComplexColumnVector, FloatComplex) #endif +
--- a/liboctave/array/fCDiagMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCDiagMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -515,3 +515,4 @@ } return os; } +
--- a/liboctave/array/fCDiagMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCDiagMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -164,3 +164,4 @@ MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, FloatComplexDiagMatrix, FloatComplex) #endif +
--- a/liboctave/array/fCMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -945,7 +945,8 @@ { FloatComplexMatrix retval; - octave::math::svd<FloatComplexMatrix> result (*this, octave::math::svd<FloatComplexMatrix>::Type::economy); + octave::math::svd<FloatComplexMatrix> result + (*this, octave::math::svd<FloatComplexMatrix>::Type::economy); FloatDiagMatrix S = result.singular_values (); FloatComplexMatrix U = result.left_singular_matrix (); @@ -1108,7 +1109,8 @@ { octave_quit (); - F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } return retval; @@ -1149,7 +1151,8 @@ { octave_quit (); - F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -1193,7 +1196,8 @@ { octave_quit (); - F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } npts = nc; @@ -1259,7 +1263,8 @@ { octave_quit (); - F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -2453,7 +2458,8 @@ Array<octave_idx_type> iwork (dim_vector (liwork, 1)); octave_idx_type* piwork = iwork.fortran_vec (); - F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, F77_CMPLX_ARG (pretval), maxmn, + F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, + F77_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2490,7 +2496,8 @@ lwork = static_cast<octave_idx_type> (octave::math::real (work(0))); work.resize (dim_vector (lwork, 1)); - F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, F77_CMPLX_ARG (pretval), + F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, + F77_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2644,7 +2651,8 @@ Array<octave_idx_type> iwork (dim_vector (liwork, 1)); octave_idx_type* piwork = iwork.fortran_vec (); - F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, F77_CMPLX_ARG (pretval), maxmn, + F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, + F77_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -2653,7 +2661,8 @@ rwork.resize (dim_vector (static_cast<octave_idx_type> (rwork(0)), 1)); iwork.resize (dim_vector (iwork(0), 1)); - F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, F77_CMPLX_ARG (pretval), + F77_XFCN (cgelsd, CGELSD, (m, n, nrhs, F77_CMPLX_ARG (tmp_data), m, + F77_CMPLX_ARG (pretval), maxmn, ps, rcon, rank, F77_CMPLX_ARG (work.fortran_vec ()), lwork, prwork, piwork, info)); @@ -3286,7 +3295,8 @@ float cc; FloatComplex cs, temp_r; - F77_FUNC (clartg, CLARTG) (F77_CONST_CMPLX_ARG (&x), F77_CONST_CMPLX_ARG (&y), cc, F77_CMPLX_ARG (&cs), F77_CMPLX_ARG (&temp_r)); + F77_FUNC (clartg, CLARTG) (F77_CONST_CMPLX_ARG (&x), F77_CONST_CMPLX_ARG (&y), + cc, F77_CMPLX_ARG (&cs), F77_CMPLX_ARG (&temp_r)); FloatComplexMatrix g (2, 2); @@ -3474,15 +3484,18 @@ { if (cja == cjb) { - F77_FUNC (xcdotu, XCDOTU) (a_nc, F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CONST_CMPLX_ARG (b.data ()), 1, + F77_FUNC (xcdotu, XCDOTU) (a_nc, F77_CONST_CMPLX_ARG (a.data ()), 1, + F77_CONST_CMPLX_ARG (b.data ()), 1, F77_CMPLX_ARG (c)); if (cja) *c = octave::math::conj (*c); } else if (cja) - F77_FUNC (xcdotc, XCDOTC) (a_nc, F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CONST_CMPLX_ARG (b.data ()), 1, + F77_FUNC (xcdotc, XCDOTC) (a_nc, F77_CONST_CMPLX_ARG (a.data ()), 1, + F77_CONST_CMPLX_ARG (b.data ()), 1, F77_CMPLX_ARG (c)); else - F77_FUNC (xcdotc, XCDOTC) (a_nc, F77_CONST_CMPLX_ARG (b.data ()), 1, F77_CONST_CMPLX_ARG (a.data ()), 1, + F77_FUNC (xcdotc, XCDOTC) (a_nc, F77_CONST_CMPLX_ARG (b.data ()), 1, + F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CMPLX_ARG (c)); } else if (b_nc == 1 && ! cjb) @@ -3586,7 +3599,8 @@ if (columns_are_real_only) { for (octave_idx_type i = 0; i < nr; i++) - result(i, j) = octave::math::min (octave::math::real (a(i, j)), octave::math::real (b(i, j))); + result(i, j) = octave::math::min (octave::math::real (a(i, j)), + octave::math::real (b(i, j))); } else { @@ -3659,7 +3673,8 @@ for (octave_idx_type i = 0; i < nr; i++) { octave_quit (); - result(i, j) = octave::math::max (octave::math::real (a(i, j)), octave::math::real (b(i, j))); + result(i, j) = octave::math::max (octave::math::real (a(i, j)), + octave::math::real (b(i, j))); } } else @@ -3721,3 +3736,4 @@ MM_CMP_OPS (FloatComplexMatrix, FloatComplexMatrix) MM_BOOL_OPS (FloatComplexMatrix, FloatComplexMatrix) +
--- a/liboctave/array/fCMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -497,3 +497,4 @@ MARRAY_FORWARD_DEFS (MArray, FloatComplexMatrix, FloatComplex) #endif +
--- a/liboctave/array/fCNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -559,7 +559,8 @@ if (i_val < min_val) min_val = i_val; - if (octave::math::x_nint (r_val) != r_val || octave::math::x_nint (i_val) != i_val) + if (octave::math::x_nint (r_val) != r_val + || octave::math::x_nint (i_val) != i_val) return false; } @@ -906,3 +907,4 @@ BSXFUN_STDREL_DEFS_MXLOOP (FloatComplexNDArray) BSXFUN_OP_DEF_MXLOOP (pow, FloatComplexNDArray, mx_inline_pow) +
--- a/liboctave/array/fCNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -183,3 +183,4 @@ BSXFUN_OP_DECL (pow, FloatComplexNDArray, OCTAVE_API) #endif +
--- a/liboctave/array/fCRowVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCRowVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -415,7 +415,8 @@ octave::err_nonconformant ("operator *", len, a_len); if (len != 0) - F77_FUNC (xcdotu, XCDOTU) (len, F77_CONST_CMPLX_ARG (v.data ()), 1, F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CMPLX_ARG (&retval)); + F77_FUNC (xcdotu, XCDOTU) (len, F77_CONST_CMPLX_ARG (v.data ()), 1, + F77_CONST_CMPLX_ARG (a.data ()), 1, F77_CMPLX_ARG (&retval)); return retval; } @@ -442,3 +443,4 @@ return retval; } +
--- a/liboctave/array/fCRowVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fCRowVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -149,3 +149,4 @@ MARRAY_FORWARD_DEFS (MArray, FloatComplexRowVector, FloatComplex) #endif +
--- a/liboctave/array/fColVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fColVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -300,3 +300,4 @@ } return is; } +
--- a/liboctave/array/fColVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fColVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -126,3 +126,4 @@ MARRAY_FORWARD_DEFS (MArray, FloatColumnVector, float) #endif +
--- a/liboctave/array/fDiagMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fDiagMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -345,3 +345,4 @@ } return os; } +
--- a/liboctave/array/fDiagMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fDiagMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -126,3 +126,4 @@ MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, FloatDiagMatrix, float) #endif +
--- a/liboctave/array/fMatrix.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fMatrix.cc Mon Aug 29 11:09:25 2016 -0700 @@ -651,7 +651,8 @@ FloatMatrix FloatMatrix::pseudo_inverse (float tol) const { - octave::math::svd<FloatMatrix> result (*this, octave::math::svd<FloatMatrix>::Type::economy); + octave::math::svd<FloatMatrix> result (*this, + octave::math::svd<FloatMatrix>::Type::economy); FloatDiagMatrix S = result.singular_values (); FloatMatrix U = result.left_singular_matrix (); @@ -810,7 +811,8 @@ { octave_quit (); - F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } return retval; @@ -851,7 +853,8 @@ { octave_quit (); - F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -895,7 +898,8 @@ { octave_quit (); - F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftf, CFFTF) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } npts = nc; @@ -961,7 +965,8 @@ { octave_quit (); - F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), F77_CMPLX_ARG (pwsave)); + F77_FUNC (cfftb, CFFTB) (npts, F77_CMPLX_ARG (&tmp_data[npts*j]), + F77_CMPLX_ARG (pwsave)); } for (octave_idx_type j = 0; j < npts*nsamples; j++) @@ -3112,3 +3117,4 @@ MM_CMP_OPS (FloatMatrix, FloatMatrix) MM_BOOL_OPS (FloatMatrix, FloatMatrix) +
--- a/liboctave/array/fMatrix.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fMatrix.h Mon Aug 29 11:09:25 2016 -0700 @@ -418,3 +418,4 @@ void read_int (std::istream& is, bool swap_bytes, T& val); #endif +
--- a/liboctave/array/fNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -872,3 +872,4 @@ FloatNDArray, mx_inline_pow) BSXFUN_OP2_DEF_MXLOOP (pow, FloatComplexNDArray, FloatNDArray, FloatComplexNDArray, mx_inline_pow) +
--- a/liboctave/array/fNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -190,3 +190,4 @@ FloatComplexNDArray, OCTAVE_API) #endif +
--- a/liboctave/array/fRowVector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fRowVector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -311,3 +311,4 @@ FloatComplexRowVector tmp (v); return tmp * a; } +
--- a/liboctave/array/fRowVector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/fRowVector.h Mon Aug 29 11:09:25 2016 -0700 @@ -123,3 +123,4 @@ MARRAY_FORWARD_DEFS (MArray, FloatRowVector, float) #endif +
--- a/liboctave/array/idx-vector.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/idx-vector.cc Mon Aug 29 11:09:25 2016 -0700 @@ -115,7 +115,11 @@ idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, octave_idx_type _limit, octave_idx_type _step) - : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) + : start(_start), + len (_step ? std::max ((_limit - _start) / _step, + static_cast<octave_idx_type> (0)) + : -1), + step (_step) { if (len < 0) err_invalid_range (); @@ -1325,3 +1329,4 @@ %!assert ((1:3)(find ([1,0,1] != 0)), [1,3]) */ +
--- a/liboctave/array/idx-vector.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/idx-vector.h Mon Aug 29 11:09:25 2016 -0700 @@ -180,8 +180,10 @@ octave_idx_type length (octave_idx_type) const { return len; } octave_idx_type extent (octave_idx_type n) const - { return len ? std::max (n, (start + 1 + (step < 0 ? 0 : step * (len - 1)))) - : n; } + { + return len ? std::max (n, start + 1 + (step < 0 ? 0 : step * (len - 1))) + : n; + } idx_class_type idx_class (void) const { return class_range; } @@ -1037,3 +1039,4 @@ }; #endif +
--- a/liboctave/array/int16NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int16NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -58,3 +58,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, int16NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (int16NDArray) +
--- a/liboctave/array/int16NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int16NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (int16NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/int32NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int32NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -57,3 +57,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, int32NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (int32NDArray) +
--- a/liboctave/array/int32NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int32NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (int32NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/int64NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int64NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -58,3 +58,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, int64NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (int64NDArray) +
--- a/liboctave/array/int64NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int64NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (int64NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/int8NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int8NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -57,3 +57,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, int8NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (int8NDArray) +
--- a/liboctave/array/int8NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/int8NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (int8NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/intNDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/intNDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -299,3 +299,4 @@ { return do_mx_diff_op<T> (*this, dim, order, mx_inline_diff); } +
--- a/liboctave/array/intNDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/intNDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -132,3 +132,4 @@ std::istream& operator >> (std::istream& is, intNDArray<T>& a); #endif +
--- a/liboctave/array/uint16NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint16NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -57,3 +57,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, uint16NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (uint16NDArray) +
--- a/liboctave/array/uint16NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint16NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (uint16NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/uint32NDArray.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint32NDArray.cc Mon Aug 29 11:09:25 2016 -0700 @@ -57,3 +57,4 @@ BSXFUN_OP_DEF_MXLOOP (pow, uint32NDArray, mx_inline_pow) BSXFUN_POW_MIXED_MXLOOP (uint32NDArray) +
--- a/liboctave/array/uint32NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint32NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (uint32NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/uint64NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint64NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (uint64NDArray, OCTAVE_API) #endif +
--- a/liboctave/array/uint8NDArray.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/array/uint8NDArray.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ BSXFUN_STDREL_DECLS (uint8NDArray, OCTAVE_API) #endif +
--- a/liboctave/cruft/misc/blaswrap.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/blaswrap.c Mon Aug 29 11:09:25 2016 -0700 @@ -292,3 +292,4 @@ } #endif /* USE_BLASWRAP */ +
--- a/liboctave/cruft/misc/cquit.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/cquit.c Mon Aug 29 11:09:25 2016 -0700 @@ -64,3 +64,4 @@ sig_atomic_t octave_exit_exception_safe_to_return = 0; volatile sig_atomic_t octave_signal_caught = 0; +
--- a/liboctave/cruft/misc/f77-extern.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/f77-extern.cc Mon Aug 29 11:09:25 2016 -0700 @@ -33,3 +33,4 @@ // So we can check to see if an exception has occurred. int f77_exception_encountered = 0; +
--- a/liboctave/cruft/misc/f77-fcn.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/f77-fcn.c Mon Aug 29 11:09:25 2016 -0700 @@ -68,3 +68,4 @@ F77_NORETURN (0) } +
--- a/liboctave/cruft/misc/f77-fcn.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/f77-fcn.h Mon Aug 29 11:09:25 2016 -0700 @@ -368,3 +368,4 @@ #endif #endif +
--- a/liboctave/cruft/misc/lo-error.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/lo-error.c Mon Aug 29 11:09:25 2016 -0700 @@ -34,20 +34,20 @@ symbol errors when creating shared versions of libcruft. */ /* Pointer to the current error handling function. */ -OCTAVE_NORETURN liboctave_error_handler current_liboctave_error_handler - = liboctave_fatal; +OCTAVE_NORETURN liboctave_error_handler + current_liboctave_error_handler = liboctave_fatal; /* Pointer to the current error_with_id handling function. */ -OCTAVE_NORETURN liboctave_error_with_id_handler current_liboctave_error_with_id_handler - = liboctave_fatal_with_id; +OCTAVE_NORETURN liboctave_error_with_id_handler + current_liboctave_error_with_id_handler = liboctave_fatal_with_id; /* Pointer to the current warning handler. */ -liboctave_warning_handler current_liboctave_warning_handler - = liboctave_warning; +liboctave_warning_handler + current_liboctave_warning_handler = liboctave_warning; /* Pointer to the current warning_with_id handler. */ -liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler - = liboctave_warning_with_id; +liboctave_warning_with_id_handler + current_liboctave_warning_with_id_handler = liboctave_warning_with_id; static void verror (const char *name, const char *fmt, va_list args) @@ -70,7 +70,8 @@ } void -set_liboctave_error_with_id_handler (OCTAVE_NORETURN liboctave_error_with_id_handler f) +set_liboctave_error_with_id_handler (OCTAVE_NORETURN + liboctave_error_with_id_handler f) { if (f) current_liboctave_error_with_id_handler = f; @@ -139,3 +140,4 @@ verror ("warning", fmt, args); va_end (args); } +
--- a/liboctave/cruft/misc/lo-error.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/lo-error.h Mon Aug 29 11:09:25 2016 -0700 @@ -43,21 +43,26 @@ typedef void (*liboctave_error_handler) (const char *, ...); -typedef void (*liboctave_error_with_id_handler) (const char *, const char *, ...); +typedef void (*liboctave_error_with_id_handler) (const char *, const char *, + ...); typedef void (*liboctave_warning_handler) (const char *, ...); -typedef void (*liboctave_warning_with_id_handler) (const char *, const char *, ...); +typedef void (*liboctave_warning_with_id_handler) (const char *, const char *, + ...); /* Would be nice to make these pointers private, but we want to share them among all the liboctave classes. */ -OCTAVE_NORETURN OCTAVE_API extern liboctave_error_handler current_liboctave_error_handler; +OCTAVE_NORETURN OCTAVE_API extern liboctave_error_handler + current_liboctave_error_handler; -OCTAVE_NORETURN OCTAVE_API extern liboctave_error_with_id_handler current_liboctave_error_with_id_handler; +OCTAVE_NORETURN OCTAVE_API extern liboctave_error_with_id_handler + current_liboctave_error_with_id_handler; OCTAVE_API extern liboctave_warning_handler current_liboctave_warning_handler; -OCTAVE_API extern liboctave_warning_with_id_handler current_liboctave_warning_with_id_handler; +OCTAVE_API extern liboctave_warning_with_id_handler + current_liboctave_warning_with_id_handler; OCTAVE_API extern void set_liboctave_error_handler (OCTAVE_NORETURN liboctave_error_handler f); @@ -76,3 +81,4 @@ #endif #endif +
--- a/liboctave/cruft/misc/quit.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/quit.cc Mon Aug 29 11:09:25 2016 -0700 @@ -116,3 +116,4 @@ } } } +
--- a/liboctave/cruft/misc/quit.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/cruft/misc/quit.h Mon Aug 29 11:09:25 2016 -0700 @@ -319,3 +319,4 @@ #endif #endif +
--- a/liboctave/liboctave-build-info.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/liboctave-build-info.h Mon Aug 29 11:09:25 2016 -0700 @@ -32,3 +32,4 @@ extern OCTAVE_API std::string liboctave_hg_id (void); #endif +
--- a/liboctave/liboctave-build-info.in.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/liboctave-build-info.in.cc Mon Aug 29 11:09:25 2016 -0700 @@ -32,3 +32,4 @@ { return "%OCTAVE_HG_ID%"; } +
--- a/liboctave/numeric/CollocWt.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/CollocWt.cc Mon Aug 29 11:09:25 2016 -0700 @@ -499,3 +499,4 @@ return os; } +
--- a/liboctave/numeric/CollocWt.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/CollocWt.h Mon Aug 29 11:09:25 2016 -0700 @@ -190,3 +190,4 @@ }; #endif +
--- a/liboctave/numeric/DAE.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DAE.h Mon Aug 29 11:09:25 2016 -0700 @@ -61,3 +61,4 @@ }; #endif +
--- a/liboctave/numeric/DAEFunc.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DAEFunc.h Mon Aug 29 11:09:25 2016 -0700 @@ -102,3 +102,4 @@ }; #endif +
--- a/liboctave/numeric/DAERT.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DAERT.h Mon Aug 29 11:09:25 2016 -0700 @@ -68,3 +68,4 @@ }; #endif +
--- a/liboctave/numeric/DAERTFunc.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DAERTFunc.h Mon Aug 29 11:09:25 2016 -0700 @@ -87,3 +87,4 @@ }; #endif +
--- a/liboctave/numeric/DASPK.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASPK.cc Mon Aug 29 11:09:25 2016 -0700 @@ -331,7 +331,7 @@ return retval; } } - // Fall through... + // Fall through... case 0: case 2: @@ -788,3 +788,4 @@ return retval; } +
--- a/liboctave/numeric/DASPK.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASPK.h Mon Aug 29 11:09:25 2016 -0700 @@ -81,3 +81,4 @@ }; #endif +
--- a/liboctave/numeric/DASRT.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASRT.cc Mon Aug 29 11:09:25 2016 -0700 @@ -647,3 +647,4 @@ return retval; } +
--- a/liboctave/numeric/DASRT.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASRT.h Mon Aug 29 11:09:25 2016 -0700 @@ -123,3 +123,4 @@ }; #endif +
--- a/liboctave/numeric/DASSL.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASSL.cc Mon Aug 29 11:09:25 2016 -0700 @@ -579,3 +579,4 @@ return retval; } +
--- a/liboctave/numeric/DASSL.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DASSL.h Mon Aug 29 11:09:25 2016 -0700 @@ -81,3 +81,4 @@ }; #endif +
--- a/liboctave/numeric/DET.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/DET.h Mon Aug 29 11:09:25 2016 -0700 @@ -90,3 +90,4 @@ typedef base_det<FloatComplex> FloatComplexDET; #endif +
--- a/liboctave/numeric/EIG.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/EIG.cc Mon Aug 29 11:09:25 2016 -0700 @@ -754,3 +754,4 @@ return info; } +
--- a/liboctave/numeric/EIG.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/EIG.h Mon Aug 29 11:09:25 2016 -0700 @@ -154,3 +154,4 @@ }; #endif +
--- a/liboctave/numeric/LSODE.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/LSODE.cc Mon Aug 29 11:09:25 2016 -0700 @@ -505,3 +505,4 @@ return retval; } +
--- a/liboctave/numeric/LSODE.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/LSODE.h Mon Aug 29 11:09:25 2016 -0700 @@ -77,3 +77,4 @@ }; #endif +
--- a/liboctave/numeric/ODE.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/ODE.h Mon Aug 29 11:09:25 2016 -0700 @@ -114,3 +114,4 @@ }; #endif +
--- a/liboctave/numeric/ODEFunc.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/ODEFunc.h Mon Aug 29 11:09:25 2016 -0700 @@ -93,3 +93,4 @@ }; #endif +
--- a/liboctave/numeric/ODES.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/ODES.cc Mon Aug 29 11:09:25 2016 -0700 @@ -42,3 +42,4 @@ xdot = ColumnVector (xx.numel (), 0.0); theta = xtheta; } +
--- a/liboctave/numeric/ODES.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/ODES.h Mon Aug 29 11:09:25 2016 -0700 @@ -79,3 +79,4 @@ }; #endif +
--- a/liboctave/numeric/ODESFunc.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/ODESFunc.h Mon Aug 29 11:09:25 2016 -0700 @@ -107,3 +107,4 @@ }; #endif +
--- a/liboctave/numeric/Quad.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/Quad.cc Mon Aug 29 11:09:25 2016 -0700 @@ -299,3 +299,4 @@ return result; } +
--- a/liboctave/numeric/Quad.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/Quad.h Mon Aug 29 11:09:25 2016 -0700 @@ -174,8 +174,8 @@ double do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr); -OCTAVE_NORETURN float do_integrate (octave_idx_type& ier, - octave_idx_type& neval, float& abserr); + OCTAVE_NORETURN float do_integrate (octave_idx_type& ier, + octave_idx_type& neval, float& abserr); private: @@ -249,3 +249,4 @@ }; #endif +
--- a/liboctave/numeric/aepbalance.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/aepbalance.cc Mon Aug 29 11:09:25 2016 -0700 @@ -230,3 +230,4 @@ template class aepbalance<FloatComplexMatrix>; } } +
--- a/liboctave/numeric/aepbalance.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/aepbalance.h Mon Aug 29 11:09:25 2016 -0700 @@ -124,3 +124,4 @@ } #endif +
--- a/liboctave/numeric/base-dae.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/base-dae.h Mon Aug 29 11:09:25 2016 -0700 @@ -78,3 +78,4 @@ }; #endif +
--- a/liboctave/numeric/base-de.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/base-de.h Mon Aug 29 11:09:25 2016 -0700 @@ -119,3 +119,4 @@ }; #endif +
--- a/liboctave/numeric/base-min.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/base-min.h Mon Aug 29 11:09:25 2016 -0700 @@ -124,3 +124,4 @@ }; #endif +
--- a/liboctave/numeric/bsxfun-decl.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/bsxfun-decl.h Mon Aug 29 11:09:25 2016 -0700 @@ -59,3 +59,4 @@ BSXFUN_REL_DECL (ge, ARRAY, API) #endif +
--- a/liboctave/numeric/bsxfun-defs.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/bsxfun-defs.cc Mon Aug 29 11:09:25 2016 -0700 @@ -258,3 +258,4 @@ BSXFUN_OP2_DEF_MXLOOP (pow, INT_TYPE, FloatNDArray, INT_TYPE, mx_inline_pow) #endif +
--- a/liboctave/numeric/bsxfun.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/bsxfun.h Mon Aug 29 11:09:25 2016 -0700 @@ -87,3 +87,4 @@ #include "bsxfun-defs.cc" #endif +
--- a/liboctave/numeric/chol.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/chol.cc Mon Aug 29 11:09:25 2016 -0700 @@ -796,10 +796,12 @@ anorm = xnorm (a, 1); if (is_upper) - F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 ("U", 1), n, F77_DBLE_CMPLX_ARG (h), n, info + F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 ("U", 1), n, + F77_DBLE_CMPLX_ARG (h), n, info F77_CHAR_ARG_LEN (1))); else - F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 ("L", 1), n, F77_DBLE_CMPLX_ARG (h), n, info + F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 ("L", 1), n, + F77_DBLE_CMPLX_ARG (h), n, info F77_CHAR_ARG_LEN (1))); xrcond = 0.0; @@ -814,7 +816,8 @@ Complex *pz = z.fortran_vec (); Array<double> rz (dim_vector (n, 1)); double *prz = rz.fortran_vec (); - F77_XFCN (zpocon, ZPOCON, (F77_CONST_CHAR_ARG2 ("U", 1), n, F77_DBLE_CMPLX_ARG (h), + F77_XFCN (zpocon, ZPOCON, (F77_CONST_CHAR_ARG2 ("U", 1), n, + F77_DBLE_CMPLX_ARG (h), n, anorm, xrcond, F77_DBLE_CMPLX_ARG (pz), prz, zpocon_info F77_CHAR_ARG_LEN (1))); @@ -840,7 +843,8 @@ OCTAVE_LOCAL_BUFFER (double, rw, n); - F77_XFCN (zch1up, ZCH1UP, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (zch1up, ZCH1UP, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), rw)); } @@ -859,7 +863,8 @@ OCTAVE_LOCAL_BUFFER (double, rw, n); - F77_XFCN (zch1dn, ZCH1DN, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (zch1dn, ZCH1DN, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), rw, info)); return info; @@ -885,7 +890,8 @@ chol_mat.resize (n+1, n+1); - F77_XFCN (zchinx, ZCHINX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (zchinx, ZCHINX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), j + 1, F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), rw, info)); return info; @@ -902,7 +908,8 @@ OCTAVE_LOCAL_BUFFER (double, rw, n); - F77_XFCN (zchdex, ZCHDEX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (zchdex, ZCHDEX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), j + 1, rw)); chol_mat.resize (n-1, n-1); @@ -920,7 +927,8 @@ OCTAVE_LOCAL_BUFFER (Complex, w, n); OCTAVE_LOCAL_BUFFER (double, rw, n); - F77_XFCN (zchshx, ZCHSHX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (zchshx, ZCHSHX, (n, F77_DBLE_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), i + 1, j + 1, F77_DBLE_CMPLX_ARG (w), rw)); } @@ -967,10 +975,12 @@ anorm = xnorm (a, 1); if (is_upper) - F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 ("U", 1), n, F77_CMPLX_ARG (h), n, info + F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 ("U", 1), n, F77_CMPLX_ARG (h), + n, info F77_CHAR_ARG_LEN (1))); else - F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 ("L", 1), n, F77_CMPLX_ARG (h), n, info + F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 ("L", 1), n, F77_CMPLX_ARG (h), + n, info F77_CHAR_ARG_LEN (1))); xrcond = 0.0; @@ -1011,7 +1021,8 @@ OCTAVE_LOCAL_BUFFER (float, rw, n); - F77_XFCN (cch1up, CCH1UP, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (cch1up, CCH1UP, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), F77_CMPLX_ARG (utmp.fortran_vec ()), rw)); } @@ -1030,7 +1041,8 @@ OCTAVE_LOCAL_BUFFER (float, rw, n); - F77_XFCN (cch1dn, CCH1DN, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (cch1dn, CCH1DN, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), F77_CMPLX_ARG (utmp.fortran_vec ()), rw, info)); return info; @@ -1056,7 +1068,8 @@ chol_mat.resize (n+1, n+1); - F77_XFCN (cchinx, CCHINX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (cchinx, CCHINX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), j + 1, F77_CMPLX_ARG (utmp.fortran_vec ()), rw, info)); return info; @@ -1073,7 +1086,8 @@ OCTAVE_LOCAL_BUFFER (float, rw, n); - F77_XFCN (cchdex, CCHDEX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (cchdex, CCHDEX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), j + 1, rw)); chol_mat.resize (n-1, n-1); @@ -1091,7 +1105,8 @@ OCTAVE_LOCAL_BUFFER (FloatComplex, w, n); OCTAVE_LOCAL_BUFFER (float, rw, n); - F77_XFCN (cchshx, CCHSHX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), chol_mat.rows (), + F77_XFCN (cchshx, CCHSHX, (n, F77_CMPLX_ARG (chol_mat.fortran_vec ()), + chol_mat.rows (), i + 1, j + 1, F77_CMPLX_ARG (w), rw)); } @@ -1120,3 +1135,4 @@ chol2inv<FloatComplexMatrix> (const FloatComplexMatrix& r); } } +
--- a/liboctave/numeric/chol.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/chol.h Mon Aug 29 11:09:25 2016 -0700 @@ -105,3 +105,4 @@ } #endif +
--- a/liboctave/numeric/eigs-base.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/eigs-base.cc Mon Aug 29 11:09:25 2016 -0700 @@ -176,8 +176,10 @@ octave_idx_type nc = m.cols (); F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0, F77_CONST_DBLE_CMPLX_ARG (m.data ()), nr, - F77_CONST_DBLE_CMPLX_ARG (x), 1, 0.0, F77_DBLE_CMPLX_ARG (y), 1 + nr, nc, 1.0, F77_CONST_DBLE_CMPLX_ARG (m.data ()), + nr, + F77_CONST_DBLE_CMPLX_ARG (x), 1, 0.0, + F77_DBLE_CMPLX_ARG (y), 1 F77_CHAR_ARG_LEN (1))); if (f77_exception_encountered) @@ -638,7 +640,8 @@ if (k < 1 || k > n - 2) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -656,7 +659,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -768,7 +772,7 @@ workd[i+iptr(1)-1] = mtmp(i,0); } else if (! vector_product (m, workd + iptr(0) - 1, - workd + iptr(1) - 1)) + workd + iptr(1) - 1)) break; } else @@ -900,7 +904,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1-1).\n" " Use 'eig (full (A))' instead"); if (p < 0) @@ -929,7 +934,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -1186,7 +1192,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -1432,7 +1439,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -1450,7 +1458,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -1562,7 +1571,7 @@ workd[i+iptr(1)-1] = mtmp(i,0); } else if (! vector_product (m, workd + iptr(0) - 1, - workd + iptr(1) - 1)) + workd + iptr(1) - 1)) break; } else @@ -1754,7 +1763,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -1772,7 +1782,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -2083,7 +2094,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -2380,7 +2392,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -2398,7 +2411,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -2468,9 +2482,11 @@ { F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, - ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info + F77_CONST_CHAR_ARG2 (typ.c_str (), 2), + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) @@ -2510,7 +2526,7 @@ } else if (! vector_product (m, workd + iptr(0) - 1, - workd + iptr(1) - 1)) + workd + iptr(1) - 1)) break; } else @@ -2545,11 +2561,15 @@ OCTAVE_LOCAL_BUFFER (Complex, workev, 2 * p); F77_FUNC (zneupd, ZNEUPD) - (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), F77_DBLE_CMPLX_ARG (z), n, F77_CONST_DBLE_CMPLX_ARG (&sigma), F77_DBLE_CMPLX_ARG (workev), + (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), + F77_DBLE_CMPLX_ARG (z), n, F77_CONST_DBLE_CMPLX_ARG (&sigma), + F77_DBLE_CMPLX_ARG (workev), F77_CONST_CHAR_ARG2 (&bmat, 1), n, F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info2 - F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info2 F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) (*current_liboctave_error_handler) @@ -2656,7 +2676,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -2674,7 +2695,8 @@ { octave_idx_type bidx = static_cast<octave_idx_type> (permB(i)); - if (checked(bidx) || bidx < 0 || bidx >= n || octave::math::x_nint (bidx) != bidx) + if (checked(bidx) || bidx < 0 || bidx >= n + || octave::math::x_nint (bidx) != bidx) (*current_liboctave_error_handler) ("eigs: permB vector invalid"); } } @@ -2725,9 +2747,10 @@ F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, - ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info - F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) (*current_liboctave_error_handler) @@ -2847,11 +2870,15 @@ OCTAVE_LOCAL_BUFFER (Complex, workev, 2 * p); F77_FUNC (zneupd, ZNEUPD) - (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), F77_DBLE_CMPLX_ARG (z), n, F77_CONST_DBLE_CMPLX_ARG (&sigma), F77_DBLE_CMPLX_ARG (workev), + (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), + F77_DBLE_CMPLX_ARG (z), n, F77_CONST_DBLE_CMPLX_ARG (&sigma), + F77_DBLE_CMPLX_ARG (workev), F77_CONST_CHAR_ARG2 (&bmat, 1), n, F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info2 - F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info2 F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) (*current_liboctave_error_handler) @@ -2943,7 +2970,8 @@ if (k <= 0 || k >= n - 1) (*current_liboctave_error_handler) - ("eigs: Invalid number of eigenvalues to extract (must be 0 < k < n-1).\n" + ("eigs: Invalid number of eigenvalues to extract" + " (must be 0 < k < n-1).\n" " Use 'eig (full (A))' instead"); if (p <= k || p >= n) @@ -3010,9 +3038,10 @@ F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, - ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info - F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) (*current_liboctave_error_handler) @@ -3087,11 +3116,15 @@ OCTAVE_LOCAL_BUFFER (Complex, workev, 2 * p); F77_FUNC (zneupd, ZNEUPD) - (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), F77_DBLE_CMPLX_ARG (z), n, F77_DBLE_CMPLX_ARG (&sigma), F77_DBLE_CMPLX_ARG (workev), + (rvec, F77_CONST_CHAR_ARG2 ("A", 1), sel, F77_DBLE_CMPLX_ARG (d), + F77_DBLE_CMPLX_ARG (z), n, F77_DBLE_CMPLX_ARG (&sigma), + F77_DBLE_CMPLX_ARG (workev), F77_CONST_CHAR_ARG2 (&bmat, 1), n, F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), - k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, iparam, ipntr, F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, info2 - F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); + k, tol, F77_DBLE_CMPLX_ARG (presid), p, F77_DBLE_CMPLX_ARG (v), n, + iparam, ipntr, + F77_DBLE_CMPLX_ARG (workd), F77_DBLE_CMPLX_ARG (workl), lwork, rwork, + info2 F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); if (f77_exception_encountered) (*current_liboctave_error_handler) @@ -3256,3 +3289,4 @@ double tol, bool rvec, bool cholB, int disp, int maxit); #endif +
--- a/liboctave/numeric/eigs-base.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/eigs-base.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,7 +34,8 @@ typedef ColumnVector (*EigsFunc) (const ColumnVector& x, int& eigs_error); -typedef ComplexColumnVector (*EigsComplexFunc) (const ComplexColumnVector& x, int& eigs_error); +typedef ComplexColumnVector (*EigsComplexFunc) (const ComplexColumnVector& x, + int& eigs_error); template <typename M> octave_idx_type @@ -129,3 +130,4 @@ int disp, int maxit); #endif +
--- a/liboctave/numeric/fEIG.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/fEIG.cc Mon Aug 29 11:09:25 2016 -0700 @@ -31,7 +31,8 @@ #include "lo-lapack-proto.h" octave_idx_type -FloatEIG::init (const FloatMatrix& a, bool calc_rev, bool calc_lev, bool balance) +FloatEIG::init (const FloatMatrix& a, bool calc_rev, bool calc_lev, + bool balance) { if (a.any_element_is_inf_or_nan ()) (*current_liboctave_error_handler) @@ -746,3 +747,4 @@ return info; } +
--- a/liboctave/numeric/fEIG.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/fEIG.h Mon Aug 29 11:09:25 2016 -0700 @@ -155,3 +155,4 @@ }; #endif +
--- a/liboctave/numeric/gepbalance.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/gepbalance.cc Mon Aug 29 11:09:25 2016 -0700 @@ -315,3 +315,4 @@ template class gepbalance<FloatComplexMatrix>; } } +
--- a/liboctave/numeric/gepbalance.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/gepbalance.h Mon Aug 29 11:09:25 2016 -0700 @@ -90,3 +90,4 @@ } #endif +
--- a/liboctave/numeric/gsvd.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/gsvd.cc Mon Aug 29 11:09:25 2016 -0700 @@ -31,12 +31,12 @@ template <> void gsvd<Matrix>::ggsvd (char& jobu, char& jobv, char& jobq, octave_idx_type m, - octave_idx_type n, octave_idx_type p, octave_idx_type& k, - octave_idx_type& l, double *tmp_dataA, octave_idx_type m1, - double *tmp_dataB, octave_idx_type p1, Matrix& alpha, - Matrix& beta, double *u, octave_idx_type nrow_u, double *v, - octave_idx_type nrow_v, double *q, octave_idx_type nrow_q, - Matrix& work, octave_idx_type* iwork, octave_idx_type& info) + octave_idx_type n, octave_idx_type p, octave_idx_type& k, + octave_idx_type& l, double *tmp_dataA, octave_idx_type m1, + double *tmp_dataB, octave_idx_type p1, Matrix& alpha, + Matrix& beta, double *u, octave_idx_type nrow_u, double *v, + octave_idx_type nrow_v, double *q, octave_idx_type nrow_q, + Matrix& work, octave_idx_type* iwork, octave_idx_type& info) { F77_XFCN (dggsvd, DGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), F77_CONST_CHAR_ARG2 (&jobv, 1), @@ -165,24 +165,24 @@ switch (gsvd_type) { - case gsvd<T>::Type::sigma_only: + case gsvd<T>::Type::sigma_only: - // Note: for this case, both jobu and jobv should be 'N', but - // there seems to be a bug in dgesvd from Lapack V2.0. To - // demonstrate the bug, set both jobu and jobv to 'N' and find - // the singular values of [eye(3), eye(3)]. The result is - // [-sqrt(2), -sqrt(2), -sqrt(2)]. - // - // For Lapack 3.0, this problem seems to be fixed. + // Note: for this case, both jobu and jobv should be 'N', but + // there seems to be a bug in dgesvd from Lapack V2.0. To + // demonstrate the bug, set both jobu and jobv to 'N' and find + // the singular values of [eye(3), eye(3)]. The result is + // [-sqrt(2), -sqrt(2), -sqrt(2)]. + // + // For Lapack 3.0, this problem seems to be fixed. - jobu = 'N'; - jobv = 'N'; - jobq = 'N'; - nrow_u = nrow_v = nrow_q = 1; - break; + jobu = 'N'; + jobv = 'N'; + jobq = 'N'; + nrow_u = nrow_v = nrow_q = 1; + break; - default: - break; + default: + break; } type = gsvd_type; @@ -247,16 +247,17 @@ // (R11 R12 R13 ) is stored in A(1:M, N-K-L+1:N), // ( 0 R22 R23 ) - for (i = 0; i < m; i++) - for (j = 0; j < k+l; j++) - R.xelem (i, j) = atmp.xelem (i, astart + j); - // and R33 is stored in B(M-K+1:L,N+M-K-L+1:N) - for (i = k+l-1; i >=m; i--) { - for (j = 0; j < m; j++) - R.xelem(i, j) = 0.0; - for (j = m; j < k+l; j++) - R.xelem (i, j) = btmp.xelem (i - k, astart + j); - } + for (i = 0; i < m; i++) + for (j = 0; j < k+l; j++) + R.xelem (i, j) = atmp.xelem (i, astart + j); + // and R33 is stored in B(M-K+1:L,N+M-K-L+1:N) + for (i = k+l-1; i >=m; i--) + { + for (j = 0; j < m; j++) + R.xelem(i, j) = 0.0; + for (j = m; j < k+l; j++) + R.xelem (i, j) = btmp.xelem (i - k, astart + j); + } } } @@ -291,3 +292,4 @@ template class gsvd<Matrix>; template class gsvd<ComplexMatrix>; +
--- a/liboctave/numeric/gsvd.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/gsvd.h Mon Aug 29 11:09:25 2016 -0700 @@ -47,20 +47,20 @@ R(a.R) { } gsvd& operator = (const gsvd& a) - { - if (this != &a) - { - type = a.type; - sigmaA = a.sigmaA; - sigmaB = a.sigmaB; - left_smA = a.left_smA; - left_smB = a.left_smB; - right_sm = a.right_sm; - R = a.R; - } + { + if (this != &a) + { + type = a.type; + sigmaA = a.sigmaA; + sigmaB = a.sigmaB; + left_smA = a.left_smA; + left_smB = a.left_smB; + right_sm = a.right_sm; + R = a.R; + } - return *this; - } + return *this; + } ~gsvd (void) { } @@ -93,3 +93,4 @@ }; #endif +
--- a/liboctave/numeric/hess.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/hess.cc Mon Aug 29 11:09:25 2016 -0700 @@ -197,12 +197,14 @@ Array<Complex> work (dim_vector (lwork, 1)); Complex *pwork = work.fortran_vec (); - F77_XFCN (zgehrd, ZGEHRD, (n, ilo, ihi, F77_DBLE_CMPLX_ARG (h), n, F77_DBLE_CMPLX_ARG (ptau), F77_DBLE_CMPLX_ARG (pwork), lwork, info)); + F77_XFCN (zgehrd, ZGEHRD, (n, ilo, ihi, F77_DBLE_CMPLX_ARG (h), n, + F77_DBLE_CMPLX_ARG (ptau), F77_DBLE_CMPLX_ARG (pwork), lwork, info)); unitary_hess_mat = hess_mat; Complex *z = unitary_hess_mat.fortran_vec (); - F77_XFCN (zunghr, ZUNGHR, (n, ilo, ihi, F77_DBLE_CMPLX_ARG (z), n, F77_DBLE_CMPLX_ARG (ptau), F77_DBLE_CMPLX_ARG (pwork), + F77_XFCN (zunghr, ZUNGHR, (n, ilo, ihi, F77_DBLE_CMPLX_ARG (z), n, + F77_DBLE_CMPLX_ARG (ptau), F77_DBLE_CMPLX_ARG (pwork), lwork, info)); F77_XFCN (zgebak, ZGEBAK, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -261,12 +263,14 @@ Array<FloatComplex> work (dim_vector (lwork, 1)); FloatComplex *pwork = work.fortran_vec (); - F77_XFCN (cgehrd, CGEHRD, (n, ilo, ihi, F77_CMPLX_ARG (h), n, F77_CMPLX_ARG (ptau), F77_CMPLX_ARG (pwork), lwork, info)); + F77_XFCN (cgehrd, CGEHRD, (n, ilo, ihi, F77_CMPLX_ARG (h), n, + F77_CMPLX_ARG (ptau), F77_CMPLX_ARG (pwork), lwork, info)); unitary_hess_mat = hess_mat; FloatComplex *z = unitary_hess_mat.fortran_vec (); - F77_XFCN (cunghr, CUNGHR, (n, ilo, ihi, F77_CMPLX_ARG (z), n, F77_CMPLX_ARG (ptau), F77_CMPLX_ARG (pwork), + F77_XFCN (cunghr, CUNGHR, (n, ilo, ihi, F77_CMPLX_ARG (z), n, + F77_CMPLX_ARG (ptau), F77_CMPLX_ARG (pwork), lwork, info)); F77_XFCN (cgebak, CGEBAK, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -288,3 +292,4 @@ } } } +
--- a/liboctave/numeric/hess.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/hess.h Mon Aug 29 11:09:25 2016 -0700 @@ -89,3 +89,4 @@ } #endif +
--- a/liboctave/numeric/lo-amos-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-amos-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -122,3 +122,4 @@ } #endif +
--- a/liboctave/numeric/lo-arpack-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-arpack-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -137,3 +137,4 @@ } #endif +
--- a/liboctave/numeric/lo-blas-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-blas-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -206,3 +206,4 @@ } #endif +
--- a/liboctave/numeric/lo-fftpack-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-fftpack-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -60,3 +60,4 @@ } #endif +
--- a/liboctave/numeric/lo-lapack-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-lapack-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -1090,7 +1090,8 @@ F77_REAL&, F77_REAL&); F77_RET_T - F77_FUNC (zlartg, ZLARTG) (const F77_DBLE_CMPLX*, const F77_DBLE_CMPLX*, F77_DBLE&, + F77_FUNC (zlartg, ZLARTG) (const F77_DBLE_CMPLX*, const F77_DBLE_CMPLX*, + F77_DBLE&, F77_DBLE_CMPLX*, F77_DBLE_CMPLX*); // ORGHR @@ -1666,3 +1667,4 @@ } #endif +
--- a/liboctave/numeric/lo-mappers.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-mappers.cc Mon Aug 29 11:09:25 2016 -0700 @@ -105,7 +105,7 @@ { // If the imaginary part of X is 0, then avoid generating an // imaginary part of -0 for the expression 1-x*x. - // This effectively chooses the same phase of the branch cut as Matlab. + // This chooses the same phase of the branch cut as Matlab. double xr = std::real (x); tmp = Complex (1.0 - xr*xr); } @@ -135,7 +135,7 @@ { // If the imaginary part of X is 0, then avoid generating an // imaginary part of -0 for the expression 1-x*x. - // This effectively chooses the same phase of the branch cut as Matlab. + // This chooses the same phase of the branch cut as Matlab. float xr = std::real (x); tmp = FloatComplex (1.0f - xr*xr); } @@ -165,7 +165,7 @@ { // If the imaginary part of X is 0, then avoid generating an // imaginary part of -0 for the expression 1-x*x. - // This effectively chooses the same phase of the branch cut as Matlab. + // This chooses the same phase of the branch cut as Matlab. double xr = std::real (x); tmp = Complex (1.0 - xr*xr); } @@ -195,7 +195,7 @@ { // If the imaginary part of X is 0, then avoid generating an // imaginary part of -0 for the expression 1-x*x. - // This effectively chooses the same phase of the branch cut as Matlab. + // This chooses the same phase of the branch cut as Matlab. float xr = std::real (x); tmp = FloatComplex (1.0f - xr*xr); } @@ -413,7 +413,8 @@ else if (x < std::numeric_limits<octave_idx_type>::min ()) return std::numeric_limits<octave_idx_type>::min (); else - return static_cast<octave_idx_type> ((x > 0.0) ? (x + 0.5) : (x - 0.5)); + return static_cast<octave_idx_type> ((x > 0.0) ? (x + 0.5) + : (x - 0.5)); } octave_idx_type @@ -424,7 +425,8 @@ else if (x < std::numeric_limits<octave_idx_type>::min ()) return std::numeric_limits<octave_idx_type>::min (); else - return static_cast<octave_idx_type> ((x > 0.0f) ? (x + 0.5f) : (x - 0.5f)); + return static_cast<octave_idx_type> ((x > 0.0f) ? (x + 0.5f) + : (x - 0.5f)); } int @@ -458,7 +460,8 @@ FloatComplex rc_acos (float x) { - return fabsf (x) > 1.0f ? acos (FloatComplex (x)) : FloatComplex (::acosf (x)); + return fabsf (x) > 1.0f ? acos (FloatComplex (x)) + : FloatComplex (::acosf (x)); } Complex @@ -482,7 +485,8 @@ FloatComplex rc_asin (float x) { - return fabsf (x) > 1.0f ? asin (FloatComplex (x)) : FloatComplex (::asinf (x)); + return fabsf (x) > 1.0f ? asin (FloatComplex (x)) + : FloatComplex (::asinf (x)); } Complex @@ -494,7 +498,8 @@ FloatComplex rc_atanh (float x) { - return fabsf (x) > 1.0f ? atanh (FloatComplex (x)) : FloatComplex (atanh (x)); + return fabsf (x) > 1.0f ? atanh (FloatComplex (x)) + : FloatComplex (atanh (x)); } Complex @@ -508,7 +513,8 @@ rc_log (float x) { const float pi = 3.14159265358979323846f; - return x < 0.0f ? FloatComplex (std::log (-x), pi) : FloatComplex (std::log (x)); + return x < 0.0f ? FloatComplex (std::log (-x), pi) + : FloatComplex (std::log (x)); } Complex @@ -522,7 +528,8 @@ rc_log2 (float x) { const float pil2 = 4.53236014182719380962f; // = pi / log(2) - return x < 0.0f ? FloatComplex (log2 (-x), pil2) : FloatComplex (log2 (x)); + return x < 0.0f ? FloatComplex (log2 (-x), pil2) + : FloatComplex (log2 (x)); } Complex @@ -536,7 +543,8 @@ rc_log10 (float x) { const float pil10 = 1.36437635384184134748f; // = pi / log(10) - return x < 0.0f ? FloatComplex (log10 (-x), pil10) : FloatComplex (log10f (x)); + return x < 0.0f ? FloatComplex (log10 (-x), pil10) + : FloatComplex (log10f (x)); } Complex @@ -548,7 +556,9 @@ FloatComplex rc_sqrt (float x) { - return x < 0.0f ? FloatComplex (0.0f, sqrtf (-x)) : FloatComplex (sqrtf (x)); + return x < 0.0f ? FloatComplex (0.0f, sqrtf (-x)) + : FloatComplex (sqrtf (x)); } } } +
--- a/liboctave/numeric/lo-mappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-mappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -891,3 +891,4 @@ #endif #endif +
--- a/liboctave/numeric/lo-qrupdate-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-qrupdate-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -374,3 +374,4 @@ } #endif +
--- a/liboctave/numeric/lo-ranlib-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-ranlib-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -58,3 +58,4 @@ } #endif +
--- a/liboctave/numeric/lo-slatec-proto.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-slatec-proto.h Mon Aug 29 11:09:25 2016 -0700 @@ -131,3 +131,4 @@ } #endif +
--- a/liboctave/numeric/lo-specfun.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-specfun.cc Mon Aug 29 11:09:25 2016 -0700 @@ -939,7 +939,7 @@ if (ierr == 0 || ierr == 3) { Complex tmp2 = (2.0 / M_PI) * sin (M_PI * alpha) - * zbesk (z, alpha, kode, ierr); + * zbesk (z, alpha, kode, ierr); if (kode == 2) { @@ -1415,7 +1415,8 @@ octave_idx_type nz; - F77_FUNC (cbesj, CBESJ) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, F77_CMPLX_ARG (&y), nz, ierr); + F77_FUNC (cbesj, CBESJ) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, + F77_CMPLX_ARG (&y), nz, ierr); if (kode != 2) { @@ -1442,12 +1443,12 @@ alpha = -alpha; FloatComplex tmp = cosf (static_cast<float> (M_PI) * alpha) - * cbesj (z, alpha, kode, ierr); + * cbesj (z, alpha, kode, ierr); if (ierr == 0 || ierr == 3) { tmp -= sinf (static_cast<float> (M_PI) * alpha) - * cbesy (z, alpha, kode, ierr); + * cbesy (z, alpha, kode, ierr); retval = bessel_return_value (tmp, ierr); } @@ -1480,7 +1481,8 @@ } else { - F77_FUNC (cbesy, CBESY) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, F77_CMPLX_ARG (&y), nz, F77_CMPLX_ARG (&w), ierr); + F77_FUNC (cbesy, CBESY) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, + F77_CMPLX_ARG (&y), nz, F77_CMPLX_ARG (&w), ierr); if (kode != 2) { @@ -1508,12 +1510,12 @@ alpha = -alpha; FloatComplex tmp = cosf (static_cast<float> (M_PI) * alpha) - * cbesy (z, alpha, kode, ierr); + * cbesy (z, alpha, kode, ierr); if (ierr == 0 || ierr == 3) { tmp += sinf (static_cast<float> (M_PI) * alpha) - * cbesj (z, alpha, kode, ierr); + * cbesj (z, alpha, kode, ierr); retval = bessel_return_value (tmp, ierr); } @@ -1536,7 +1538,8 @@ octave_idx_type nz; - F77_FUNC (cbesi, CBESI) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, F77_CMPLX_ARG (&y), nz, ierr); + F77_FUNC (cbesi, CBESI) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, + F77_CMPLX_ARG (&y), nz, ierr); if (kode != 2) { @@ -1558,8 +1561,8 @@ if (ierr == 0 || ierr == 3) { FloatComplex tmp2 = static_cast<float> (2.0 / M_PI) - * sinf (static_cast<float> (M_PI) * alpha) - * cbesk (z, alpha, kode, ierr); + * sinf (static_cast<float> (M_PI) * alpha) + * cbesk (z, alpha, kode, ierr); if (kode == 2) { @@ -1598,7 +1601,8 @@ } else { - F77_FUNC (cbesk, CBESK) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, F77_CMPLX_ARG (&y), nz, ierr); + F77_FUNC (cbesk, CBESK) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, + F77_CMPLX_ARG (&y), nz, ierr); if (kode != 2) { @@ -1640,7 +1644,8 @@ octave_idx_type nz; - F77_FUNC (cbesh, CBESH) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, 1, F77_CMPLX_ARG (&y), nz, ierr); + F77_FUNC (cbesh, CBESH) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 1, 1, + F77_CMPLX_ARG (&y), nz, ierr); if (kode != 2) { @@ -1664,7 +1669,7 @@ static const FloatComplex eye = FloatComplex (0.0, 1.0); FloatComplex tmp = exp (static_cast<float> (M_PI) * alpha * eye) - * cbesh1 (z, alpha, kode, ierr); + * cbesh1 (z, alpha, kode, ierr); retval = bessel_return_value (tmp, ierr); } @@ -1683,7 +1688,8 @@ octave_idx_type nz; - F77_FUNC (cbesh, CBESH) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 2, 1, F77_CMPLX_ARG (&y), nz, ierr); + F77_FUNC (cbesh, CBESH) (F77_CONST_CMPLX_ARG (&z), alpha, 2, 2, 1, + F77_CMPLX_ARG (&y), nz, ierr); if (kode != 2) { @@ -1707,7 +1713,7 @@ static const FloatComplex eye = FloatComplex (0.0, 1.0); FloatComplex tmp = exp (-static_cast<float> (M_PI) * alpha * eye) - * cbesh2 (z, alpha, kode, ierr); + * cbesh2 (z, alpha, kode, ierr); retval = bessel_return_value (tmp, ierr); } @@ -2104,7 +2110,8 @@ octave_idx_type id = deriv ? 1 : 0; - F77_FUNC (cairy, CAIRY) (F77_CONST_CMPLX_ARG (&z), id, 2, F77_CMPLX_ARG (&a), nz, ierr); + F77_FUNC (cairy, CAIRY) (F77_CONST_CMPLX_ARG (&z), id, 2, F77_CMPLX_ARG (&a), + nz, ierr); float ar = a.real (); float ai = a.imag (); @@ -2135,7 +2142,8 @@ octave_idx_type id = deriv ? 1 : 0; - F77_FUNC (cbiry, CBIRY) (F77_CONST_CMPLX_ARG (&z), id, 2, F77_CMPLX_ARG (&a), ierr); + F77_FUNC (cbiry, CBIRY) (F77_CONST_CMPLX_ARG (&z), id, 2, F77_CMPLX_ARG (&a), + ierr); float ar = a.real (); float ai = a.imag (); @@ -2540,7 +2548,7 @@ { if (a < 0.0 || x < 0.0) (*current_liboctave_error_handler) - ("gammainc: A and X must be non-negative"); + ("gammainc: A and X must be non-negative"); err = false; @@ -2703,7 +2711,7 @@ { if (a < 0.0 || x < 0.0) (*current_liboctave_error_handler) - ("gammainc: A and X must be non-negative"); + ("gammainc: A and X must be non-negative"); err = false; @@ -3509,7 +3517,8 @@ if (m < 0 || m > 1) { (*current_liboctave_warning_with_id_handler) - ("Octave:ellipj-invalid-m", "ellipj: invalid M value, required value 0 <= M <= 1"); + ("Octave:ellipj-invalid-m", + "ellipj: invalid M value, required value 0 <= M <= 1"); sn = cn = dn = lo_ieee_nan_value (); @@ -3629,7 +3638,8 @@ // gammaFunctions psi_coef[k] = - (2k+1) * lg_coef[k] (see melina++ // gamma functions -1/12, 3/360,-5/1260, 7/1680,-9/1188, // 11*691/360360,-13/156, 15*3617/122400, ? , ? - static const T dg_coeff[10] = { + static const T dg_coeff[10] = + { -0.83333333333333333e-1, 0.83333333333333333e-2, -0.39682539682539683e-2, 0.41666666666666667e-2, -0.75757575757575758e-2, 0.21092796092796093e-1, @@ -3651,7 +3661,8 @@ T xpsi (T z) { - static const double euler_mascheroni = 0.577215664901532860606512090082402431042; + static const double euler_mascheroni = + 0.577215664901532860606512090082402431042; const bool is_int = (octave::math::floor (z) == z); @@ -3963,3 +3974,4 @@ Array<double> betaincinv (const Array<double>& x, const Array<double>& a, const Array<double>& b) { return octave::math::betaincinv (x, a, b); } #endif +
--- a/liboctave/numeric/lo-specfun.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lo-specfun.h Mon Aug 29 11:09:25 2016 -0700 @@ -95,155 +95,277 @@ extern OCTAVE_API float lgamma (float x); extern OCTAVE_API FloatComplex rc_lgamma (float x); - extern OCTAVE_API Complex besselj (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex bessely (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex besseli (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex besselk (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex besselh1 (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex besselh2 (double alpha, const Complex& x, bool scaled, octave_idx_type& ierr); + extern OCTAVE_API Complex besselj (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex bessely (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex besseli (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex besselk (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex besselh1 (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex besselh2 (double alpha, const Complex& x, bool scaled, + octave_idx_type& ierr); - extern OCTAVE_API ComplexMatrix besselj (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix bessely (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besseli (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselk (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh1 (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh2 (double alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselj (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix bessely (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besseli (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselk (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh1 (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh2 (double alpha, const ComplexMatrix& x, + bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, const Complex& x, + bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselj (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix bessely (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besseli (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselk (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh1 (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh2 (const Matrix& alpha, + const ComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselj (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray bessely (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besseli (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselk (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh1 (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh2 (double alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselj (double alpha, const ComplexNDArray& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray bessely (double alpha, const ComplexNDArray& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besseli (double alpha, const ComplexNDArray& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselk (double alpha, const ComplexNDArray& x, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh1 (double alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh2 (double alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, + const Complex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselj (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray bessely (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besseli (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselk (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh1 (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray besselh2 (const NDArray& alpha, + const ComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselj (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix bessely (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besseli (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselk (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh1 (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix besselh2 (const RowVector& alpha, const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselj (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix bessely (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besseli (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselk (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh1 (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix besselh2 (const RowVector& alpha, + const ComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplex besselj (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex bessely (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex besseli (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex besselk (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex besselh1 (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex besselh2 (float alpha, const FloatComplex& x, bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex besselj (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex bessely (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex besseli (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex besselk (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex besselh1 (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex besselh2 (float alpha, const FloatComplex& x, + bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplexMatrix besselj (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix bessely (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besseli (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselk (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh1 (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh2 (float alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselj (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix bessely (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besseli (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselk (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh1 (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh2 (float alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselj (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix bessely (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besseli (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselk (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatMatrix& alpha, + const FloatComplexMatrix& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselj (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray bessely (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besseli (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselk (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh1 (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh2 (float alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselj (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray bessely (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besseli (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselk (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh1 (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh2 (float alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, + const FloatComplex& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselj (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray bessely (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besseli (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselk (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh1 (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray besselh2 (const FloatNDArray& alpha, + const FloatComplexNDArray& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselj (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix bessely (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besseli (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselk (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatRowVector& alpha, const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselj (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix bessely (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besseli (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselk (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh1 (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix besselh2 (const FloatRowVector& alpha, + const FloatComplexColumnVector& x, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API Complex airy (const Complex& z, bool deriv, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API Complex biry (const Complex& z, bool deriv, bool scaled, octave_idx_type& ierr); + extern OCTAVE_API Complex airy (const Complex& z, bool deriv, bool scaled, + octave_idx_type& ierr); + extern OCTAVE_API Complex biry (const Complex& z, bool deriv, bool scaled, + octave_idx_type& ierr); - extern OCTAVE_API ComplexMatrix airy (const ComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexMatrix biry (const ComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix airy (const ComplexMatrix& z, bool deriv, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexMatrix biry (const ComplexMatrix& z, bool deriv, + bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray airy (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API ComplexNDArray biry (const ComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray airy (const ComplexNDArray& z, bool deriv, + bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API ComplexNDArray biry (const ComplexNDArray& z, bool deriv, + bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplex airy (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplex biry (const FloatComplex& z, bool deriv, bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex airy (const FloatComplex& z, bool deriv, + bool scaled, octave_idx_type& ierr); + extern OCTAVE_API FloatComplex biry (const FloatComplex& z, bool deriv, + bool scaled, octave_idx_type& ierr); - extern OCTAVE_API FloatComplexMatrix airy (const FloatComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexMatrix biry (const FloatComplexMatrix& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix airy (const FloatComplexMatrix& z, + bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexMatrix biry (const FloatComplexMatrix& z, + bool deriv, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray airy (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); - extern OCTAVE_API FloatComplexNDArray biry (const FloatComplexNDArray& z, bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray airy (const FloatComplexNDArray& z, + bool deriv, bool scaled, Array<octave_idx_type>& ierr); + extern OCTAVE_API FloatComplexNDArray biry (const FloatComplexNDArray& z, + bool deriv, bool scaled, Array<octave_idx_type>& ierr); extern OCTAVE_API double betainc (double x, double a, double b); - extern OCTAVE_API Array<double> betainc (double x, double a, const Array<double>& b); - extern OCTAVE_API Array<double> betainc (double x, const Array<double>& a, double b); - extern OCTAVE_API Array<double> betainc (double x, const Array<double>& a, const Array<double>& b); + extern OCTAVE_API Array<double> betainc (double x, double a, + const Array<double>& b); + extern OCTAVE_API Array<double> betainc (double x, const Array<double>& a, + double b); + extern OCTAVE_API Array<double> betainc (double x, const Array<double>& a, + const Array<double>& b); - extern OCTAVE_API Array<double> betainc (const Array<double>& x, double a, double b); - extern OCTAVE_API Array<double> betainc (const Array<double>& x, double a, const Array<double>& b); - extern OCTAVE_API Array<double> betainc (const Array<double>& x, const Array<double>& a, double b); - extern OCTAVE_API Array<double> betainc (const Array<double>& x, const Array<double>& a, const Array<double>& b); + extern OCTAVE_API Array<double> betainc (const Array<double>& x, double a, + double b); + extern OCTAVE_API Array<double> betainc (const Array<double>& x, double a, + const Array<double>& b); + extern OCTAVE_API Array<double> betainc (const Array<double>& x, + const Array<double>& a, double b); + extern OCTAVE_API Array<double> betainc (const Array<double>& x, + const Array<double>& a, const Array<double>& b); extern OCTAVE_API float betainc (float x, float a, float b); - extern OCTAVE_API Array<float> betainc (float x, float a, const Array<float>& b); - extern OCTAVE_API Array<float> betainc (float x, const Array<float>& a, float b); - extern OCTAVE_API Array<float> betainc (float x, const Array<float>& a, const Array<float>& b); + extern OCTAVE_API Array<float> betainc (float x, float a, + const Array<float>& b); + extern OCTAVE_API Array<float> betainc (float x, const Array<float>& a, + float b); + extern OCTAVE_API Array<float> betainc (float x, const Array<float>& a, + const Array<float>& b); - extern OCTAVE_API Array<float> betainc (const Array<float>& x, float a, float b); - extern OCTAVE_API Array<float> betainc (const Array<float>& x, float a, const Array<float>& b); - extern OCTAVE_API Array<float> betainc (const Array<float>& x, const Array<float>& a, float b); - extern OCTAVE_API Array<float> betainc (const Array<float>& x, const Array<float>& a, const Array<float>& b); + extern OCTAVE_API Array<float> betainc (const Array<float>& x, float a, + float b); + extern OCTAVE_API Array<float> betainc (const Array<float>& x, float a, + const Array<float>& b); + extern OCTAVE_API Array<float> betainc (const Array<float>& x, + const Array<float>& a, float b); + extern OCTAVE_API Array<float> betainc (const Array<float>& x, + const Array<float>& a, const Array<float>& b); extern OCTAVE_API double gammainc (double x, double a, bool& err); inline double gammainc (double x, double a) @@ -269,11 +391,13 @@ extern OCTAVE_API FloatMatrix gammainc (float x, const FloatMatrix& a); extern OCTAVE_API FloatMatrix gammainc (const FloatMatrix& x, float a); - extern OCTAVE_API FloatMatrix gammainc (const FloatMatrix& x, const FloatMatrix& a); + extern OCTAVE_API FloatMatrix gammainc (const FloatMatrix& x, + const FloatMatrix& a); extern OCTAVE_API FloatNDArray gammainc (float x, const FloatNDArray& a); extern OCTAVE_API FloatNDArray gammainc (const FloatNDArray& x, float a); - extern OCTAVE_API FloatNDArray gammainc (const FloatNDArray& x, const FloatNDArray& a); + extern OCTAVE_API FloatNDArray gammainc (const FloatNDArray& x, + const FloatNDArray& a); extern OCTAVE_API Complex rc_log1p (double x); extern OCTAVE_API FloatComplex rc_log1p (float x); @@ -300,17 +424,26 @@ extern OCTAVE_API FloatComplex dawson (const FloatComplex& x); extern OCTAVE_API double betaincinv (double x, double a, double b); - extern OCTAVE_API Array<double> betaincinv (double x, double a, const Array<double>& b); - extern OCTAVE_API Array<double> betaincinv (double x, const Array<double>& a, double b); - extern OCTAVE_API Array<double> betaincinv (double x, const Array<double>& a, const Array<double>& b); + extern OCTAVE_API Array<double> betaincinv (double x, double a, + const Array<double>& b); + extern OCTAVE_API Array<double> betaincinv (double x, const Array<double>& a, + double b); + extern OCTAVE_API Array<double> betaincinv (double x, const Array<double>& a, + const Array<double>& b); - extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, double a, double b); - extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, double a, const Array<double>& b); - extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, const Array<double>& a, double b); - extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, const Array<double>& a, const Array<double>& b); + extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, double a, + double b); + extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, double a, + const Array<double>& b); + extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, + const Array<double>& a, double b); + extern OCTAVE_API Array<double> betaincinv (const Array<double>& x, + const Array<double>& a, const Array<double>& b); - extern OCTAVE_API void ellipj (double u, double m, double& sn, double& cn, double& dn, double& err); - extern OCTAVE_API void ellipj (const Complex& u, double m, Complex& sn, Complex& cn, Complex& dn, double& err); + extern OCTAVE_API void ellipj (double u, double m, double& sn, double& cn, + double& dn, double& err); + extern OCTAVE_API void ellipj (const Complex& u, double m, Complex& sn, + Complex& cn, Complex& dn, double& err); extern OCTAVE_API double psi (double x); extern OCTAVE_API float psi (float x); @@ -861,3 +994,4 @@ #endif #endif +
--- a/liboctave/numeric/lu.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lu.cc Mon Aug 29 11:09:25 2016 -0700 @@ -534,7 +534,8 @@ octave_idx_type info = 0; - F77_XFCN (zgetrf, ZGETRF, (a_nr, a_nc, F77_DBLE_CMPLX_ARG (tmp_data), a_nr, pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (a_nr, a_nc, F77_DBLE_CMPLX_ARG (tmp_data), a_nr, + pipvt, info)); for (octave_idx_type i = 0; i < mn; i++) pipvt[i] -= 1; @@ -562,8 +563,10 @@ ComplexColumnVector utmp = u; ComplexColumnVector vtmp = v; - F77_XFCN (zlu1up, ZLU1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, - F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()))); + F77_XFCN (zlu1up, ZLU1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m, + F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, + F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()))); } template <> @@ -589,7 +592,8 @@ ComplexColumnVector vtmp = v.column (i); F77_XFCN (zlu1up, ZLU1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, - F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()))); + F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()))); } } @@ -618,7 +622,8 @@ F77_XFCN (zlup1up, ZLUP1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); + F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), + F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -648,7 +653,8 @@ F77_XFCN (zlup1up, ZLUP1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); + F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), + F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); } for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -670,7 +676,8 @@ octave_idx_type info = 0; - F77_XFCN (cgetrf, CGETRF, (a_nr, a_nc, F77_CMPLX_ARG (tmp_data), a_nr, pipvt, info)); + F77_XFCN (cgetrf, CGETRF, (a_nr, a_nc, F77_CMPLX_ARG (tmp_data), a_nr, pipvt, + info)); for (octave_idx_type i = 0; i < mn; i++) pipvt[i] -= 1; @@ -697,7 +704,8 @@ { FloatComplexColumnVector utmp = u; FloatComplexColumnVector vtmp = v; - F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, + F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, + F77_CMPLX_ARG (r.fortran_vec ()), k, F77_CMPLX_ARG (utmp.fortran_vec ()), F77_CMPLX_ARG (vtmp.fortran_vec ()))); } else @@ -757,7 +765,8 @@ F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), F77_CMPLX_ARG (w))); + F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), + F77_CMPLX_ARG (w))); for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -788,7 +797,8 @@ F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), F77_CMPLX_ARG (w))); + F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), + F77_CMPLX_ARG (w))); } for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -806,3 +816,4 @@ template class lu<FloatComplexMatrix>; } } +
--- a/liboctave/numeric/lu.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/lu.h Mon Aug 29 11:09:25 2016 -0700 @@ -102,3 +102,4 @@ } #endif +
--- a/liboctave/numeric/oct-convn.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-convn.cc Mon Aug 29 11:09:25 2016 -0700 @@ -190,3 +190,4 @@ CONV_DEFS (Float, Float) CONV_DEFS (FloatComplex, Float) CONV_DEFS (FloatComplex, FloatComplex) +
--- a/liboctave/numeric/oct-fftw.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-fftw.cc Mon Aug 29 11:09:25 2016 -0700 @@ -885,8 +885,8 @@ dim_vector dv (npts, 1); void *vplan = octave_fftw_planner::create_plan (FFTW_FORWARD, 1, dv, - nsamples, stride, - dist, in, out); + nsamples, stride, + dist, in, out); fftw_plan plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (plan, @@ -905,8 +905,8 @@ dim_vector dv (npts, 1); void *vplan = octave_fftw_planner::create_plan (FFTW_BACKWARD, 1, dv, - nsamples, stride, - dist, in, out); + nsamples, stride, + dist, in, out); fftw_plan plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (plan, @@ -1116,8 +1116,8 @@ dist *= dv(i); void *vplan = octave_float_fftw_planner::create_plan (FFTW_BACKWARD, - rank, dv, 1, 1, - dist, in, out); + rank, dv, 1, 1, + dist, in, out); fftwf_plan plan = reinterpret_cast<fftwf_plan> (vplan); fftwf_execute_dft (plan, @@ -1153,3 +1153,4 @@ return "none"; #endif } +
--- a/liboctave/numeric/oct-fftw.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-fftw.h Mon Aug 29 11:09:25 2016 -0700 @@ -170,7 +170,7 @@ bool rsimd_align; - // number of threads. Always 1 unless compiled with Multi-threading + // number of threads. Always 1 unless compiled with multi-threading // support. int nthreads; }; @@ -315,7 +315,7 @@ bool rsimd_align; - // number of threads. Always 1 unless compiled with Multi-threading + // number of threads. Always 1 unless compiled with multi-threading // support. int nthreads; }; @@ -368,3 +368,4 @@ extern OCTAVE_API std::string octave_fftwf_version (void); #endif +
--- a/liboctave/numeric/oct-norm.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-norm.h Mon Aug 29 11:09:25 2016 -0700 @@ -66,3 +66,4 @@ DECLARE_COLROW_NORM_FUNCS(SparseComplex, , double) #endif +
--- a/liboctave/numeric/oct-rand.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-rand.cc Mon Aug 29 11:09:25 2016 -0700 @@ -873,3 +873,4 @@ return; } +
--- a/liboctave/numeric/oct-rand.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-rand.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,7 +50,8 @@ // Return the current seed. static double seed (void) { - return instance_ok () ? instance->do_seed () : octave::numeric_limits<double>::NaN (); + return instance_ok () ? instance->do_seed () + : octave::numeric_limits<double>::NaN (); } // Set the seed. @@ -135,13 +136,15 @@ // Return the next number from the sequence. static double scalar (double a = 1.0) { - return instance_ok () ? instance->do_scalar (a) : octave::numeric_limits<double>::NaN (); + return instance_ok () ? instance->do_scalar (a) + : octave::numeric_limits<double>::NaN (); } // Return the next number from the sequence. static float float_scalar (float a = 1.0) { - return instance_ok () ? instance->do_float_scalar (a) : octave::numeric_limits<float>::NaN (); + return instance_ok () ? instance->do_float_scalar (a) + : octave::numeric_limits<float>::NaN (); } // Return an array of numbers from the sequence. @@ -274,3 +277,4 @@ }; #endif +
--- a/liboctave/numeric/oct-spparms.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-spparms.cc Mon Aug 29 11:09:25 2016 -0700 @@ -94,7 +94,8 @@ double octave_sparse_params::get_key (const std::string& key) { - return instance_ok () ? instance->do_get_key (key) : octave::numeric_limits<double>::NaN (); + return instance_ok () ? instance->do_get_key (key) + : octave::numeric_limits<double>::NaN (); } double @@ -219,3 +220,4 @@ for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++) os << prefix << keys(i) << ": " << params(i) << "\n"; } +
--- a/liboctave/numeric/oct-spparms.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/oct-spparms.h Mon Aug 29 11:09:25 2016 -0700 @@ -121,3 +121,4 @@ }; #endif +
--- a/liboctave/numeric/qr.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/qr.cc Mon Aug 29 11:09:25 2016 -0700 @@ -726,7 +726,8 @@ template <> void - qr<FloatMatrix>::form (octave_idx_type n, FloatMatrix& afact, float *tau, type qr_type) + qr<FloatMatrix>::form (octave_idx_type n, FloatMatrix& afact, float *tau, + type qr_type) { octave_idx_type m = afact.rows (); octave_idx_type min_mn = std::min (m, n); @@ -903,7 +904,8 @@ template <> void - qr<FloatMatrix>::insert_col (const FloatMatrix& u, const Array<octave_idx_type>& j) + qr<FloatMatrix>::insert_col (const FloatMatrix& u, + const Array<octave_idx_type>& j) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1140,14 +1142,16 @@ octave_idx_type k = q.columns (); // workspace query. Complex clwork; - F77_XFCN (zungqr, ZUNGQR, (m, k, min_mn, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (tau), + F77_XFCN (zungqr, ZUNGQR, (m, k, min_mn, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + m, F77_DBLE_CMPLX_ARG (tau), F77_DBLE_CMPLX_ARG (&clwork), -1, info)); // allocate buffer and do the job. octave_idx_type lwork = clwork.real (); lwork = std::max (lwork, static_cast<octave_idx_type> (1)); OCTAVE_LOCAL_BUFFER (Complex, work, lwork); - F77_XFCN (zungqr, ZUNGQR, (m, k, min_mn, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (tau), + F77_XFCN (zungqr, ZUNGQR, (m, k, min_mn, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + m, F77_DBLE_CMPLX_ARG (tau), F77_DBLE_CMPLX_ARG (work), lwork, info)); } } @@ -1173,14 +1177,16 @@ { // workspace query. Complex clwork; - F77_XFCN (zgeqrf, ZGEQRF, (m, n, F77_DBLE_CMPLX_ARG (afact.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (tau), + F77_XFCN (zgeqrf, ZGEQRF, (m, n, F77_DBLE_CMPLX_ARG (afact.fortran_vec ()), m, + F77_DBLE_CMPLX_ARG (tau), F77_DBLE_CMPLX_ARG (&clwork), -1, info)); // allocate buffer and do the job. octave_idx_type lwork = clwork.real (); lwork = std::max (lwork, static_cast<octave_idx_type> (1)); OCTAVE_LOCAL_BUFFER (Complex, work, lwork); - F77_XFCN (zgeqrf, ZGEQRF, (m, n, F77_DBLE_CMPLX_ARG (afact.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (tau), + F77_XFCN (zgeqrf, ZGEQRF, (m, n, F77_DBLE_CMPLX_ARG (afact.fortran_vec ()), m, + F77_DBLE_CMPLX_ARG (tau), F77_DBLE_CMPLX_ARG (work), lwork, info)); } @@ -1191,7 +1197,8 @@ template <> void - qr<ComplexMatrix>::update (const ComplexColumnVector& u, const ComplexColumnVector& v) + qr<ComplexMatrix>::update (const ComplexColumnVector& u, + const ComplexColumnVector& v) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1206,7 +1213,8 @@ OCTAVE_LOCAL_BUFFER (double, rw, k); F77_XFCN (zqr1up, ZQR1UP, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, - F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (w), rw)); } @@ -1229,7 +1237,8 @@ ComplexColumnVector vtmp = v.column (i); F77_XFCN (zqr1up, ZQR1UP, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, - F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), + F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (w), rw)); } } @@ -1259,14 +1268,16 @@ ComplexColumnVector utmp = u; OCTAVE_LOCAL_BUFFER (double, rw, k); - F77_XFCN (zqrinc, ZQRINC, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), q.rows (), + F77_XFCN (zqrinc, ZQRINC, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + q.rows (), F77_DBLE_CMPLX_ARG (r.fortran_vec ()), r.rows (), j + 1, F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), rw)); } template <> void - qr<ComplexMatrix>::insert_col (const ComplexMatrix& u, const Array<octave_idx_type>& j) + qr<ComplexMatrix>::insert_col (const ComplexMatrix& u, + const Array<octave_idx_type>& j) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1324,7 +1335,8 @@ (*current_liboctave_error_handler) ("qrdelete: index out of range"); OCTAVE_LOCAL_BUFFER (double, rw, k); - F77_XFCN (zqrdec, ZQRDEC, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), q.rows (), + F77_XFCN (zqrdec, ZQRDEC, (m, n, k, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + q.rows (), F77_DBLE_CMPLX_ARG (r.fortran_vec ()), r.rows (), j + 1, rw)); if (k < m) @@ -1399,7 +1411,8 @@ r.resize (m + 1, n); ComplexRowVector utmp = u; OCTAVE_LOCAL_BUFFER (double, rw, k); - F77_XFCN (zqrinr, ZQRINR, (m, n, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), q.rows (), + F77_XFCN (zqrinr, ZQRINR, (m, n, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + q.rows (), F77_DBLE_CMPLX_ARG (r.fortran_vec ()), r.rows (), j + 1, F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), rw)); @@ -1419,7 +1432,8 @@ OCTAVE_LOCAL_BUFFER (Complex, w, m); OCTAVE_LOCAL_BUFFER (double, rw, m); - F77_XFCN (zqrder, ZQRDER, (m, n, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), q.rows (), + F77_XFCN (zqrder, ZQRDER, (m, n, F77_DBLE_CMPLX_ARG (q.fortran_vec ()), + q.rows (), F77_DBLE_CMPLX_ARG (r.fortran_vec ()), r.rows (), j + 1, F77_DBLE_CMPLX_ARG (w), rw)); @@ -1450,7 +1464,8 @@ template <> void - qr<FloatComplexMatrix>::form (octave_idx_type n, FloatComplexMatrix& afact, FloatComplex *tau, type qr_type) + qr<FloatComplexMatrix>::form (octave_idx_type n, FloatComplexMatrix& afact, + FloatComplex *tau, type qr_type) { octave_idx_type m = afact.rows (); octave_idx_type min_mn = std::min (m, n); @@ -1504,14 +1519,16 @@ octave_idx_type k = q.columns (); // workspace query. FloatComplex clwork; - F77_XFCN (cungqr, CUNGQR, (m, k, min_mn, F77_CMPLX_ARG (q.fortran_vec ()), m, F77_CMPLX_ARG (tau), + F77_XFCN (cungqr, CUNGQR, (m, k, min_mn, F77_CMPLX_ARG (q.fortran_vec ()), m, + F77_CMPLX_ARG (tau), F77_CMPLX_ARG (&clwork), -1, info)); // allocate buffer and do the job. octave_idx_type lwork = clwork.real (); lwork = std::max (lwork, static_cast<octave_idx_type> (1)); OCTAVE_LOCAL_BUFFER (FloatComplex, work, lwork); - F77_XFCN (cungqr, CUNGQR, (m, k, min_mn, F77_CMPLX_ARG (q.fortran_vec ()), m, F77_CMPLX_ARG (tau), + F77_XFCN (cungqr, CUNGQR, (m, k, min_mn, F77_CMPLX_ARG (q.fortran_vec ()), m, + F77_CMPLX_ARG (tau), F77_CMPLX_ARG (work), lwork, info)); } } @@ -1537,14 +1554,16 @@ { // workspace query. FloatComplex clwork; - F77_XFCN (cgeqrf, CGEQRF, (m, n, F77_CMPLX_ARG (afact.fortran_vec ()), m, F77_CMPLX_ARG (tau), + F77_XFCN (cgeqrf, CGEQRF, (m, n, F77_CMPLX_ARG (afact.fortran_vec ()), m, + F77_CMPLX_ARG (tau), F77_CMPLX_ARG (&clwork), -1, info)); // allocate buffer and do the job. octave_idx_type lwork = clwork.real (); lwork = std::max (lwork, static_cast<octave_idx_type> (1)); OCTAVE_LOCAL_BUFFER (FloatComplex, work, lwork); - F77_XFCN (cgeqrf, CGEQRF, (m, n, F77_CMPLX_ARG (afact.fortran_vec ()), m, F77_CMPLX_ARG (tau), + F77_XFCN (cgeqrf, CGEQRF, (m, n, F77_CMPLX_ARG (afact.fortran_vec ()), m, + F77_CMPLX_ARG (tau), F77_CMPLX_ARG (work), lwork, info)); } @@ -1555,7 +1574,8 @@ template <> void - qr<FloatComplexMatrix>::update (const FloatComplexColumnVector& u, const FloatComplexColumnVector& v) + qr<FloatComplexMatrix>::update (const FloatComplexColumnVector& u, + const FloatComplexColumnVector& v) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1576,7 +1596,8 @@ template <> void - qr<FloatComplexMatrix>::update (const FloatComplexMatrix& u, const FloatComplexMatrix& v) + qr<FloatComplexMatrix>::update (const FloatComplexMatrix& u, + const FloatComplexMatrix& v) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1600,7 +1621,8 @@ template <> void - qr<FloatComplexMatrix>::insert_col (const FloatComplexColumnVector& u, octave_idx_type j) + qr<FloatComplexMatrix>::insert_col (const FloatComplexColumnVector& u, + octave_idx_type j) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1630,7 +1652,8 @@ template <> void - qr<FloatComplexMatrix>::insert_col (const FloatComplexMatrix& u, const Array<octave_idx_type>& j) + qr<FloatComplexMatrix>::insert_col (const FloatComplexMatrix& u, + const Array<octave_idx_type>& j) { octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); @@ -1747,7 +1770,8 @@ template <> void - qr<FloatComplexMatrix>::insert_row (const FloatComplexRowVector& u, octave_idx_type j) + qr<FloatComplexMatrix>::insert_row (const FloatComplexRowVector& u, + octave_idx_type j) { octave_idx_type m = r.rows (); octave_idx_type n = r.columns (); @@ -1822,3 +1846,4 @@ template class qr<FloatComplexMatrix>; } } +
--- a/liboctave/numeric/qr.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/qr.h Mon Aug 29 11:09:25 2016 -0700 @@ -44,11 +44,11 @@ typedef typename T::column_vector_type CV_T; enum type - { - std, - raw, - economy - }; + { + std, + raw, + economy + }; qr (void) : q (), r () { } @@ -116,3 +116,4 @@ } #endif +
--- a/liboctave/numeric/qrp.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/qrp.cc Mon Aug 29 11:09:25 2016 -0700 @@ -305,3 +305,4 @@ } } } +
--- a/liboctave/numeric/qrp.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/qrp.h Mon Aug 29 11:09:25 2016 -0700 @@ -76,3 +76,4 @@ } #endif +
--- a/liboctave/numeric/randgamma.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randgamma.cc Mon Aug 29 11:09:25 2016 -0700 @@ -193,3 +193,4 @@ oct_fill_float_randg (a,1,&ret); return ret; } +
--- a/liboctave/numeric/randgamma.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randgamma.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ float *p); #endif +
--- a/liboctave/numeric/randmtzig.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randmtzig.cc Mon Aug 29 11:09:25 2016 -0700 @@ -265,7 +265,8 @@ unsigned char word[4]; if (std::fread (word, 4, 1, urandom) != 1) break; - entropy[n++] = word[0]+(word[1]<<8)+(word[2]<<16)+(static_cast<uint32_t>(word[3])<<24); + entropy[n++] = word[0] + (word[1]<<8) + (word[2]<<16) + + (static_cast<uint32_t> (word[3])<<24); } std::fclose (urandom); } @@ -863,3 +864,4 @@ for (i = 0; i < n; i++) p[i] = oct_float_rande (); } +
--- a/liboctave/numeric/randmtzig.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randmtzig.h Mon Aug 29 11:09:25 2016 -0700 @@ -94,3 +94,4 @@ extern OCTAVE_API void oct_fill_float_rande (octave_idx_type n, float *p); #endif +
--- a/liboctave/numeric/randpoisson.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randpoisson.cc Mon Aug 29 11:09:25 2016 -0700 @@ -614,3 +614,4 @@ } return ret; } +
--- a/liboctave/numeric/randpoisson.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/randpoisson.h Mon Aug 29 11:09:25 2016 -0700 @@ -41,3 +41,4 @@ oct_fill_float_randp (float L, octave_idx_type n, float *p); #endif +
--- a/liboctave/numeric/schur.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/schur.cc Mon Aug 29 11:09:25 2016 -0700 @@ -314,7 +314,8 @@ F77_CONST_CHAR_ARG2 (&sort, 1), selector, F77_CONST_CHAR_ARG2 (&sense, 1), - n, F77_DBLE_CMPLX_ARG (s), n, sdim, F77_DBLE_CMPLX_ARG (pw), F77_DBLE_CMPLX_ARG (q), n, rconde, rcondv, + n, F77_DBLE_CMPLX_ARG (s), n, sdim, F77_DBLE_CMPLX_ARG (pw), + F77_DBLE_CMPLX_ARG (q), n, rconde, rcondv, F77_DBLE_CMPLX_ARG (pwork), lwork, prwork, pbwork, info F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1) @@ -421,7 +422,8 @@ F77_CONST_CHAR_ARG2 (&sort, 1), selector, F77_CONST_CHAR_ARG2 (&sense, 1), - n, F77_CMPLX_ARG (s), n, sdim, F77_CMPLX_ARG (pw), F77_CMPLX_ARG (q), n, rconde, rcondv, + n, F77_CMPLX_ARG (s), n, sdim, F77_CMPLX_ARG (pw), F77_CMPLX_ARG (q), n, rconde, + rcondv, F77_CMPLX_ARG (pwork), lwork, prwork, pbwork, info F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1) @@ -432,7 +434,8 @@ template <> schur<FloatComplexMatrix> - rsf2csf<FloatComplexMatrix, FloatMatrix> (const FloatMatrix& s_arg, const FloatMatrix& u_arg) + rsf2csf<FloatComplexMatrix, FloatMatrix> (const FloatMatrix& s_arg, + const FloatMatrix& u_arg) { FloatComplexMatrix s (s_arg); FloatComplexMatrix u (u_arg); @@ -466,3 +469,4 @@ template class schur<Matrix>; } } +
--- a/liboctave/numeric/schur.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/schur.h Mon Aug 29 11:09:25 2016 -0700 @@ -104,3 +104,4 @@ } #endif +
--- a/liboctave/numeric/sparse-chol.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-chol.cc Mon Aug 29 11:09:25 2016 -0700 @@ -577,8 +577,9 @@ template <> sparse_chol<SparseComplexMatrix>::sparse_chol (const SparseComplexMatrix& a, octave_idx_type& info) - : rep ( - new sparse_chol<SparseComplexMatrix>::sparse_chol_rep (a, info, true, false)) + : rep (new sparse_chol<SparseComplexMatrix>::sparse_chol_rep (a, info, + true, + false)) { } // Instantiations we need. @@ -594,3 +595,4 @@ chol2inv<SparseComplexMatrix> (const SparseComplexMatrix& r); } } +
--- a/liboctave/numeric/sparse-chol.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-chol.h Mon Aug 29 11:09:25 2016 -0700 @@ -97,9 +97,10 @@ // SparseComplexMatrix specialization. template <> - sparse_chol<SparseComplexMatrix>::sparse_chol (const SparseComplexMatrix& a, - octave_idx_type& info); + sparse_chol<SparseComplexMatrix>::sparse_chol + (const SparseComplexMatrix& a, octave_idx_type& info); } } #endif +
--- a/liboctave/numeric/sparse-dmsolve.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-dmsolve.cc Mon Aug 29 11:09:25 2016 -0700 @@ -413,7 +413,8 @@ ST m = dmsolve_extract (a, pinv, q, dm->rr[2], nr, dm->cc[3], nc, nnz_remaining, true); nnz_remaining -= m.nnz (); - RT mtmp = octave::math::qrsolve (m, dmsolve_extract (btmp, 0, 0, dm->rr[2], b_nr, 0, b_nc), info); + RT mtmp = octave::math::qrsolve (m, dmsolve_extract (btmp, 0, 0, dm->rr[2], + b_nr, 0, b_nc), info); dmsolve_insert (retval, mtmp, q, dm->cc[3], 0); if (dm->rr[2] > 0 && ! info) @@ -461,7 +462,8 @@ { ST m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], 0, dm->cc[2], nnz_remaining, true); - RT mtmp = octave::math::qrsolve (m, dmsolve_extract (btmp, 0, 0, 0, dm->rr[1], 0, b_nc), info); + RT mtmp = octave::math::qrsolve (m, dmsolve_extract (btmp, 0, 0, 0, dm->rr[1], + 0, b_nc), info); dmsolve_insert (retval, mtmp, q, 0, 0); }
--- a/liboctave/numeric/sparse-dmsolve.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-dmsolve.h Mon Aug 29 11:09:25 2016 -0700 @@ -31,3 +31,4 @@ dmsolve (const ST& a, const T& b, octave_idx_type& info); #endif +
--- a/liboctave/numeric/sparse-lu.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-lu.cc Mon Aug 29 11:09:25 2016 -0700 @@ -59,7 +59,8 @@ template <typename T> octave_idx_type - umfpack_get_lunz (octave_idx_type *lnz, octave_idx_type *unz, void *Numeric); + umfpack_get_lunz (octave_idx_type *lnz, octave_idx_type *unz, + void *Numeric); template <typename T> octave_idx_type @@ -97,7 +98,8 @@ template <typename T> void umfpack_report_matrix (octave_idx_type n_row, octave_idx_type n_col, - const octave_idx_type *Ap, const octave_idx_type *Ai, + const octave_idx_type *Ap, + const octave_idx_type *Ai, const T *Ax, // Or Az_packed octave_idx_type col_form, const double *Control); @@ -210,7 +212,8 @@ const octave_idx_type *Ai, const double *Ax, octave_idx_type col_form, const double *Control) { - UMFPACK_DNAME (report_matrix) (n_row, n_col, Ap, Ai, Ax, col_form, Control); + UMFPACK_DNAME (report_matrix) (n_row, n_col, Ap, Ai, Ax, + col_form, Control); } template <> @@ -431,12 +434,15 @@ const octave_idx_type *Ai = a.ridx (); const lu_elt_type *Ax = a.data (); - umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, + static_cast<octave_idx_type> (1), + control); void *Symbolic; Matrix Info (1, UMFPACK_INFO); double *info = Info.fortran_vec (); - int status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, 0, &Symbolic, control, info); + int status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, 0, + &Symbolic, control, info); if (status < 0) { @@ -453,7 +459,8 @@ umfpack_report_symbolic<lu_elt_type> (Symbolic, control); void *Numeric; - status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, &Numeric, control, info); + status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, + &Numeric, control, info); umfpack_free_symbolic<lu_elt_type> (&Symbolic); cond = Info (UMFPACK_RCOND); @@ -490,7 +497,8 @@ octave_idx_type n_inner = (nr < nc ? nr : nc); if (lnz < 1) - Lfact = lu_type (n_inner, nr, static_cast<octave_idx_type> (1)); + Lfact = lu_type (n_inner, nr, + static_cast<octave_idx_type> (1)); else Lfact = lu_type (n_inner, nr, lnz); @@ -499,7 +507,8 @@ lu_elt_type *Ltx = Lfact.data (); if (unz < 1) - Ufact = lu_type (n_inner, nc, static_cast<octave_idx_type> (1)); + Ufact = lu_type (n_inner, nc, + static_cast<octave_idx_type> (1)); else Ufact = lu_type (n_inner, nc, unz); @@ -523,7 +532,11 @@ octave_idx_type *q = Q.fortran_vec (); octave_idx_type do_recip; - status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, Up, Uj, Ux, p, q, 0, &do_recip, Rx, Numeric); + status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, + Up, Uj, Ux, + p, q, 0, + &do_recip, Rx, + Numeric); umfpack_free_numeric<lu_elt_type> (&Numeric); @@ -542,8 +555,18 @@ for (octave_idx_type i = 0; i < nr; i++) Rx[i] = 1.0 / Rx[i]; - umfpack_report_matrix<lu_elt_type> (nr, n_inner, Lfact.cidx (), Lfact.ridx (), Lfact.data (), static_cast<octave_idx_type> (1), control); - umfpack_report_matrix<lu_elt_type> (n_inner, nc, Ufact.cidx (), Ufact.ridx (), Ufact.data (), static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, n_inner, + Lfact.cidx (), + Lfact.ridx (), + Lfact.data (), + static_cast<octave_idx_type> (1), + control); + umfpack_report_matrix<lu_elt_type> (n_inner, nc, + Ufact.cidx (), + Ufact.ridx (), + Ufact.data (), + static_cast<octave_idx_type> (1), + control); umfpack_report_perm<lu_elt_type> (nr, p, control); umfpack_report_perm<lu_elt_type> (nc, q, control); } @@ -636,7 +659,9 @@ const octave_idx_type *Ai = a.ridx (); const lu_elt_type *Ax = a.data (); - umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, + static_cast<octave_idx_type> (1), + control); void *Symbolic; Matrix Info (1, UMFPACK_INFO); @@ -651,7 +676,9 @@ for (octave_idx_type i = 0; i < nc; i++) qinit[i] = static_cast<octave_idx_type> (Qinit (i)); - status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, qinit, &Symbolic, control, info); + status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, + qinit, &Symbolic, control, + info); } while (0); @@ -670,7 +697,8 @@ umfpack_report_symbolic<lu_elt_type> (Symbolic, control); void *Numeric; - status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, &Numeric, control, info); + status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, + &Numeric, control, info); umfpack_free_symbolic<lu_elt_type> (&Symbolic); cond = Info (UMFPACK_RCOND); @@ -707,7 +735,8 @@ octave_idx_type n_inner = (nr < nc ? nr : nc); if (lnz < 1) - Lfact = lu_type (n_inner, nr, static_cast<octave_idx_type> (1)); + Lfact = lu_type (n_inner, nr, + static_cast<octave_idx_type> (1)); else Lfact = lu_type (n_inner, nr, lnz); @@ -716,7 +745,8 @@ lu_elt_type *Ltx = Lfact.data (); if (unz < 1) - Ufact = lu_type (n_inner, nc, static_cast<octave_idx_type> (1)); + Ufact = lu_type (n_inner, nc, + static_cast<octave_idx_type> (1)); else Ufact = lu_type (n_inner, nc, unz); @@ -740,7 +770,11 @@ octave_idx_type *q = Q.fortran_vec (); octave_idx_type do_recip; - status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, Up, Uj, Ux, p, q, 0, &do_recip, Rx, Numeric); + status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, + Up, Uj, Ux, + p, q, 0, + &do_recip, + Rx, Numeric); umfpack_free_numeric<lu_elt_type> (&Numeric); @@ -759,8 +793,18 @@ for (octave_idx_type i = 0; i < nr; i++) Rx[i] = 1.0 / Rx[i]; - umfpack_report_matrix<lu_elt_type> (nr, n_inner, Lfact.cidx (), Lfact.ridx (), Lfact.data (), static_cast<octave_idx_type> (1), control); - umfpack_report_matrix<lu_elt_type> (n_inner, nc, Ufact.cidx (), Ufact.ridx (), Ufact.data (), static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, n_inner, + Lfact.cidx (), + Lfact.ridx (), + Lfact.data (), + static_cast<octave_idx_type> (1), + control); + umfpack_report_matrix<lu_elt_type> (n_inner, nc, + Ufact.cidx (), + Ufact.ridx (), + Ufact.data (), + static_cast<octave_idx_type> (1), + control); umfpack_report_perm<lu_elt_type> (nr, p, control); umfpack_report_perm<lu_elt_type> (nc, q, control); } @@ -917,3 +961,4 @@ template class sparse_lu<SparseComplexMatrix>; } } +
--- a/liboctave/numeric/sparse-lu.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-lu.h Mon Aug 29 11:09:25 2016 -0700 @@ -120,3 +120,4 @@ } #endif +
--- a/liboctave/numeric/sparse-qr.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-qr.cc Mon Aug 29 11:09:25 2016 -0700 @@ -954,7 +954,8 @@ // Prevents the methods below making a copy of the data. A.p = const_cast<octave_idx_type *>(a.cidx ()); A.i = const_cast<octave_idx_type *>(a.ridx ()); - A.x = const_cast<cs_complex_t *>(reinterpret_cast<const cs_complex_t *> (a.data ())); + A.x = const_cast<cs_complex_t *> ( + reinterpret_cast<const cs_complex_t *> (a.data ())); A.nz = -1; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -1044,7 +1045,8 @@ octave_idx_type nc = N->U->n; octave_idx_type nz = N->U->nzmax; - SparseComplexMatrix ret ((econ ? (nc > nrows ? nrows : nc) : nrows), nc, nz); + SparseComplexMatrix ret ((econ ? (nc > nrows ? nrows : nc) : nrows), + nc, nz); for (octave_idx_type j = 0; j < nc+1; j++) ret.xcidx (j) = N->U->p[j]; @@ -1075,7 +1077,7 @@ octave_idx_type b_nc = b.cols (); octave_idx_type nc = N->L->n; octave_idx_type nr = nrows; - const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *>(b.fortran_vec ()); + const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *> (b.fortran_vec ()); ComplexMatrix ret (b_nr, b_nc); Complex *vec = ret.fortran_vec (); @@ -1088,14 +1090,18 @@ { OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2); - for (volatile octave_idx_type j = 0, idx = 0; j < b_nc; j++, idx+=b_nr) + for (volatile octave_idx_type j = 0, idx = 0; + j < b_nc; + j++, idx += b_nr) { octave_quit (); volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + idx, reinterpret_cast<cs_complex_t *>(buf), b_nr); + CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + idx, + reinterpret_cast<cs_complex_t *> (buf), + b_nr); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type i = 0; i < nm; i++) @@ -1103,7 +1109,8 @@ octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], reinterpret_cast<cs_complex_t *>(buf)); + CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], + reinterpret_cast<cs_complex_t *> (buf)); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } @@ -1156,7 +1163,9 @@ volatile octave_idx_type nm = (nr < nc ? nr : nc); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec, reinterpret_cast<cs_complex_t *>(buf), nr); + CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec, + reinterpret_cast<cs_complex_t *> (buf), + nr); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type i = 0; i < nm; i++) @@ -1164,7 +1173,8 @@ octave_quit (); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], reinterpret_cast<cs_complex_t *>(buf)); + CXSPARSE_ZNAME (_happly) (N->L, i, N->B[i], + reinterpret_cast<cs_complex_t *> (buf)); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; } @@ -1187,8 +1197,9 @@ template <> template <> SparseComplexMatrix - sparse_qr<SparseMatrix>::sparse_qr_rep::tall_solve<SparseComplexMatrix, SparseComplexMatrix> - (const SparseComplexMatrix& b, octave_idx_type& info) const + sparse_qr<SparseMatrix>::sparse_qr_rep::tall_solve<SparseComplexMatrix, + SparseComplexMatrix> + (const SparseComplexMatrix& b, octave_idx_type& info) const { info = -1; @@ -1302,8 +1313,9 @@ template <> template <> SparseComplexMatrix - sparse_qr<SparseMatrix>::sparse_qr_rep::wide_solve<SparseComplexMatrix, SparseComplexMatrix> - (const SparseComplexMatrix& b, octave_idx_type& info) const + sparse_qr<SparseMatrix>::sparse_qr_rep::wide_solve<SparseComplexMatrix, + SparseComplexMatrix> + (const SparseComplexMatrix& b, octave_idx_type& info) const { info = -1; @@ -1423,8 +1435,9 @@ template <> template <> ComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<MArray<double>, ComplexMatrix> - (const MArray<double>& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<MArray<double>, + ComplexMatrix> + (const MArray<double>& b, octave_idx_type& info) const { info = -1; @@ -1453,7 +1466,9 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_ipvec) (S->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) @@ -1487,8 +1502,9 @@ template <> template <> ComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<MArray<double>, ComplexMatrix> - (const MArray<double>& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<MArray<double>, + ComplexMatrix> + (const MArray<double>& b, octave_idx_type& info) const { info = -1; @@ -1526,7 +1542,8 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); CXSPARSE_ZNAME (_utsolve) (N->U, buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -1560,8 +1577,9 @@ template <> template <> SparseComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<SparseMatrix, SparseComplexMatrix> - (const SparseMatrix& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<SparseMatrix, + SparseComplexMatrix> + (const SparseMatrix& b, octave_idx_type& info) const { info = -1; @@ -1593,7 +1611,9 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_ipvec) (S->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) @@ -1607,7 +1627,9 @@ BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (N->U, buf); - CXSPARSE_ZNAME (_ipvec) (S->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); + CXSPARSE_ZNAME (_ipvec) (S->q, buf, + reinterpret_cast<cs_complex_t *> (Xx), + nc); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (octave_idx_type j = 0; j < nc; j++) @@ -1651,8 +1673,9 @@ template <> template <> SparseComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<SparseMatrix, SparseComplexMatrix> - (const SparseMatrix& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<SparseMatrix, + SparseComplexMatrix> + (const SparseMatrix& b, octave_idx_type& info) const { info = -1; @@ -1692,7 +1715,9 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_pvec) (S->q, + reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); CXSPARSE_ZNAME (_utsolve) (N->U, buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -1706,7 +1731,9 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_pvec) (S->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); + CXSPARSE_ZNAME (_pvec) (S->pinv, buf, + reinterpret_cast<cs_complex_t *> (Xx), + nc); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (octave_idx_type j = 0; j < nc; j++) @@ -1750,8 +1777,9 @@ template <> template <> ComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<MArray<Complex>, ComplexMatrix> - (const MArray<Complex>& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<MArray<Complex>, + ComplexMatrix> + (const MArray<Complex>& b, octave_idx_type& info) const { info = -1; @@ -1763,11 +1791,12 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nr = b.rows (); - const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *>(b.fortran_vec ()); + const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *> + (b.fortran_vec ()); ComplexMatrix x (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> - (x.fortran_vec ()); + (x.fortran_vec ()); OCTAVE_LOCAL_BUFFER (cs_complex_t, buf, S->m2); @@ -1814,8 +1843,9 @@ template <> template <> ComplexMatrix - sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<MArray<Complex>, ComplexMatrix> - (const MArray<Complex>& b, octave_idx_type& info) const + sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<MArray<Complex>, + ComplexMatrix> + (const MArray<Complex>& b, octave_idx_type& info) const { info = -1; @@ -1830,7 +1860,8 @@ octave_idx_type b_nc = b.cols (); octave_idx_type b_nr = b.rows (); - const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *>(b.fortran_vec ()); + const cs_complex_t *bvec = reinterpret_cast<const cs_complex_t *> + (b.fortran_vec ()); ComplexMatrix x (nc, b_nc); cs_complex_t *vec = reinterpret_cast<cs_complex_t *> (x.fortran_vec ()); @@ -1887,7 +1918,7 @@ template <> SparseComplexMatrix sparse_qr<SparseComplexMatrix>::sparse_qr_rep::tall_solve<SparseComplexMatrix, SparseComplexMatrix> - (const SparseComplexMatrix& b, octave_idx_type& info) const + (const SparseComplexMatrix& b, octave_idx_type& info) const { info = -1; @@ -1919,7 +1950,9 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_ipvec) (S->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (volatile octave_idx_type j = 0; j < nc; j++) @@ -1933,7 +1966,9 @@ BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_usolve) (N->U, buf); - CXSPARSE_ZNAME (_ipvec) (S->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); + CXSPARSE_ZNAME (_ipvec) (S->q, buf, + reinterpret_cast<cs_complex_t *> (Xx), + nc); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (octave_idx_type j = 0; j < nc; j++) @@ -1978,7 +2013,7 @@ template <> SparseComplexMatrix sparse_qr<SparseComplexMatrix>::sparse_qr_rep::wide_solve<SparseComplexMatrix, SparseComplexMatrix> - (const SparseComplexMatrix& b, octave_idx_type& info) const + (const SparseComplexMatrix& b, octave_idx_type& info) const { info = -1; @@ -2018,7 +2053,8 @@ buf[j] = cs_complex_t (0.0, 0.0); BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr); + CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), + buf, nr); CXSPARSE_ZNAME (_utsolve) (N->U, buf); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -2032,7 +2068,8 @@ } BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - CXSPARSE_ZNAME (_pvec) (S->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc); + CXSPARSE_ZNAME (_pvec) (S->pinv, buf, + reinterpret_cast<cs_complex_t *>(Xx), nc); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; for (octave_idx_type j = 0; j < nc; j++) @@ -2209,7 +2246,7 @@ if (nr < 0 || nc < 0 || nr != b_nr) (*current_liboctave_error_handler) - ("matrix dimension mismatch in solution of minimum norm problem"); + ("matrix dimension mismatch in solution of minimum norm problem"); if (nr == 0 || nc == 0 || b_nc == 0) { @@ -2251,56 +2288,66 @@ qrsolve (const SparseMatrix& a, const MArray<double>& b, octave_idx_type& info) { - return sparse_qr<SparseMatrix>::solve<MArray<double>, Matrix> (a, b, info); + return sparse_qr<SparseMatrix>::solve<MArray<double>, Matrix> (a, b, + info); } SparseMatrix qrsolve (const SparseMatrix& a, const SparseMatrix& b, octave_idx_type& info) { - return sparse_qr<SparseMatrix>::solve<SparseMatrix, SparseMatrix> (a, b, info); + return sparse_qr<SparseMatrix>::solve<SparseMatrix, SparseMatrix> (a, b, + info); } ComplexMatrix qrsolve (const SparseMatrix& a, const MArray<Complex>& b, octave_idx_type& info) { - return sparse_qr<SparseMatrix>::solve<MArray<Complex>, ComplexMatrix> (a, b, info); + return sparse_qr<SparseMatrix>::solve<MArray<Complex>, + ComplexMatrix> (a, b, info); } SparseComplexMatrix qrsolve (const SparseMatrix& a, const SparseComplexMatrix& b, octave_idx_type& info) { - return sparse_qr<SparseMatrix>::solve<SparseComplexMatrix, SparseComplexMatrix> (a, b, info); + return sparse_qr<SparseMatrix>::solve<SparseComplexMatrix, + SparseComplexMatrix> (a, b, info); } ComplexMatrix qrsolve (const SparseComplexMatrix& a, const MArray<double>& b, octave_idx_type& info) { - return sparse_qr<SparseComplexMatrix>::solve<MArray<double>, ComplexMatrix> (a, b, info); + return sparse_qr<SparseComplexMatrix>::solve<MArray<double>, + ComplexMatrix> (a, b, info); } SparseComplexMatrix qrsolve (const SparseComplexMatrix& a, const SparseMatrix& b, octave_idx_type& info) { - return sparse_qr<SparseComplexMatrix>::solve<SparseMatrix, SparseComplexMatrix> (a, b, info); + return sparse_qr<SparseComplexMatrix>::solve<SparseMatrix, + SparseComplexMatrix> + (a, b, info); } ComplexMatrix qrsolve (const SparseComplexMatrix& a, const MArray<Complex>& b, octave_idx_type& info) { - return sparse_qr<SparseComplexMatrix>::solve<MArray<Complex>, ComplexMatrix> (a, b, info); + return sparse_qr<SparseComplexMatrix>::solve<MArray<Complex>, + ComplexMatrix> (a, b, info); } SparseComplexMatrix qrsolve (const SparseComplexMatrix& a, const SparseComplexMatrix& b, octave_idx_type& info) { - return sparse_qr<SparseComplexMatrix>::solve<SparseComplexMatrix, SparseComplexMatrix> (a, b, info); + return sparse_qr<SparseComplexMatrix>::solve<SparseComplexMatrix, + SparseComplexMatrix> + (a, b, info); } // Instantiations we need. @@ -2310,3 +2357,4 @@ template class sparse_qr<SparseComplexMatrix>; } } +
--- a/liboctave/numeric/sparse-qr.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-qr.h Mon Aug 29 11:09:25 2016 -0700 @@ -132,3 +132,4 @@ } #endif +
--- a/liboctave/numeric/svd.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/svd.cc Mon Aug 29 11:09:25 2016 -0700 @@ -413,3 +413,4 @@ template class svd<FloatComplexMatrix>; } } +
--- a/liboctave/numeric/svd.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/svd.h Mon Aug 29 11:09:25 2016 -0700 @@ -43,15 +43,15 @@ enum class Type { std, - economy, - sigma_only - }; + economy, + sigma_only + }; enum class Driver { GESVD, - GESDD - }; + GESDD + }; svd (void) : m_type (), m_driver (), left_sm (), sigma (), right_sm () @@ -114,3 +114,4 @@ } #endif +
--- a/liboctave/operators/Sparse-diag-op-defs.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/Sparse-diag-op-defs.h Mon Aug 29 11:09:25 2016 -0700 @@ -177,7 +177,8 @@ RT do_add_dm_sm (const DM& d, const SM& a) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - octave::err_nonconformant ("operator +", d.rows (), d.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator +", + d.rows (), d.cols (), a.rows (), a.cols ()); else return do_commutative_add_dm_sm<RT> (d, a); } @@ -186,9 +187,11 @@ RT do_sub_dm_sm (const DM& d, const SM& a) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - octave::err_nonconformant ("operator -", d.rows (), d.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator -", + d.rows (), d.cols (), a.rows (), a.cols ()); - return inner_do_add_sm_dm<RT> (a, d, std::negate<typename SM::element_type> (), + return inner_do_add_sm_dm<RT> (a, d, + std::negate<typename SM::element_type> (), identity_val<typename DM::element_type> ()); } @@ -196,7 +199,8 @@ RT do_add_sm_dm (const SM& a, const DM& d) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - octave::err_nonconformant ("operator +", a.rows (), a.cols (), d.rows (), d.cols ()); + octave::err_nonconformant ("operator +", + a.rows (), a.cols (), d.rows (), d.cols ()); return do_commutative_add_dm_sm<RT> (d, a); } @@ -205,7 +209,8 @@ RT do_sub_sm_dm (const SM& a, const DM& d) { if (a.rows () != d.rows () || a.cols () != d.cols ()) - octave::err_nonconformant ("operator -", a.rows (), a.cols (), d.rows (), d.cols ()); + octave::err_nonconformant ("operator -", + a.rows (), a.cols (), d.rows (), d.cols ()); return inner_do_add_sm_dm<RT> (a, d, identity_val<typename SM::element_type> (), @@ -213,3 +218,4 @@ } #endif +
--- a/liboctave/operators/Sparse-op-decls.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/Sparse-op-decls.h Mon Aug 29 11:09:25 2016 -0700 @@ -184,3 +184,4 @@ SPARSE_SMM_BOOL_OP_DECLS (M1, M2, API) #endif +
--- a/liboctave/operators/Sparse-op-defs.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/Sparse-op-defs.h Mon Aug 29 11:09:25 2016 -0700 @@ -1988,3 +1988,4 @@ } #endif +
--- a/liboctave/operators/Sparse-perm-op-defs.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/Sparse-perm-op-defs.h Mon Aug 29 11:09:25 2016 -0700 @@ -64,7 +64,8 @@ { const octave_idx_type nr = a.rows (); if (p.cols () != nr) - octave::err_nonconformant ("operator *", p.rows (), p.cols (), a.rows (), a.cols ()); + octave::err_nonconformant ("operator *", + p.rows (), p.cols (), a.rows (), a.cols ()); return octinternal_do_mul_colpm_sm (p.col_perm_vec ().data (), a); } @@ -147,9 +148,11 @@ { const octave_idx_type nc = a.cols (); if (p.rows () != nc) - octave::err_nonconformant ("operator *", a.rows (), a.cols (), p.rows (), p.cols ()); + octave::err_nonconformant ("operator *", + a.rows (), a.cols (), p.rows (), p.cols ()); return octinternal_do_mul_sm_colpm (a, p.col_perm_vec ().data ()); } #endif +
--- a/liboctave/operators/mx-base.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-base.h Mon Aug 29 11:09:25 2016 -0700 @@ -88,3 +88,4 @@ #include "uint64NDArray.h" #endif +
--- a/liboctave/operators/mx-defs.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-defs.h Mon Aug 29 11:09:25 2016 -0700 @@ -118,3 +118,4 @@ # endif #endif +
--- a/liboctave/operators/mx-ext.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-ext.h Mon Aug 29 11:09:25 2016 -0700 @@ -71,3 +71,4 @@ #include "qr.h" #endif +
--- a/liboctave/operators/mx-inlines.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-inlines.cc Mon Aug 29 11:09:25 2016 -0700 @@ -549,7 +549,8 @@ // magic to avoid underflows, which we don't need here. template <typename T> inline T cabsq (const std::complex<T>& c) -{ return c.real () * c.real () + c.imag () * c.imag (); +{ + return c.real () * c.real () + c.imag () * c.imag (); } // default. works for integers and bool. @@ -1698,3 +1699,4 @@ OP_RED_FCNN (mx_inline_xsum, T, T) #endif +
--- a/liboctave/operators/mx-op-decl.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-op-decl.h Mon Aug 29 11:09:25 2016 -0700 @@ -303,3 +303,4 @@ #endif +
--- a/liboctave/operators/mx-op-defs.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/operators/mx-op-defs.h Mon Aug 29 11:09:25 2016 -0700 @@ -636,3 +636,4 @@ return retval; #endif +
--- a/liboctave/system/child-list.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/child-list.cc Mon Aug 29 11:09:25 2016 -0700 @@ -161,3 +161,4 @@ return retval; } } +
--- a/liboctave/system/child-list.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/child-list.h Mon Aug 29 11:09:25 2016 -0700 @@ -52,19 +52,19 @@ child (const child& oc) : pid (oc.pid), handler (oc.handler), - have_status (oc.have_status), status (oc.status) { } + have_status (oc.have_status), status (oc.status) { } child& operator = (const child& oc) - { - if (&oc != this) - { - pid = oc.pid; - handler = oc.handler; - have_status = oc.have_status; - status = oc.status; - } - return *this; - } + { + if (&oc != this) + { + pid = oc.pid; + handler = oc.handler; + have_status = oc.have_status; + status = oc.status; + } + return *this; + } ~child (void) { } @@ -134,3 +134,4 @@ #endif #endif +
--- a/liboctave/system/dir-ops.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/dir-ops.cc Mon Aug 29 11:09:25 2016 -0700 @@ -108,3 +108,4 @@ } } } +
--- a/liboctave/system/dir-ops.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/dir-ops.h Mon Aug 29 11:09:25 2016 -0700 @@ -41,26 +41,26 @@ dir_entry (const std::string& n = "") : name (n), dir (0), fail (false), errmsg () - { - if (! name.empty ()) - open (); - } + { + if (! name.empty ()) + open (); + } dir_entry (const dir_entry& d) : name (d.name), dir (d.dir), fail (d.fail), errmsg (d.errmsg) { } dir_entry& operator = (const dir_entry& d) - { - if (this != &d) - { - name = d.name; - dir = d.dir; - fail = d.fail; - errmsg = d.errmsg; - } + { + if (this != &d) + { + name = d.name; + dir = d.dir; + fail = d.fail; + errmsg = d.errmsg; + } - return *this; - } + return *this; + } ~dir_entry (void) { close (); } @@ -105,3 +105,4 @@ #endif #endif +
--- a/liboctave/system/file-ops.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/file-ops.cc Mon Aug 29 11:09:25 2016 -0700 @@ -111,24 +111,28 @@ // expansions. The function is called with the text sans tilde, and // returns a malloc()'ed string which is the expansion, or a NULL // pointer if the expansion fails. - octave::sys::file_ops::tilde_expansion_hook octave::sys::file_ops::tilde_expansion_preexpansion_hook = 0; + octave::sys::file_ops::tilde_expansion_hook + octave::sys::file_ops::tilde_expansion_preexpansion_hook = 0; // If non-null, this contains the address of a function to call if the // standard meaning for expanding a tilde fails. The function is // called with the text (sans tilde, as in "foo"), and returns a // malloc()'ed string which is the expansion, or a NULL pointer if // there is no expansion. - octave::sys::file_ops::tilde_expansion_hook octave::sys::file_ops::tilde_expansion_failure_hook = 0; + octave::sys::file_ops::tilde_expansion_hook + octave::sys::file_ops::tilde_expansion_failure_hook = 0; // When non-null, this is a NULL terminated array of strings which are // duplicates for a tilde prefix. Bash uses this to expand '=~' and // ':~'. - string_vector octave::sys::file_ops::tilde_additional_prefixes = default_prefixes; + string_vector octave::sys::file_ops::tilde_additional_prefixes = + default_prefixes; // When non-null, this is a NULL terminated array of strings which // match the end of a username, instead of just "/". Bash sets this // to ':' and '=~'. - string_vector octave::sys::file_ops::tilde_additional_suffixes = default_suffixes; + string_vector octave::sys::file_ops::tilde_additional_suffixes = + default_suffixes; // Find the start of a tilde expansion in S, and return the index // of the tilde which starts the expansion. Place the length of the @@ -371,10 +375,10 @@ octave::sys::file_ops::concat (const std::string& dir, const std::string& file) { return dir.empty () - ? file - : (is_dir_sep (dir[dir.length ()-1]) - ? dir + file - : dir + dir_sep_char () + file); + ? file + : (is_dir_sep (dir[dir.length ()-1]) + ? dir + file + : dir + dir_sep_char () + file); } std::string @@ -471,7 +475,7 @@ int symlink (const std::string& old_name, - const std::string& new_name, std::string& msg) + const std::string& new_name, std::string& msg) { msg = ""; @@ -671,7 +675,7 @@ std::string tempnam (const std::string& dir, const std::string& pfx, - std::string& msg) + std::string& msg) { msg = ""; @@ -745,3 +749,4 @@ } } } +
--- a/liboctave/system/file-ops.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/file-ops.h Mon Aug 29 11:09:25 2016 -0700 @@ -393,3 +393,4 @@ #endif #endif +
--- a/liboctave/system/file-stat.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/file-stat.cc Mon Aug 29 11:09:25 2016 -0700 @@ -249,3 +249,4 @@ } } } +
--- a/liboctave/system/file-stat.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/file-stat.h Mon Aug 29 11:09:25 2016 -0700 @@ -56,29 +56,29 @@ m_blksize (fs.m_blksize), m_blocks (fs.m_blocks) { } base_file_stat& operator = (const base_file_stat& fs) - { - if (this != &fs) - { - initialized = fs.initialized; - fail = fs.fail; - errmsg = fs.errmsg; - m_mode = fs.m_mode; - m_ino = fs.m_ino; - m_dev = fs.m_dev; - m_nlink = fs.m_nlink; - m_uid = fs.m_uid; - m_gid = fs.m_gid; - m_size = fs.m_size; - m_atime = fs.m_atime; - m_mtime = fs.m_mtime; - m_ctime = fs.m_ctime; - m_rdev = fs.m_rdev; - m_blksize = fs.m_blksize; - m_blocks = fs.m_blocks; - } + { + if (this != &fs) + { + initialized = fs.initialized; + fail = fs.fail; + errmsg = fs.errmsg; + m_mode = fs.m_mode; + m_ino = fs.m_ino; + m_dev = fs.m_dev; + m_nlink = fs.m_nlink; + m_uid = fs.m_uid; + m_gid = fs.m_gid; + m_size = fs.m_size; + m_atime = fs.m_atime; + m_mtime = fs.m_mtime; + m_ctime = fs.m_ctime; + m_rdev = fs.m_rdev; + m_blksize = fs.m_blksize; + m_blocks = fs.m_blocks; + } - return *this; - } + return *this; + } // The minimum difference in file time stamp values. // FIXME: This value should come from the filesystem itself. @@ -220,20 +220,20 @@ file_stat (const file_stat& fs) : base_file_stat (fs), file_name (fs.file_name), - follow_links (fs.follow_links) { } + follow_links (fs.follow_links) { } file_stat& operator = (const file_stat& fs) - { - if (this != &fs) - { - base_file_stat::operator = (fs); + { + if (this != &fs) + { + base_file_stat::operator = (fs); - file_name = fs.file_name; - follow_links = fs.follow_links; - } + file_name = fs.file_name; + follow_links = fs.follow_links; + } - return *this; - } + return *this; + } ~file_stat (void) { } @@ -282,16 +282,16 @@ : base_file_stat (fs), fid (fs.fid) { } file_fstat& operator = (const file_fstat& fs) - { - if (this != &fs) - { - base_file_stat::operator = (fs); + { + if (this != &fs) + { + base_file_stat::operator = (fs); - fid = fs.fid; - } + fid = fs.fid; + } - return *this; - } + return *this; + } ~file_fstat (void) { } @@ -337,3 +337,4 @@ #endif #endif +
--- a/liboctave/system/lo-sysdep.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/lo-sysdep.cc Mon Aug 29 11:09:25 2016 -0700 @@ -69,3 +69,4 @@ } } } +
--- a/liboctave/system/lo-sysdep.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/lo-sysdep.h Mon Aug 29 11:09:25 2016 -0700 @@ -54,3 +54,4 @@ #endif #endif +
--- a/liboctave/system/mach-info.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/mach-info.cc Mon Aug 29 11:09:25 2016 -0700 @@ -220,3 +220,4 @@ return retval; } } +
--- a/liboctave/system/mach-info.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/mach-info.h Mon Aug 29 11:09:25 2016 -0700 @@ -86,3 +86,4 @@ #endif #endif +
--- a/liboctave/system/oct-env.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-env.cc Mon Aug 29 11:09:25 2016 -0700 @@ -352,7 +352,8 @@ if (len == 2 && s[0] == '.' && s[1] == '.') return true; - if (len > 2 && s[0] == '.' && s[1] == '.' && octave::sys::file_ops::is_dir_sep (s[2])) + if (len > 2 && s[0] == '.' && s[1] == '.' + && octave::sys::file_ops::is_dir_sep (s[2])) return true; return false; @@ -489,7 +490,8 @@ if (hd.empty ()) { - octave::sys::password pw = octave::sys::password::getpwuid (octave::sys::getuid ()); + octave::sys::password pw = octave::sys::password::getpwuid ( + octave::sys::getuid ()); hd = pw ? pw.dir () : std::string (octave::sys::file_ops::dir_sep_str ()); } @@ -502,7 +504,8 @@ { if (user_name.empty ()) { - octave::sys::password pw = octave::sys::password::getpwuid (octave::sys::getuid ()); + octave::sys::password pw = octave::sys::password::getpwuid ( + octave::sys::getuid ()); user_name = pw ? pw.name () : std::string ("unknown"); } @@ -612,3 +615,4 @@ } } } +
--- a/liboctave/system/oct-env.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-env.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,8 +50,8 @@ static std::string base_pathname (const std::string& s); static std::string - make_absolute (const std::string& s, - const std::string& dot_path = get_current_directory ()); + make_absolute (const std::string& s, + const std::string& dot_path = get_current_directory ()); static std::string get_current_directory (void); @@ -158,3 +158,4 @@ #endif #endif +
--- a/liboctave/system/oct-group.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-group.cc Mon Aug 29 11:09:25 2016 -0700 @@ -226,3 +226,4 @@ } } } +
--- a/liboctave/system/oct-group.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-group.h Mon Aug 29 11:09:25 2016 -0700 @@ -43,26 +43,26 @@ group (void) : m_name (), m_passwd (), m_gid (0), m_mem (), valid (false) - { } + { } group (const group& gr) : m_name (gr.m_name), m_passwd (gr.m_passwd), - m_gid (gr.m_gid), m_mem (gr.m_mem), valid (gr.valid) - { } + m_gid (gr.m_gid), m_mem (gr.m_mem), valid (gr.valid) + { } group& operator = (const group& gr) - { - if (this != &gr) - { - m_name = gr.m_name; - m_passwd = gr.m_passwd; - m_gid = gr.m_gid; - m_mem = gr.m_mem; - valid = gr.valid; - } + { + if (this != &gr) + { + m_name = gr.m_name; + m_passwd = gr.m_passwd; + m_gid = gr.m_gid; + m_mem = gr.m_mem; + valid = gr.valid; + } - return *this; - } + return *this; + } std::string name (void) const; @@ -123,3 +123,4 @@ #endif #endif +
--- a/liboctave/system/oct-passwd.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-passwd.cc Mon Aug 29 11:09:25 2016 -0700 @@ -234,3 +234,4 @@ } } } +
--- a/liboctave/system/oct-passwd.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-passwd.h Mon Aug 29 11:09:25 2016 -0700 @@ -42,30 +42,30 @@ password (void) : m_name (), m_passwd (), m_uid (0), m_gid (0), m_gecos (), m_dir (), m_shell (), valid (false) - { } + { } password (const password& pw) : m_name (pw.m_name), m_passwd (pw.m_passwd), m_uid (pw.m_uid), m_gid (pw.m_gid), m_gecos (pw.m_gecos), m_dir (pw.m_dir), m_shell (pw.m_shell), valid (pw.valid) - { } + { } password& operator = (const password& pw) - { - if (this != &pw) - { - m_name = pw.m_name; - m_passwd = pw.m_passwd; - m_uid = pw.m_uid; - m_gid = pw.m_gid; - m_gecos = pw.m_gecos; - m_dir = pw.m_dir; - m_shell = pw.m_shell; - valid = pw.valid; - } + { + if (this != &pw) + { + m_name = pw.m_name; + m_passwd = pw.m_passwd; + m_uid = pw.m_uid; + m_gid = pw.m_gid; + m_gecos = pw.m_gecos; + m_dir = pw.m_dir; + m_shell = pw.m_shell; + valid = pw.valid; + } - return *this; - } + return *this; + } ~password (void) { } @@ -143,3 +143,4 @@ #endif #endif +
--- a/liboctave/system/oct-syscalls.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-syscalls.cc Mon Aug 29 11:09:25 2016 -0700 @@ -365,3 +365,4 @@ } } } +
--- a/liboctave/system/oct-time.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-time.cc Mon Aug 29 11:09:25 2016 -0700 @@ -330,3 +330,4 @@ } } } +
--- a/liboctave/system/oct-time.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-time.h Mon Aug 29 11:09:25 2016 -0700 @@ -48,25 +48,25 @@ time (time_t t, int us) : ot_unix_time (t), ot_usec () - { - int rem, extra; + { + int rem, extra; - if (us >= 0) - { - rem = us % 1000000; - extra = (us - rem) / 1000000; - } - else - { - us = -us; - rem = us % 1000000; - extra = - (1 + (us - rem) / 1000000); - rem = 1000000 - us % 1000000; - } + if (us >= 0) + { + rem = us % 1000000; + extra = (us - rem) / 1000000; + } + else + { + us = -us; + rem = us % 1000000; + extra = - (1 + (us - rem) / 1000000); + rem = 1000000 - us % 1000000; + } - ot_usec = rem; - ot_unix_time += extra; - } + ot_usec = rem; + ot_unix_time += extra; + } time (double d); @@ -76,15 +76,15 @@ : ot_unix_time (ot.ot_unix_time), ot_usec (ot.ot_usec) { } time& operator = (const time& ot) - { - if (this != &ot) - { - ot_unix_time = ot.ot_unix_time; - ot_usec = ot.ot_usec; - } + { + if (this != &ot) + { + ot_unix_time = ot.ot_unix_time; + ot_usec = ot.ot_usec; + } - return *this; - } + return *this; + } ~time (void) { } @@ -161,7 +161,7 @@ operator + (const time& t1, const time& t2) { return time (t1.unix_time () + t2.unix_time (), - t1.usec () + t2.usec ()); + t1.usec () + t2.usec ()); } class @@ -174,35 +174,35 @@ : m_usec (0), m_sec (0), m_min (0), m_hour (0), m_mday (0), m_mon (0), m_year (0), m_wday (0), m_yday (0), m_isdst (0), m_gmtoff (0), m_zone ("unknown") - { } + { } base_tm (const base_tm& tm) : m_usec (tm.m_usec), m_sec (tm.m_sec), m_min (tm.m_min), m_hour (tm.m_hour), m_mday (tm.m_mday), m_mon (tm.m_mon), m_year (tm.m_year), m_wday (tm.m_wday), m_yday (tm.m_yday), m_isdst (tm.m_isdst), m_gmtoff (tm.m_gmtoff), m_zone (tm.m_zone) - { } + { } base_tm& operator = (const base_tm& tm) - { - if (this != &tm) - { - m_usec = tm.m_usec; - m_sec = tm.m_sec; - m_min = tm.m_min; - m_hour = tm.m_hour; - m_mday = tm.m_mday; - m_mon = tm.m_mon; - m_year = tm.m_year; - m_wday = tm.m_wday; - m_yday = tm.m_yday; - m_isdst = tm.m_isdst; - m_gmtoff = tm.m_gmtoff; - m_zone = tm.m_zone; - } + { + if (this != &tm) + { + m_usec = tm.m_usec; + m_sec = tm.m_sec; + m_min = tm.m_min; + m_hour = tm.m_hour; + m_mday = tm.m_mday; + m_mon = tm.m_mon; + m_year = tm.m_year; + m_wday = tm.m_wday; + m_yday = tm.m_yday; + m_isdst = tm.m_isdst; + m_gmtoff = tm.m_gmtoff; + m_zone = tm.m_zone; + } - return *this; - } + return *this; + } virtual ~base_tm (void) { } @@ -294,10 +294,10 @@ : base_tm (t) { } localtime& operator = (const localtime& t) - { - base_tm::operator = (t); - return *this; - } + { + base_tm::operator = (t); + return *this; + } ~localtime (void) { } @@ -319,10 +319,10 @@ : base_tm () { init (ot); } gmtime& operator = (const gmtime& t) - { - base_tm::operator = (t); - return *this; - } + { + base_tm::operator = (t); + return *this; + } ~gmtime (void) { } @@ -339,19 +339,19 @@ strptime (const std::string& str, const std::string& fmt) : base_tm (), nchars (0) - { - init (str, fmt); - } + { + init (str, fmt); + } strptime (const strptime& s) : base_tm (s), nchars (s.nchars) { } strptime& operator = (const strptime& s) - { - base_tm::operator = (s); - nchars = s.nchars; - return *this; - } + { + base_tm::operator = (s); + nchars = s.nchars; + return *this; + } int characters_converted (void) const { return nchars; } @@ -541,3 +541,4 @@ #endif #endif +
--- a/liboctave/system/oct-uname.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-uname.cc Mon Aug 29 11:09:25 2016 -0700 @@ -55,3 +55,4 @@ } } } +
--- a/liboctave/system/oct-uname.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/system/oct-uname.h Mon Aug 29 11:09:25 2016 -0700 @@ -42,30 +42,30 @@ m_release ("unknown"), m_version ("unknown"), m_machine ("unknown"), msg ("uname not supported on this system"), err (-1) - { init (); } + { init (); } uname (const uname& unm) : m_sysname (unm.m_sysname), m_nodename (unm.m_nodename), m_release (unm.m_release), m_version (unm.m_version), m_machine (unm.m_machine), msg (unm.msg), err (unm.err) - { } + { } uname& operator = (const uname& unm) - { - if (this != &unm) - { - m_sysname = unm.m_sysname; - m_nodename = unm.m_nodename; - m_release = unm.m_release; - m_version = unm.m_version; - m_machine = unm.m_machine; + { + if (this != &unm) + { + m_sysname = unm.m_sysname; + m_nodename = unm.m_nodename; + m_release = unm.m_release; + m_version = unm.m_version; + m_machine = unm.m_machine; - msg = unm.msg; - err = unm.err; - } + msg = unm.msg; + err = unm.err; + } - return *this; - } + return *this; + } ~uname (void) { } @@ -102,3 +102,4 @@ #endif #endif +
--- a/liboctave/util/action-container.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/action-container.h Mon Aug 29 11:09:25 2016 -0700 @@ -341,3 +341,4 @@ }; #endif +
--- a/liboctave/util/base-list.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/base-list.h Mon Aug 29 11:09:25 2016 -0700 @@ -41,7 +41,8 @@ typedef typename std::list<elt_type>::const_iterator const_iterator; typedef typename std::list<elt_type>::reverse_iterator reverse_iterator; - typedef typename std::list<elt_type>::const_reverse_iterator const_reverse_iterator; + typedef typename std::list<elt_type>::const_reverse_iterator + const_reverse_iterator; bool empty (void) const { return lst.empty (); } @@ -132,3 +133,4 @@ } #endif +
--- a/liboctave/util/byte-swap.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/byte-swap.h Mon Aug 29 11:09:25 2016 -0700 @@ -94,3 +94,4 @@ } #endif +
--- a/liboctave/util/caseless-str.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/caseless-str.h Mon Aug 29 11:09:25 2016 -0700 @@ -94,3 +94,4 @@ }; #endif +
--- a/liboctave/util/cmd-edit.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/cmd-edit.cc Mon Aug 29 11:09:25 2016 -0700 @@ -582,7 +582,8 @@ if (looks_like_filename (l, ' ') || looks_like_filename (l, '\'') || looks_like_filename (l, '"')) { - ::octave_rl_set_completer_quote_characters (completer_quote_characters.c_str ()); + ::octave_rl_set_completer_quote_characters ( + completer_quote_characters.c_str ()); return dir_sep; } @@ -1940,3 +1941,4 @@ (*current_liboctave_error_handler) ("%s", s.c_str ()); } } +
--- a/liboctave/util/cmd-edit.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/cmd-edit.h Mon Aug 29 11:09:25 2016 -0700 @@ -304,7 +304,7 @@ { return 0; } virtual string_vector - do_generate_filename_completions (const std::string& text) = 0; + do_generate_filename_completions (const std::string& text) = 0; virtual std::string do_get_line_buffer (void) const = 0; @@ -375,3 +375,4 @@ #endif #endif +
--- a/liboctave/util/cmd-hist.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/cmd-hist.cc Mon Aug 29 11:09:25 2016 -0700 @@ -1021,3 +1021,4 @@ (*current_liboctave_error_handler) ("%s", s.c_str ()); } } +
--- a/liboctave/util/cmd-hist.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/cmd-hist.h Mon Aug 29 11:09:25 2016 -0700 @@ -39,7 +39,7 @@ command_history (void) : initialized (false), ignoring_additions (false), history_control (0), - lines_in_file (0), lines_this_session (0), xfile (), xsize (-1) { } + lines_in_file (0), lines_this_session (0), xfile (), xsize (-1) { } public: @@ -241,3 +241,4 @@ #endif #endif +
--- a/liboctave/util/data-conv.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/data-conv.cc Mon Aug 29 11:09:25 2016 -0700 @@ -981,3 +981,4 @@ break; } } +
--- a/liboctave/util/data-conv.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/data-conv.h Mon Aug 29 11:09:25 2016 -0700 @@ -264,3 +264,4 @@ } #endif +
--- a/liboctave/util/f2c-main.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/f2c-main.c Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ # endif int F77_DUMMY_MAIN () { assert (0); return 1; } #endif +
--- a/liboctave/util/functor.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/functor.h Mon Aug 29 11:09:25 2016 -0700 @@ -75,3 +75,4 @@ } #endif +
--- a/liboctave/util/glob-match.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/glob-match.cc Mon Aug 29 11:09:25 2016 -0700 @@ -56,3 +56,4 @@ return retval; } +
--- a/liboctave/util/glob-match.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/glob-match.h Mon Aug 29 11:09:25 2016 -0700 @@ -101,3 +101,4 @@ }; #endif +
--- a/liboctave/util/kpse.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/kpse.cc Mon Aug 29 11:09:25 2016 -0700 @@ -1370,3 +1370,4 @@ return expansion; } +
--- a/liboctave/util/kpse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/kpse.h Mon Aug 29 11:09:25 2016 -0700 @@ -95,3 +95,4 @@ kpse_path_search (const std::string& path, const std::string& name); #endif +
--- a/liboctave/util/lo-array-errwarn.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-array-errwarn.cc Mon Aug 29 11:09:25 2016 -0700 @@ -36,7 +36,8 @@ static const char *error_id_invalid_index = "Octave:invalid-index"; -static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; +static const char *warning_id_nearly_singular_matrix = + "Octave:nearly-singular-matrix"; static const char *warning_id_singular_matrix = "Octave:singular-matrix"; @@ -328,3 +329,4 @@ } /* Tests in test/index.tst */ +
--- a/liboctave/util/lo-array-errwarn.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-array-errwarn.h Mon Aug 29 11:09:25 2016 -0700 @@ -265,3 +265,4 @@ #endif #endif +
--- a/liboctave/util/lo-array-gripes.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-array-gripes.cc Mon Aug 29 11:09:25 2016 -0700 @@ -39,7 +39,8 @@ static const char *error_id_invalid_index = "Octave:invalid-index"; -static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; +static const char *warning_id_nearly_singular_matrix = + "Octave:nearly-singular-matrix"; static const char *warning_id_singular_matrix = "Octave:singular-matrix"; @@ -295,3 +296,4 @@ } /* Tests in test/index.tst */ +
--- a/liboctave/util/lo-array-gripes.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-array-gripes.h Mon Aug 29 11:09:25 2016 -0700 @@ -99,3 +99,4 @@ gripe_singular_matrix (double rcond = 0.0); #endif +
--- a/liboctave/util/lo-cutils.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-cutils.c Mon Aug 29 11:09:25 2016 -0700 @@ -47,3 +47,4 @@ { return strncasecmp (s1, s2, n); } +
--- a/liboctave/util/lo-cutils.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-cutils.h Mon Aug 29 11:09:25 2016 -0700 @@ -46,3 +46,4 @@ #endif #endif +
--- a/liboctave/util/lo-hash.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-hash.cc Mon Aug 29 11:09:25 2016 -0700 @@ -140,3 +140,4 @@ } } } +
--- a/liboctave/util/lo-hash.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-hash.h Mon Aug 29 11:09:25 2016 -0700 @@ -59,3 +59,4 @@ } #endif +
--- a/liboctave/util/lo-ieee.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-ieee.cc Mon Aug 29 11:09:25 2016 -0700 @@ -278,3 +278,4 @@ initialized = true; } } +
--- a/liboctave/util/lo-ieee.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-ieee.h Mon Aug 29 11:09:25 2016 -0700 @@ -156,3 +156,4 @@ #endif #endif +
--- a/liboctave/util/lo-macros.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-macros.h Mon Aug 29 11:09:25 2016 -0700 @@ -100,3 +100,4 @@ OCT_ITERATE_PARAM_MACRO(OCT_MAKE_DECL_LIST_HELPER, PREFIX, NUM) #endif +
--- a/liboctave/util/lo-math.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-math.h Mon Aug 29 11:09:25 2016 -0700 @@ -40,3 +40,4 @@ #endif #endif +
--- a/liboctave/util/lo-regexp.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-regexp.cc Mon Aug 29 11:09:25 2016 -0700 @@ -265,7 +265,7 @@ // Index of subpattern in first two bytes MSB first of name. // Extract index. nidx[i] = (static_cast<int> (nametable[i*nameentrysize])) << 8 - | static_cast<int> (nametable[i*nameentrysize+1]); + | static_cast<int> (nametable[i*nameentrysize+1]); } while (true) @@ -589,7 +589,7 @@ { OCTAVE_QUIT; delta += static_cast<int> (replen) - - static_cast<int> (p->end () - p->start () + 1); + - static_cast<int> (p->end () - p->start () + 1); p++; } @@ -613,3 +613,4 @@ return retval; } } +
--- a/liboctave/util/lo-regexp.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-regexp.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,29 +50,29 @@ const regexp::opts& opt = regexp::opts (), const std::string& w = "regexp") : pattern (pat), options (opt), data (0), named_pats (), - nnames (0), named_idx (), who (w) + nnames (0), named_idx (), who (w) { compile_internal (); } regexp (const regexp& rx) : pattern (rx.pattern), data (rx.data), named_pats (rx.named_pats), - nnames (rx.nnames), named_idx (rx.named_idx) - { } + nnames (rx.nnames), named_idx (rx.named_idx) + { } regexp& operator = (const regexp& rx) - { - if (this != &rx) - { - pattern = rx.pattern; - data = rx.data; - named_pats = rx.named_pats; - nnames = rx.nnames; - named_idx = rx.named_idx; - } + { + if (this != &rx) + { + pattern = rx.pattern; + data = rx.data; + named_pats = rx.named_pats; + nnames = rx.nnames; + named_idx = rx.named_idx; + } - return *this; - } + return *this; + } ~regexp (void) { free (); } @@ -242,7 +242,7 @@ match_data (const match_data& rx_lst) : base_list<match_element> (rx_lst), - named_pats (rx_lst.named_pats) + named_pats (rx_lst.named_pats) { } match_data& operator = (const match_data& rx_lst) @@ -336,3 +336,4 @@ #endif #endif +
--- a/liboctave/util/lo-traits.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-traits.h Mon Aug 29 11:09:25 2016 -0700 @@ -153,3 +153,4 @@ }; #endif +
--- a/liboctave/util/lo-utils.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-utils.cc Mon Aug 29 11:09:25 2016 -0700 @@ -53,7 +53,8 @@ bool xtoo_large_for_float (double x) { - return (octave::math::finite (x) && fabs (x) > std::numeric_limits<float>::max ()); + return (octave::math::finite (x) + && fabs (x) > std::numeric_limits<float>::max ()); } bool xtoo_large_for_float (const Complex& x) @@ -428,3 +429,4 @@ octave_write_float (os, imag (c)); os << ")"; } +
--- a/liboctave/util/lo-utils.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/lo-utils.h Mon Aug 29 11:09:25 2016 -0700 @@ -138,3 +138,4 @@ octave_write_float_complex (std::ostream& os, const FloatComplex& cval); #endif +
--- a/liboctave/util/oct-alloc.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-alloc.h Mon Aug 29 11:09:25 2016 -0700 @@ -32,3 +32,4 @@ #define DEFINE_OCTAVE_ALLOCATOR2(t, s) #endif +
--- a/liboctave/util/oct-base64.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-base64.cc Mon Aug 29 11:09:25 2016 -0700 @@ -88,3 +88,4 @@ return retval; } +
--- a/liboctave/util/oct-binmap.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-binmap.h Mon Aug 29 11:09:25 2016 -0700 @@ -490,3 +490,4 @@ { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); } #endif +
--- a/liboctave/util/oct-cmplx.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-cmplx.h Mon Aug 29 11:09:25 2016 -0700 @@ -103,3 +103,4 @@ DEF_COMPLEXR_COMP (>=, >) #endif +
--- a/liboctave/util/oct-glob.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-glob.cc Mon Aug 29 11:09:25 2016 -0700 @@ -174,12 +174,12 @@ escaped += '/'; else #endif - { - if (xpat[j] == ']' || xpat[j] == '[') - escaped += '\\'; + { + if (xpat[j] == ']' || xpat[j] == '[') + escaped += '\\'; - escaped += xpat[j]; - } + escaped += xpat[j]; + } } // Replace trailing "*.*" by "*". @@ -224,13 +224,13 @@ unescaped += '\\'; else #endif - { - if (tmp[m] == '\\' - && ++m == tmp.length ()) - break; + { + if (tmp[m] == '\\' + && ++m == tmp.length ()) + break; - unescaped += tmp[m]; - } + unescaped += tmp[m]; + } } retval[k++] = unescaped; @@ -246,3 +246,4 @@ } } } +
--- a/liboctave/util/oct-glob.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-glob.h Mon Aug 29 11:09:25 2016 -0700 @@ -54,3 +54,4 @@ #endif #endif +
--- a/liboctave/util/oct-inttypes-fwd.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-inttypes-fwd.h Mon Aug 29 11:09:25 2016 -0700 @@ -38,3 +38,4 @@ typedef octave_int<uint64_t> octave_uint64; #endif +
--- a/liboctave/util/oct-inttypes.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-inttypes.cc Mon Aug 29 11:09:25 2016 -0700 @@ -749,7 +749,8 @@ octave_int<T> pow (const octave_int<T>& a, const double& b) { - return ((b >= 0 && b < std::numeric_limits<T>::digits && b == octave::math::round (b)) + return ((b >= 0 && b < std::numeric_limits<T>::digits + && b == octave::math::round (b)) ? pow (a, octave_int<T> (static_cast<T> (b))) : octave_int<T> (pow (a.double_value (), b))); } @@ -763,7 +764,8 @@ octave_int<T> pow (const octave_int<T>& a, const float& b) { - return ((b >= 0 && b < std::numeric_limits<T>::digits && b == octave::math::round (b)) + return ((b >= 0 && b < std::numeric_limits<T>::digits + && b == octave::math::round (b)) ? pow (a, octave_int<T> (static_cast<T> (b))) : octave_int<T> (pow (a.double_value (), static_cast<double> (b)))); } @@ -780,7 +782,8 @@ octave_int<T> powf (const octave_int<T>& a, const float& b) { - return ((b >= 0 && b < std::numeric_limits<T>::digits && b == octave::math::round (b)) + return ((b >= 0 && b < std::numeric_limits<T>::digits + && b == octave::math::round (b)) ? pow (a, octave_int<T> (static_cast<T> (b))) : octave_int<T> (pow (a.double_value (), static_cast<double> (b)))); } @@ -846,3 +849,4 @@ %!assert (int64 (char (128)), int64 (128)) %!assert (int64 (char (255)), int64 (255)) */ +
--- a/liboctave/util/oct-inttypes.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-inttypes.h Mon Aug 29 11:09:25 2016 -0700 @@ -839,7 +839,7 @@ // This class simply selects the proper arithmetics. template <typename T> class octave_int_arith - : public octave_int_arith_base<T, std::numeric_limits<T>::is_signed> +: public octave_int_arith_base<T, std::numeric_limits<T>::is_signed> { }; template <typename T> @@ -1361,3 +1361,4 @@ } #endif +
--- a/liboctave/util/oct-locbuf.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-locbuf.cc Mon Aug 29 11:09:25 2016 -0700 @@ -149,3 +149,4 @@ active); } } +
--- a/liboctave/util/oct-mutex.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-mutex.cc Mon Aug 29 11:09:25 2016 -0700 @@ -173,3 +173,4 @@ } octave_mutex::octave_mutex (void) : rep (init_rep ()) { } +
--- a/liboctave/util/oct-mutex.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-mutex.h Mon Aug 29 11:09:25 2016 -0700 @@ -150,3 +150,4 @@ }; #endif +
--- a/liboctave/util/oct-refcount.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-refcount.h Mon Aug 29 11:09:25 2016 -0700 @@ -115,3 +115,4 @@ }; #endif +
--- a/liboctave/util/oct-rl-edit.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-rl-edit.c Mon Aug 29 11:09:25 2016 -0700 @@ -472,3 +472,4 @@ } #endif +
--- a/liboctave/util/oct-rl-edit.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-rl-edit.h Mon Aug 29 11:09:25 2016 -0700 @@ -183,3 +183,4 @@ #endif #endif +
--- a/liboctave/util/oct-rl-hist.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-rl-hist.c Mon Aug 29 11:09:25 2016 -0700 @@ -318,3 +318,4 @@ } #endif +
--- a/liboctave/util/oct-rl-hist.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-rl-hist.h Mon Aug 29 11:09:25 2016 -0700 @@ -30,7 +30,8 @@ { #endif -enum { +enum +{ HC_IGNSPACE = 0x01, HC_IGNDUPS = 0x02, HC_ERASEDUPS = 0x04 @@ -83,3 +84,4 @@ #endif #endif +
--- a/liboctave/util/oct-shlib.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-shlib.cc Mon Aug 29 11:09:25 2016 -0700 @@ -150,7 +150,8 @@ fcn_names.clear (); } - std::map<std::string, dynamic_library::dynlib_rep *> dynamic_library::dynlib_rep::instances; + std::map<std::string, dynamic_library::dynlib_rep *> + dynamic_library::dynlib_rep::instances; dynamic_library::dynlib_rep dynamic_library::nil_rep; @@ -170,7 +171,7 @@ // FIXME: this is possibly redundant because failure to open a library will // normally throw an exception, avoiding the construction of an invalid - // library. Leave it here for possible future use. + // library. Leave it here for possible future use. bool is_open (void) const { return (library != 0); } @@ -529,3 +530,4 @@ #endif } } +
--- a/liboctave/util/oct-shlib.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-shlib.h Mon Aug 29 11:09:25 2016 -0700 @@ -120,30 +120,30 @@ : rep (dynlib_rep::get_instance (f, fake)) { } ~dynamic_library (void) - { - if (--rep->count == 0) - delete rep; - } + { + if (--rep->count == 0) + delete rep; + } dynamic_library (const dynamic_library& sl) : rep (sl.rep) - { - rep->count++; - } + { + rep->count++; + } dynamic_library& operator = (const dynamic_library& sl) - { - if (rep != sl.rep) - { - if (--rep->count == 0) - delete rep; + { + if (rep != sl.rep) + { + if (--rep->count == 0) + delete rep; - rep = sl.rep; - rep->count++; - } + rep = sl.rep; + rep->count++; + } - return *this; - } + return *this; + } bool operator == (const dynamic_library& sl) const { return (rep == sl.rep); } @@ -202,3 +202,4 @@ #endif #endif +
--- a/liboctave/util/oct-sort.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-sort.cc Mon Aug 29 11:09:25 2016 -0700 @@ -1966,3 +1966,4 @@ { return x > y; } +
--- a/liboctave/util/oct-sort.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-sort.h Mon Aug 29 11:09:25 2016 -0700 @@ -345,3 +345,4 @@ octave_idx_type indx; }; #endif +
--- a/liboctave/util/oct-sparse.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-sparse.h Mon Aug 29 11:09:25 2016 -0700 @@ -130,3 +130,4 @@ #endif #endif +
--- a/liboctave/util/oct-string.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-string.cc Mon Aug 29 11:09:25 2016 -0700 @@ -204,3 +204,4 @@ INSTANTIATE_OCTAVE_STRING(Array<char>) #undef INSTANTIATE_OCTAVE_STRING +
--- a/liboctave/util/oct-string.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/oct-string.h Mon Aug 29 11:09:25 2016 -0700 @@ -102,7 +102,7 @@ //! True if the first N characters are the same. template <typename T> bool strncmp (const T& str_a, const typename T::value_type* str_b, - const typename T::size_type n); + const typename T::size_type n); //! True if the first N characters are the same, ignoring case. /*! @@ -124,3 +124,4 @@ } #endif +
--- a/liboctave/util/pathsearch.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/pathsearch.cc Mon Aug 29 11:09:25 2016 -0700 @@ -142,3 +142,4 @@ m_initialized = true; } } +
--- a/liboctave/util/pathsearch.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/pathsearch.h Mon Aug 29 11:09:25 2016 -0700 @@ -39,10 +39,10 @@ directory_path (const std::string& s = "", const std::string& d = "") : m_orig_path (s), m_default_path (d), m_initialized (false), m_expanded_path (), m_path_elements () - { - if (! m_orig_path.empty ()) - init (); - } + { + if (! m_orig_path.empty ()) + init (); + } directory_path (const directory_path& dp) : m_orig_path (dp.m_orig_path), @@ -50,21 +50,21 @@ m_initialized (dp.m_initialized), m_expanded_path (dp.m_expanded_path), m_path_elements (dp.m_path_elements) - { } + { } directory_path& operator = (const directory_path& dp) - { - if (this != &dp) - { - m_orig_path = dp.m_orig_path; - m_default_path = dp.m_default_path; - m_initialized = dp.m_initialized; - m_expanded_path = dp.m_expanded_path; - m_path_elements = dp.m_path_elements; - } + { + if (this != &dp) + { + m_orig_path = dp.m_orig_path; + m_default_path = dp.m_default_path; + m_initialized = dp.m_initialized; + m_expanded_path = dp.m_expanded_path; + m_path_elements = dp.m_path_elements; + } - return *this; - } + return *this; + } ~directory_path (void) { } @@ -192,3 +192,4 @@ #endif #endif +
--- a/liboctave/util/singleton-cleanup.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/singleton-cleanup.cc Mon Aug 29 11:09:25 2016 -0700 @@ -53,3 +53,4 @@ return retval; } +
--- a/liboctave/util/singleton-cleanup.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/singleton-cleanup.h Mon Aug 29 11:09:25 2016 -0700 @@ -50,3 +50,4 @@ }; #endif +
--- a/liboctave/util/sparse-sort.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/sparse-sort.cc Mon Aug 29 11:09:25 2016 -0700 @@ -61,3 +61,4 @@ } template class octave_sort<octave_idx_vector_sort *>; +
--- a/liboctave/util/sparse-sort.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/sparse-sort.h Mon Aug 29 11:09:25 2016 -0700 @@ -52,3 +52,4 @@ octave_idx_vector_sort* j); #endif +
--- a/liboctave/util/sparse-util.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/sparse-util.cc Mon Aug 29 11:09:25 2016 -0700 @@ -126,3 +126,4 @@ return true; } +
--- a/liboctave/util/sparse-util.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/sparse-util.h Mon Aug 29 11:09:25 2016 -0700 @@ -44,3 +44,4 @@ octave_idx_type nnz); #endif +
--- a/liboctave/util/str-vec.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/str-vec.cc Mon Aug 29 11:09:25 2016 -0700 @@ -265,3 +265,4 @@ return os; } +
--- a/liboctave/util/str-vec.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/str-vec.h Mon Aug 29 11:09:25 2016 -0700 @@ -128,7 +128,8 @@ template<template <typename...> class String_Container, typename... Other> -string_vector::string_vector (const String_Container<std::string, Other...>& lst) +string_vector::string_vector (const String_Container<std::string, Other...>& + lst) : Array<std::string> () { resize (lst.size ()); @@ -139,3 +140,4 @@ } #endif +
--- a/liboctave/util/sun-utils.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/sun-utils.h Mon Aug 29 11:09:25 2016 -0700 @@ -62,3 +62,4 @@ #endif #endif +
--- a/liboctave/util/unwind-prot.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/unwind-prot.cc Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ "Please help improve Octave by reporting it."); } } +
--- a/liboctave/util/unwind-prot.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/unwind-prot.h Mon Aug 29 11:09:25 2016 -0700 @@ -127,19 +127,19 @@ unwind_protect_safe (void) : unwind_protect () { } ~unwind_protect_safe (void) - { - while (! empty ()) - { - try - { - run_first (); - } - catch (...) // Yes, the black hole. Remember we're in a destructor. - { - warn_unhandled_exception (); - } - } - } + { + while (! empty ()) + { + try + { + run_first (); + } + catch (...) // Yes, the black hole. Remember we're in a destructor. + { + warn_unhandled_exception (); + } + } + } private: @@ -162,3 +162,4 @@ #endif #endif +
--- a/liboctave/util/url-transfer.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/url-transfer.cc Mon Aug 29 11:09:25 2016 -0700 @@ -69,7 +69,7 @@ { ok = false; errmsg = "__ftp_mget__: can not create directory '" - + target + sep + directory + "': " + msg; + + target + sep + directory + "': " + msg; return; } } @@ -169,7 +169,7 @@ { ok = false; errmsg = "__ftp__mput: file '" + realfile - + "' does not exist"; + + "' does not exist"; break; } @@ -190,7 +190,7 @@ { ok = false; errmsg = "__ftp_mput__: unable to open file '" - + realfile + "'"; + + realfile + "'"; break; } @@ -209,7 +209,7 @@ { ok = false; errmsg = "__ftp_mput__: can not read the directory '" - + realdir + "'"; + + realdir + "'"; } } @@ -792,3 +792,4 @@ #undef REP_CLASS } +
--- a/liboctave/util/url-transfer.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/util/url-transfer.h Mon Aug 29 11:09:25 2016 -0700 @@ -54,22 +54,21 @@ base_url_transfer (void) : count (1), host_or_url (), valid (false), ftp (false), - ascii_mode (false), ok (true), errmsg (), - curr_istream (&std::cin), curr_ostream (&std::cout) - { } + ascii_mode (false), ok (true), errmsg (), + curr_istream (&std::cin), curr_ostream (&std::cout) { } base_url_transfer (const std::string& host, const std::string& /* user_arg */, const std::string& /* passwd */, std::ostream& os) : count (1), host_or_url (host), valid (false), ftp (true), - ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin), - curr_ostream (&os) { } + ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin), + curr_ostream (&os) { } base_url_transfer (const std::string& url, std::ostream& os) : count (1), host_or_url (url), valid (false), ftp (false), - ascii_mode (false), ok (true), errmsg (), - curr_istream (&std::cin), curr_ostream (&os) { } + ascii_mode (false), ok (true), errmsg (), + curr_istream (&std::cin), curr_ostream (&os) { } virtual ~base_url_transfer (void) { } @@ -178,29 +177,29 @@ url_transfer (const std::string& url, std::ostream& os); url_transfer (const url_transfer& h) : rep (h.rep) - { - rep->count++; - } + { + rep->count++; + } ~url_transfer (void) - { - if (--rep->count == 0) - delete rep; - } + { + if (--rep->count == 0) + delete rep; + } url_transfer& operator = (const url_transfer& h) - { - if (this != &h) - { - if (--rep->count == 0) - delete rep; + { + if (this != &h) + { + if (--rep->count == 0) + delete rep; - rep = h.rep; - rep->count++; - } + rep = h.rep; + rep->count++; + } - return *this; - } + return *this; + } bool is_valid (void) const { return rep->is_valid (); } @@ -300,3 +299,4 @@ #endif #endif +
--- a/liboctave/wrappers/areadlink-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/areadlink-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ { return areadlink (name); } +
--- a/liboctave/wrappers/areadlink-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/areadlink-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -35,3 +35,4 @@ #endif #endif +
--- a/liboctave/wrappers/async-system-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/async-system-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -85,3 +85,4 @@ return retval; } +
--- a/liboctave/wrappers/async-system-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/async-system-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #endif #endif +
--- a/liboctave/wrappers/base64-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/base64-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -45,3 +45,4 @@ { return base64_decode_alloc (in, inlen, out, outlen); } +
--- a/liboctave/wrappers/base64-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/base64-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -39,3 +39,4 @@ #endif #endif +
--- a/liboctave/wrappers/canonicalize-file-name-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/canonicalize-file-name-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -38,3 +38,4 @@ { return canonicalize_file_name (name); } +
--- a/liboctave/wrappers/canonicalize-file-name-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/canonicalize-file-name-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/dirent-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/dirent-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -81,3 +81,4 @@ { return NAME_MAX; } +
--- a/liboctave/wrappers/dirent-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/dirent-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -46,3 +46,4 @@ #endif #endif +
--- a/liboctave/wrappers/fcntl-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/fcntl-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -194,3 +194,4 @@ return -1; #endif } +
--- a/liboctave/wrappers/fcntl-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/fcntl-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -68,3 +68,4 @@ #endif #endif +
--- a/liboctave/wrappers/filepos-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/filepos-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -44,3 +44,4 @@ { return ftello (fp); } +
--- a/liboctave/wrappers/filepos-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/filepos-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -44,3 +44,4 @@ #endif #endif +
--- a/liboctave/wrappers/fpucw-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/fpucw-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -71,3 +71,4 @@ { END_LONG_DOUBLE_ROUNDING (); } +
--- a/liboctave/wrappers/fpucw-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/fpucw-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -40,3 +40,4 @@ #endif #endif +
--- a/liboctave/wrappers/gen-tempname-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/gen-tempname-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return gen_tempname (tmpl, 0, 0, GT_NOCREATE); } +
--- a/liboctave/wrappers/gen-tempname-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/gen-tempname-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/getopt-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/getopt-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -113,3 +113,4 @@ { return optind; } +
--- a/liboctave/wrappers/glob-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/glob-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -108,3 +108,4 @@ { return FNM_PERIOD; } +
--- a/liboctave/wrappers/hash-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/hash-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -94,3 +94,4 @@ { return sha512_buffer (buf, len, res); } +
--- a/liboctave/wrappers/hash-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/hash-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -65,3 +65,4 @@ #endif #endif +
--- a/liboctave/wrappers/math-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/math-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -44,3 +44,4 @@ { return frexpf (x, expptr); } +
--- a/liboctave/wrappers/math-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/math-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -38,3 +38,4 @@ #endif #endif +
--- a/liboctave/wrappers/mkostemp-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/mkostemp-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -38,3 +38,4 @@ { return mkostemp (tmpl, O_BINARY); } +
--- a/liboctave/wrappers/mkostemp-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/mkostemp-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/nanosleep-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/nanosleep-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -38,3 +38,4 @@ { return nanosleep (requested, remaining); } +
--- a/liboctave/wrappers/nanosleep-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/nanosleep-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #endif #endif +
--- a/liboctave/wrappers/nproc-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/nproc-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -55,3 +55,4 @@ return num_processors (query); } +
--- a/liboctave/wrappers/nproc-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/nproc-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -42,3 +42,4 @@ #endif #endif +
--- a/liboctave/wrappers/octave-popen2.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/octave-popen2.c Mon Aug 29 11:09:25 2016 -0700 @@ -237,3 +237,4 @@ } #endif +
--- a/liboctave/wrappers/octave-popen2.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/octave-popen2.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #endif #endif +
--- a/liboctave/wrappers/putenv-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/putenv-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return putenv (str); } +
--- a/liboctave/wrappers/putenv-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/putenv-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/set-program-name-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/set-program-name-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -40,3 +40,4 @@ // Let gnulib strip off things like the "lt-" prefix from libtool. return program_name; } +
--- a/liboctave/wrappers/set-program-name-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/set-program-name-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/signal-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/signal-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -494,3 +494,4 @@ { return raise (signum); } +
--- a/liboctave/wrappers/signal-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/signal-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -73,3 +73,4 @@ #endif #endif +
--- a/liboctave/wrappers/stat-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/stat-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -239,3 +239,4 @@ return false; #endif } +
--- a/liboctave/wrappers/stat-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/stat-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -80,3 +80,4 @@ #endif #endif +
--- a/liboctave/wrappers/strdup-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strdup-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return strdup (str); } +
--- a/liboctave/wrappers/strdup-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strdup-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/strftime-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strftime-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -40,3 +40,4 @@ { return nstrftime (buf, len, fmt, t, tz, ns); } +
--- a/liboctave/wrappers/strftime-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strftime-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -42,3 +42,4 @@ #endif #endif +
--- a/liboctave/wrappers/strmode-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strmode-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { strmode (mode, buffer); } +
--- a/liboctave/wrappers/strmode-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strmode-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #endif #endif +
--- a/liboctave/wrappers/strptime-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strptime-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return strptime (p, fmt, t); } +
--- a/liboctave/wrappers/strptime-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/strptime-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -35,3 +35,4 @@ #endif #endif +
--- a/liboctave/wrappers/time-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/time-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -152,3 +152,4 @@ { return mktime (tp); } +
--- a/liboctave/wrappers/time-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/time-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -57,3 +57,4 @@ #endif +
--- a/liboctave/wrappers/tmpfile-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/tmpfile-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return tmpfile (); } +
--- a/liboctave/wrappers/tmpfile-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/tmpfile-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -43,3 +43,4 @@ #endif #endif +
--- a/liboctave/wrappers/uname-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/uname-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -61,3 +61,4 @@ return err; } +
--- a/liboctave/wrappers/uname-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/uname-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -36,3 +36,4 @@ #endif #endif +
--- a/liboctave/wrappers/unistd-wrappers.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/unistd-wrappers.c Mon Aug 29 11:09:25 2016 -0700 @@ -447,3 +447,4 @@ return false; #endif } +
--- a/liboctave/wrappers/unistd-wrappers.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/unistd-wrappers.h Mon Aug 29 11:09:25 2016 -0700 @@ -106,3 +106,4 @@ #endif #endif +
--- a/liboctave/wrappers/unsetenv-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/unsetenv-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return unsetenv (name); } +
--- a/liboctave/wrappers/unsetenv-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/unsetenv-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +
--- a/liboctave/wrappers/vasprintf-wrapper.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/vasprintf-wrapper.c Mon Aug 29 11:09:25 2016 -0700 @@ -37,3 +37,4 @@ { return vasprintf (buf, fmt, args); } +
--- a/liboctave/wrappers/vasprintf-wrapper.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/vasprintf-wrapper.h Mon Aug 29 11:09:25 2016 -0700 @@ -41,3 +41,4 @@ #endif #endif +
--- a/liboctave/wrappers/wait-for-input.c Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/wait-for-input.c Mon Aug 29 11:09:25 2016 -0700 @@ -56,3 +56,4 @@ return retval; } +
--- a/liboctave/wrappers/wait-for-input.h Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/wrappers/wait-for-input.h Mon Aug 29 11:09:25 2016 -0700 @@ -34,3 +34,4 @@ #endif #endif +