Mercurial > octave
diff libinterp/corefcn/qz.cc @ 21724:aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
* configure.ac, Doxyfile.in, make_int.cc, Backend.cc, BaseControl.cc,
ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc,
ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc,
GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc,
MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc,
ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc,
PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc,
SliderControl.cc, TextControl.cc, TextEdit.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, __init_qt__.cc,
annotation-dialog.cc, gl-select.cc, module.mk, color-picker.cc,
dialog.cc, documentation-dock-widget.cc, files-dock-widget.cc,
find-files-dialog.cc, find-files-model.cc, history-dock-widget.cc,
liboctgui-build-info.in.cc, file-editor-tab.cc, file-editor.cc,
find-dialog.cc, marker.cc, marker.h, octave-qscintilla.cc,
octave-txt-lexer.cc, main-window.cc, octave-cmd.cc,
octave-dock-widget.cc, octave-gui.cc, octave-interpreter.cc,
octave-qt-link.cc, parser.cc, webinfo.cc, resource-manager.cc,
settings-dialog.cc, shortcut-manager.cc, terminal-dock-widget.cc,
thread-manager.cc, welcome-wizard.cc, workspace-model.cc,
workspace-view.cc, build-env.in.cc, Cell.cc, __contourc__.cc,
__dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc,
__lin_interpn__.cc, __luinc__.cc, __magick_read__.cc,
__pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc,
bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h,
cdisplay.c, cdisplay.h, cellfun.cc, coct-hdf5-types.c, colloc.cc,
comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defaults.in.h, defun.cc, det.cc, dirfns.cc,
display.cc, dlmread.cc, dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc,
error.cc, errwarn.cc, event-queue.cc, fft.cc, fft2.cc, fftn.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, gammainc.cc,
gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
gl-render.cc, gl2ps-print.cc, graphics.cc, gripes.cc, hash.cc,
help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-ir.cc, jit-ir.h,
jit-typeinfo.cc, jit-typeinfo.h, jit-util.cc, jit-util.h, kron.cc,
load-path.cc, load-save.cc, lookup.cc, ls-ascii-helper.cc,
ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc,
ls-oct-binary.cc, ls-oct-text.cc, ls-oct-text.h, ls-utils.cc,
lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mex.h,
mexproto.h, mgorth.cc, nproc.cc, oct-errno.in.cc, oct-fstrm.cc,
oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-iostrm.cc,
oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc,
oct-stdstrm.h, oct-stream.cc, oct-strstrm.cc, oct-tex-lexer.in.ll,
oct-tex-parser.in.yy, octave-link.cc, ordschur.cc, pager.cc,
pinv.cc, pr-output.cc, procstream.cc, profiler.cc, psi.cc,
pt-jit.cc, pt-jit.h, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc,
regexp.cc, schur.cc, sighandlers.cc, sighandlers.h, siglist.c,
siglist.h, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc,
sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, text-renderer.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, txt-eng.cc, typecast.cc,
urlwrite.cc, utils.cc, variables.cc, xdiv.cc, xgl2ps.c, xnorm.cc,
xpow.cc, zfstream.cc, zfstream.h, __delaunayn__.cc, __eigs__.cc,
__fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc,
audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc,
convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc,
liboctinterp-build-info.in.cc, mkbuiltins, mkops, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc,
ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-classdef.cc, ov-colon.cc,
ov-complex.cc, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc,
ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc,
ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc,
ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ovl.cc, octave.cc, octave.h,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cdm-cm.cc, op-cdm-dm.cc,
op-cdm-m.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cdm.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-dm.cc, op-cm-m.cc, op-cm-s.cc,
op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc,
op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-cdm.cc, op-dm-cm.cc,
op-dm-dm.cc, op-dm-m.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-double-conv.cc,
op-fcdm-fcdm.cc, op-fcdm-fcm.cc, op-fcdm-fdm.cc, op-fcdm-fm.cc,
op-fcm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fdm.cc,
op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fcdm.cc, op-fdm-fcm.cc,
op-fdm-fdm.cc, op-fdm-fm.cc, op-float-conv.cc, op-fm-fcdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fdm.cc, op-fm-fm.cc, op-fm-fs.cc,
op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc,
op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.cc, op-m-cdm.cc, op-m-cm.cc, op-m-cs.cc, op-m-dm.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc,
op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc,
op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc,
op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc,
op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc,
op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc,
lex.ll, oct-parse.in.yy, pt-arg-list.cc, pt-array-list.cc,
pt-assign.cc, pt-binop.cc, pt-bp.cc, pt-cbinop.cc, pt-cell.cc,
pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc, pt-const.cc,
pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc,
pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc,
pt-loop.h, pt-mat.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc,
pt-stmt.cc, pt-unop.cc, pt.cc, token.cc, Array-jit.cc, Array-tc.cc,
version.cc, 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-voidp.cc, Array.cc,
CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc,
CRowVector.cc, CSparse.cc, MArray-C.cc, MArray-d.cc, MArray-f.cc,
MArray-fC.cc, MArray-i.cc, MArray-s.cc, MSparse-C.cc, MSparse-d.cc,
MatrixType.cc, PermMatrix.cc, Range.cc, Sparse-C.cc, Sparse-b.cc,
Sparse-d.cc, boolMatrix.cc, boolNDArray.cc, boolSparse.cc,
chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc,
dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dim-vector.cc,
dim-vector.h, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc,
fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc,
fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc,
int16NDArray.cc, int32NDArray.cc, int64NDArray.cc, int8NDArray.cc,
uint16NDArray.cc, uint32NDArray.cc, uint64NDArray.cc,
uint8NDArray.cc, Faddeeva.cc, 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.in.cc, CollocWt.cc, DASPK.cc, DASRT.cc,
DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, aepbalance.cc,
chol.cc, eigs-base.cc, fEIG.cc, gepbalance.cc, hess.cc,
lo-mappers.cc, lo-specfun.cc, lu.cc, oct-convn.cc, oct-fftw.cc,
oct-norm.cc, oct-rand.cc, oct-spparms.cc, qr.cc, qrp.cc,
randmtzig.cc, randpoisson.cc, schur.cc, sparse-chol.cc,
sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, svd.cc, mk-ops.awk,
mx-defs.h, dir-ops.cc, file-ops.cc, file-stat.cc, lo-sysdep.cc,
mach-info.cc, oct-env.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, oct-time.cc, oct-uname.cc, pathlen.h, syswait.h,
cmd-edit.cc, cmd-hist.cc, data-conv.cc, f2c-main.c, glob-match.cc,
kpse.cc, lo-array-errwarn.cc, lo-array-gripes.cc, lo-cutils.c,
lo-cutils.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-utils.cc,
oct-base64.cc, oct-glob.cc, oct-inttypes.cc, oct-inttypes.h,
oct-locbuf.cc, oct-mutex.cc, oct-rl-edit.c, oct-rl-edit.h,
oct-rl-hist.c, oct-rl-hist.h, oct-shlib.cc, oct-sort.cc,
pathsearch.cc, singleton-cleanup.cc, sparse-sort.cc, sparse-util.cc,
statdefs.h, str-vec.cc, unwind-prot.cc, url-transfer.cc,
acinclude.m4, display-available.c, display-available.h, main-cli.cc,
main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.in.cc,
octave-config.in.cc, shared-fcns.h:
Use "#if ..." consistently instead of "#ifdef" and "#ifndef".
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 17 May 2016 12:09:30 -0400 |
parents | 6c2fd62db1f7 |
children | b571fc85953f |
line wrap: on
line diff
--- a/libinterp/corefcn/qz.cc Tue May 17 11:32:53 2016 -0400 +++ b/libinterp/corefcn/qz.cc Tue May 17 12:09:30 2016 -0400 @@ -28,7 +28,7 @@ #undef DEBUG_SORT #undef DEBUG_EIG -#ifdef HAVE_CONFIG_H +#if defined (HAVE_CONFIG_H) # include "config.h" #endif @@ -259,7 +259,7 @@ else retval = (fabs (p) < 1 ? 1 : -1); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: fin: retval=" << retval << std::endl; #endif @@ -374,7 +374,7 @@ { int nargin = args.length (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: nargin = " << nargin << ", nargout = " << nargout << std::endl; #endif @@ -385,7 +385,7 @@ if (nargin == 3 && (nargout < 3 || nargout > 4)) error ("qz: invalid number of output arguments for form [3] call"); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: determine ordering option" << std::endl; #endif @@ -413,7 +413,7 @@ safmin F77_CHAR_ARG_LEN (1)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: initial value of safmin=" << setiosflags (std::ios::scientific) << safmin << std::endl; @@ -423,7 +423,7 @@ // for these, use eps instead to avoid problems in dlag2. if (safmin == 0) { -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: DANGER WILL ROBINSON: safmin is 0!" << std::endl; #endif @@ -431,7 +431,7 @@ safmin F77_CHAR_ARG_LEN (1)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: safmin set to " << setiosflags (std::ios::scientific) << safmin << std::endl; @@ -439,14 +439,14 @@ } } -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: check argument 1" << std::endl; #endif // Argument 1: check if it's o.k. dimensioned. octave_idx_type nn = args(0).rows (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "argument 1 dimensions: (" << nn << "," << args(0).columns () << ")" << std::endl; @@ -478,7 +478,7 @@ else aa = args(0).matrix_value (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: check argument 2" << std::endl; #endif @@ -528,7 +528,7 @@ if (complex_case) { -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: performing balancing; CQ=" << std::endl << CQ << std::endl; @@ -554,7 +554,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: performing balancing; QQ=" << std::endl << QQ << std::endl; @@ -582,7 +582,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; #endif @@ -599,7 +599,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compz == 'V') std::cout << "qz: balancing done; ZZ=" << std::endl << ZZ << std::endl; #endif @@ -674,27 +674,27 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: peforming qr decomposition of bb" << std::endl; #endif // Compute the QR factorization of bb. qr<Matrix> bqr (bb); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: qr (bb) done; now peforming qz decomposition" << std::endl; #endif bb = bqr.R (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: extracted bb" << std::endl; #endif aa = (bqr.Q ()).transpose () * aa; -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: updated aa " << std::endl; std::cout << "bqr.Q () = " << std::endl << bqr.Q () << std::endl; @@ -705,11 +705,11 @@ if (compq == 'V') QQ = QQ * bqr.Q (); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: precursors done..." << std::endl; #endif -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: compq = " << compq << ", compz = " << compz << std::endl; #endif @@ -750,7 +750,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compq == 'V') std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; @@ -768,7 +768,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); -#ifdef DEBUG +#if defined (DEBUG) if (compz == 'V') std::cout << "qz: balancing done; ZZ=" << std::endl << ZZ << std::endl; @@ -784,7 +784,7 @@ // Probably not needed, but better be safe. error ("qz: cannot re-order complex qz decomposition"); -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: ordering eigenvalues: ord_job = " << ord_job << std::endl; #endif @@ -830,7 +830,7 @@ double eps = std::numeric_limits<double>::epsilon () * inf_norm * nn; -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: calling dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -857,7 +857,7 @@ ZZ.fortran_vec (), sort_test, eps, ndim, fail, ind.fortran_vec ())); -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -876,7 +876,7 @@ jj = 0; while (jj < nn) { -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "computing gen eig #" << jj << std::endl; #endif @@ -892,7 +892,7 @@ if (zcnt == 1) { // Real zero. -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << " single gen eig:" << std::endl; std::cout << " alphar(" << jj << ") = " << aa(jj,jj) << std::endl; @@ -908,7 +908,7 @@ else { // Complex conjugate pair. -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "qz: calling dlag2:" << std::endl; std::cout << "safmin=" << setiosflags (std::ios::scientific) @@ -936,7 +936,7 @@ (aa_ptr, nn, bb_ptr, nn, safmin, scale1, scale2, wr1, wr2, wi)); -#ifdef DEBUG_EIG +#if defined (DEBUG_EIG) std::cout << "dlag2 returns: scale1=" << scale1 << "\tscale2=" << scale2 << std::endl << "\twr1=" << wr1 << "\twr2=" << wr2 @@ -965,7 +965,7 @@ jj += zcnt; } -#ifdef DEBUG_SORT +#if defined (DEBUG_SORT) std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); std::cout << std::endl << "bb=" << std::endl; @@ -1010,7 +1010,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: computing generalized eigenvalues" << std::endl; #endif @@ -1061,7 +1061,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: computing generalized eigenvectors" << std::endl; #endif @@ -1146,7 +1146,7 @@ case 4: if (nargin == 3) { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: sort: retval(3) = gev = " << std::endl; octave_print_internal (std::cout, gev); std::cout << std::endl; @@ -1181,7 +1181,7 @@ { if (complex_case) { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(1) = cbb = " << std::endl; octave_print_internal (std::cout, cbb, 0); std::cout << std::endl << "qz: retval(0) = caa = " <<std::endl; @@ -1193,7 +1193,7 @@ } else { -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(1) = bb = " << std::endl; octave_print_internal (std::cout, bb, 0); std::cout << std::endl << "qz: retval(0) = aa = " <<std::endl; @@ -1208,7 +1208,7 @@ case 1: case 0: -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: retval(0) = gev = " << gev << std::endl; #endif retval(0) = gev; @@ -1219,7 +1219,7 @@ break; } -#ifdef DEBUG +#if defined (DEBUG) std::cout << "qz: exiting (at long last)" << std::endl; #endif