Mercurial > octave
annotate libinterp/corefcn/__contourc__.cc @ 21301:40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
* mk-octave-config-h.sh, mk-opts.pl, 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, ToolBarButton.cc, __init_qt__.cc,
annotation-dialog.cc, gl-select.cc, module.mk, kpty.cpp, 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,
file-editor-tab.cc, file-editor-tab.h, file-editor.cc, find-dialog.cc,
marker.cc, 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-features.sh, build-env.in.cc, Cell.cc, __contourc__.cc,
__dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc,
__pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc,
bsxfun.cc, c-file-ptr-stream.cc, cdisplay.c, 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, 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, hook-fcn.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc,
jit-util.cc, 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-utils.cc, lsode.cc, lu.cc, luinc.cc,
mappers.cc, matrix_type.cc, max.cc, mex.cc, mgorth.cc, nproc.cc,
oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hist.cc, oct-iostrm.cc,
oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, 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, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc,
schur.cc, sighandlers.cc, siglist.c, 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,
__delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.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,
mkbuiltins, mkops, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, 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.cc, ovl.cc, octave.cc, 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-cell.cc,
op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.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-dm.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-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.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-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.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-cm.cc, op-m-cs.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-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-os.cc, Array-sym.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, DiagArray2.cc, MArray-C.cc,
MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc, MArray-s.cc, MArray.cc,
MDiagArray2.cc, MSparse-C.cc, MSparse-d.cc, MatrixType.cc, PermMatrix.cc,
Range.cc, Sparse-C.cc, Sparse-b.cc, Sparse-d.cc, Sparse.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, 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, intNDArray.cc, uint16NDArray.cc,
uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc, blaswrap.c, cquit.c,
f77-extern.cc, f77-fcn.c, lo-error.c, quit.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, randgamma.c, randmtzig.c, randpoisson.c, schur.cc,
sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, svd.cc,
mk-ops.awk, 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, 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-ieee.cc, lo-regexp.cc, lo-utils.cc, oct-base64.cc, oct-glob.cc,
oct-inttypes.cc, oct-locbuf.cc, oct-mutex.cc, oct-rl-edit.c, oct-rl-hist.c,
oct-shlib.cc, oct-sort.cc, pathsearch.cc, singleton-cleanup.cc, sparse-sort.cc,
sparse-util.cc, str-vec.cc, unwind-prot.cc, url-transfer.cc,
display-available.c, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc,
octave-config.in.cc:
Use '#include "config.h"' rather than <config.h>.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 18 Feb 2016 13:34:50 -0800 |
| parents | fcac5dbbf9ed |
| children | 6c2fd62db1f7 |
| rev | line source |
|---|---|
| 6257 | 1 /* Contour lines for function evaluated on a grid. |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
18112
diff
changeset
|
3 Copyright (C) 2007-2015 Kai Habel |
| 7017 | 4 Copyright (C) 2004, 2007 Shai Ayal |
| 6257 | 5 |
| 6 Adapted to an oct file from the stand alone contourl by Victro Munoz | |
| 7 Copyright (C) 2004 Victor Munoz | |
| 8 | |
| 9 Based on contour plot routine (plcont.c) in PLPlot package | |
| 10 http://plplot.org/ | |
| 11 | |
| 12 Copyright (C) 1995, 2000, 2001 Maurice LeBrun | |
| 13 Copyright (C) 2000, 2002 Joao Cardoso | |
| 14 Copyright (C) 2000, 2001, 2002, 2004 Alan W. Irwin | |
| 15 Copyright (C) 2004 Andrew Ross | |
| 16 | |
| 17 This file is part of Octave. | |
| 18 | |
| 19 Octave is free software; you can redistribute it and/or modify it | |
| 20 under the terms of the GNU General Public License as published by the | |
| 7016 | 21 Free Software Foundation; either version 3 of the License, or (at your |
| 22 option) any later version. | |
| 6257 | 23 |
| 24 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 25 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 26 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 27 for more details. | |
| 28 | |
| 29 You should have received a copy of the GNU General Public License | |
| 7016 | 30 along with Octave; see the file COPYING. If not, see |
| 31 <http://www.gnu.org/licenses/>. | |
| 6257 | 32 |
| 33 */ | |
| 34 | |
| 35 #ifdef HAVE_CONFIG_H | |
|
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
36 # include "config.h" |
| 6257 | 37 #endif |
| 38 | |
| 7042 | 39 #include <cfloat> |
| 40 | |
| 6257 | 41 #include "quit.h" |
| 42 | |
|
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
43 #include "defun.h" |
| 6257 | 44 #include "error.h" |
|
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
45 #include "ovl.h" |
| 6257 | 46 |
|
20802
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
47 // FIXME: this looks like trouble... |
| 6257 | 48 static Matrix this_contour; |
| 49 static Matrix contourc; | |
| 50 static int elem; | |
| 51 | |
| 7042 | 52 // This is the quanta in which we increase this_contour. |
| 6257 | 53 #define CONTOUR_QUANT 50 |
| 54 | |
| 7042 | 55 // Add a coordinate point (x,y) to this_contour. |
| 6257 | 56 |
| 57 static void | |
| 7042 | 58 add_point (double x, double y) |
| 6257 | 59 { |
| 60 if (elem % CONTOUR_QUANT == 0) | |
| 61 this_contour = this_contour.append (Matrix (2, CONTOUR_QUANT, 0)); | |
| 62 | |
| 63 this_contour (0, elem) = x; | |
| 64 this_contour (1, elem) = y; | |
| 65 elem++; | |
| 66 } | |
| 67 | |
| 7042 | 68 // Add contents of current contour to contourc. |
| 6257 | 69 // this_contour.cols () - 1; |
| 70 | |
| 71 static void | |
| 7042 | 72 end_contour (void) |
| 6257 | 73 { |
| 74 if (elem > 2) | |
| 75 { | |
| 76 this_contour (1, 0) = elem - 1; | |
| 77 contourc = contourc.append (this_contour.extract_n (0, 0, 2, elem)); | |
| 78 } | |
| 7042 | 79 |
| 6257 | 80 this_contour = Matrix (); |
| 81 elem = 0; | |
| 82 } | |
| 83 | |
| 7042 | 84 // Start a new contour, and add contents of current one to contourc. |
| 6257 | 85 |
| 86 static void | |
| 7042 | 87 start_contour (double lvl, double x, double y) |
| 6257 | 88 { |
| 7042 | 89 end_contour (); |
| 6257 | 90 this_contour.resize (2, 0); |
| 7042 | 91 add_point (lvl, 0); |
| 92 add_point (x, y); | |
| 6257 | 93 } |
| 94 | |
| 95 static void | |
| 7042 | 96 drawcn (const RowVector& X, const RowVector& Y, const Matrix& Z, |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
97 double lvl, int r, int c, double ct_x, double ct_y, |
|
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
98 unsigned int start_edge, bool first, charMatrix& mark) |
| 6257 | 99 { |
| 7042 | 100 double px[4], py[4], pz[4], tmp; |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
101 unsigned int stop_edge, pt[2]; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
102 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
103 // Continue while next facet is not done yet. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
104 while (r >= 0 && c >= 0 && r < mark.rows () && c < mark.cols () |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
105 && mark(r, c) > 0) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
106 { |
| 6257 | 107 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
108 //get x, y, and z - lvl for current facet |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
109 px[0] = px[3] = X(c); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
110 px[1] = px[2] = X(c+1); |
| 6257 | 111 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
112 py[0] = py[1] = Y(r); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
113 py[2] = py[3] = Y(r+1); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
114 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
115 pz[3] = Z(r+1, c) - lvl; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
116 pz[2] = Z(r+1, c + 1) - lvl; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
117 pz[1] = Z(r, c+1) - lvl; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
118 pz[0] = Z(r, c) - lvl; |
| 6257 | 119 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
120 // Facet edge and point naming assignment. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
121 // |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
122 // 0-----1 .-0-. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
123 // | | | | |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
124 // | | 3 1 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
125 // | | | | |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
126 // 3-----2 .-2-. |
| 6257 | 127 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
128 // Get mark value of current facet. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
129 char id = static_cast<char> (mark(r, c)); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
130 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
131 // Check startedge s. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
132 if (start_edge == 255) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
133 { |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
134 // Find start edge. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
135 for (unsigned int k = 0; k < 4; k++) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
136 if (static_cast<char> (1 << k) & id) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
137 start_edge = k; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
138 } |
| 6257 | 139 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
140 if (start_edge == 255) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
141 break; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
142 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
143 // Decrease mark value of current facet for start edge. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
144 mark(r, c) -= static_cast<char> (1 << start_edge); |
| 7042 | 145 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
146 // Next point (clockwise). |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
147 pt[0] = start_edge; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
148 pt[1] = (pt[0] + 1) % 4; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
149 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
150 // Calculate contour segment start if first of contour. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
151 if (first) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
152 { |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
153 tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]); |
| 6257 | 154 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
155 if (xisnan (tmp)) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
156 ct_x = ct_y = 0.5; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
157 else |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
158 { |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
159 ct_x = px[pt[0]] + (px[pt[1]] - px[pt[0]])/(1 + tmp); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
160 ct_y = py[pt[0]] + (py[pt[1]] - py[pt[0]])/(1 + tmp); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
161 } |
| 7042 | 162 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
163 start_contour (lvl, ct_x, ct_y); |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
164 first = false; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
165 } |
| 6257 | 166 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
167 // Find stop edge. |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
168 // FIXME: perhaps this should use a while loop? |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
169 for (unsigned int k = 1; k <= 4; k++) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
170 { |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
171 if (start_edge == 0 || start_edge == 2) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
172 stop_edge = (start_edge + k) % 4; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
173 else |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
174 stop_edge = (start_edge - k) % 4; |
| 7042 | 175 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
176 if (static_cast<char> (1 << stop_edge) & id) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
177 break; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
178 } |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
179 |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
180 pt[0] = stop_edge; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
181 pt[1] = (pt[0] + 1) % 4; |
| 7042 | 182 tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]); |
| 183 | |
| 184 if (xisnan (tmp)) | |
| 185 ct_x = ct_y = 0.5; | |
| 186 else | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
187 { |
|
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
188 ct_x = px[pt[0]] + (px[pt[1]] - px[pt[0]])/(1 + tmp); |
|
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
189 ct_y = py[pt[0]] + (py[pt[1]] - py[pt[0]])/(1 + tmp); |
|
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
190 } |
| 7042 | 191 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
192 // Add point to contour. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
193 add_point (ct_x, ct_y); |
| 7042 | 194 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
195 // Decrease id value of current facet for start edge. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
196 mark(r, c) -= static_cast<char> (1 << stop_edge); |
| 6257 | 197 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
198 // Find next facet. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
199 if (stop_edge == 0) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
200 r--; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
201 else if (stop_edge == 1) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
202 c++; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
203 else if (stop_edge == 2) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
204 r++; |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
205 else if (stop_edge == 3) |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
206 c--; |
| 7042 | 207 |
|
15867
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
208 // Go to next facet. |
|
704e15f8fecd
Modify contourc recursion to a loop to avoid stack overflow (bug #37891)
Mike Miller <mtmiller@ieee.org>
parents:
15220
diff
changeset
|
209 start_edge = (stop_edge + 2) % 4; |
| 7042 | 210 |
| 6257 | 211 } |
| 212 } | |
| 213 | |
| 214 static void | |
| 7042 | 215 mark_facets (const Matrix& Z, charMatrix& mark, double lvl) |
| 6257 | 216 { |
| 7070 | 217 unsigned int nr = mark.rows (); |
| 218 unsigned int nc = mark.cols (); | |
| 7042 | 219 |
| 220 double f[4]; | |
| 221 | |
| 7070 | 222 for (unsigned int c = 0; c < nc; c++) |
| 223 for (unsigned int r = 0; r < nr; r++) | |
| 7042 | 224 { |
| 225 f[0] = Z(r, c) - lvl; | |
| 226 f[1] = Z(r, c+1) - lvl; | |
| 227 f[3] = Z(r+1, c) - lvl; | |
| 228 f[2] = Z(r+1, c+1) - lvl; | |
| 229 | |
| 7070 | 230 for (unsigned int i = 0; i < 4; i++) |
|
15220
61822c866ba1
use std::numeric_limits<T>::epsilon in C++ code
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
231 if (fabs(f[i]) < std::numeric_limits<double>::epsilon ()) |
|
61822c866ba1
use std::numeric_limits<T>::epsilon in C++ code
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
232 f[i] = std::numeric_limits<double>::epsilon (); |
| 7042 | 233 |
| 234 if (f[1] * f[2] < 0) | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
235 mark(r, c) += 2; |
| 7042 | 236 |
| 237 if (f[0] * f[3] < 0) | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
238 mark(r, c) += 8; |
| 7042 | 239 } |
| 6257 | 240 |
| 7070 | 241 for (unsigned int r = 0; r < nr; r++) |
| 242 for (unsigned int c = 0; c < nc; c++) | |
| 7042 | 243 { |
| 244 f[0] = Z(r, c) - lvl; | |
| 245 f[1] = Z(r, c+1) - lvl; | |
| 246 f[3] = Z(r+1, c) - lvl; | |
| 247 f[2] = Z(r+1, c+1) - lvl; | |
| 248 | |
| 7070 | 249 for (unsigned int i = 0; i < 4; i++) |
|
15220
61822c866ba1
use std::numeric_limits<T>::epsilon in C++ code
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
250 if (fabs(f[i]) < std::numeric_limits<double>::epsilon ()) |
|
61822c866ba1
use std::numeric_limits<T>::epsilon in C++ code
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
251 f[i] = std::numeric_limits<double>::epsilon (); |
| 7042 | 252 |
| 253 if (f[0] * f[1] < 0) | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
254 mark(r, c) += 1; |
| 7042 | 255 |
| 256 if (f[2] * f[3] < 0) | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
257 mark(r, c) += 4; |
| 7042 | 258 } |
| 259 } | |
| 260 | |
| 261 static void | |
| 262 cntr (const RowVector& X, const RowVector& Y, const Matrix& Z, double lvl) | |
| 263 { | |
| 7070 | 264 unsigned int nr = Z.rows (); |
| 265 unsigned int nc = Z.cols (); | |
| 7042 | 266 |
| 267 charMatrix mark (nr - 1, nc - 1, 0); | |
| 268 | |
| 269 mark_facets (Z, mark, lvl); | |
| 270 | |
| 271 // Find contours that start at a domain edge. | |
| 272 | |
| 7070 | 273 for (unsigned int c = 0; c < nc - 1; c++) |
| 6257 | 274 { |
| 7042 | 275 // Top. |
| 276 if (mark(0, c) & 1) | |
| 277 drawcn (X, Y, Z, lvl, 0, c, 0.0, 0.0, 0, true, mark); | |
| 278 | |
| 279 // Bottom. | |
| 280 if (mark(nr - 2, c) & 4) | |
|
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
281 drawcn (X, Y, Z, lvl, nr - 2, c, 0.0, 0.0, 2, true, mark); |
| 6257 | 282 } |
| 7042 | 283 |
| 7070 | 284 for (unsigned int r = 0; r < nr - 1; r++) |
| 7042 | 285 { |
| 286 // Left. | |
| 287 if (mark(r, 0) & 8) | |
| 288 drawcn (X, Y, Z, lvl, r, 0, 0.0, 0.0, 3, true, mark); | |
| 289 | |
| 290 // Right. | |
| 291 if (mark(r, nc - 2) & 2) | |
| 292 drawcn (X, Y, Z, lvl, r, nc - 2, 0.0, 0.0, 1, true, mark); | |
| 293 } | |
| 294 | |
| 7070 | 295 for (unsigned int r = 0; r < nr - 1; r++) |
| 296 for (unsigned int c = 0; c < nc - 1; c++) | |
| 7042 | 297 if (mark (r, c) > 0) |
| 298 drawcn (X, Y, Z, lvl, r, c, 0.0, 0.0, 255, true, mark); | |
| 6257 | 299 } |
| 300 | |
|
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
301 DEFUN (__contourc__, args, , |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
302 "-*- texinfo -*-\n\ |
|
20853
1142cf6abc0d
2015 Code Sprint: remove class of function from docstring for all C++ files.
Rik <rik@octave.org>
parents:
20802
diff
changeset
|
303 @deftypefn {} {} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels})\n\ |
| 6945 | 304 Undocumented internal function.\n\ |
| 6257 | 305 @end deftypefn") |
| 306 { | |
|
20802
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
307 if (args.length () != 4) |
| 6257 | 308 print_usage (); |
| 309 | |
|
20802
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
310 RowVector X = args(0).row_vector_value (); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
311 RowVector Y = args(1).row_vector_value (); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
312 Matrix Z = args(2).matrix_value (); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
313 RowVector L = args(3).row_vector_value (); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
314 |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
315 contourc.resize (2, 0); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
316 |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
317 for (int i = 0; i < L.numel (); i++) |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
318 cntr (X, Y, Z, L (i)); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
319 |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
320 end_contour (); |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
321 |
|
8bb38ba1bad6
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20667
diff
changeset
|
322 return octave_value (contourc); |
| 6257 | 323 } |
|
12805
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
324 |
|
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
325 /* |
|
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
326 ## No test needed for internal helper function. |
|
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
327 %!assert (1) |
|
3641167e5b75
codesprint: *.cc helper functions do not need tests
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
328 */ |