octave: libinterp/corefcn/__contourc_

annotate libinterp/corefcn/contourc.cc @ 30564:796f54d4ddbf stable

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2021. In all .txi and .texi files except gpl.txi and gpl.texi in the doc/liboctave and doc/interpreter directories, change the copyright to "Octave Project Developers", the same as used for other source files. Update copyright notices for 2022 (not done since 2019). For gpl.txi and gpl.texi, change the copyright notice to be "Free Software Foundation, Inc." and leave the date at 2007 only because this file only contains the text of the GPL, not anything created by the Octave Project Developers. Add Paul Thomas to contributors.in.

author	John W. Eaton <jwe@octave.org>
date	Tue, 28 Dec 2021 18:22:40 -0500
parents	7d6709900da7
children	e88a07dec498

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Contour lines for function evaluated on a grid.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 29961 diff changeset	5 // Copyright (C) 2001-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Adapted to an oct file from the stand alone contourl by Victro Munoz
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // Copyright (C) 2004 Victor Munoz
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // Based on contour plot routine (plcont.c) in PLPlot package
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 // http://plplot.org/
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // Copyright (C) 1995, 2000, 2001 Maurice LeBrun
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // Copyright (C) 2000, 2002 Joao Cardoso
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // Copyright (C) 2000, 2001, 2002, 2004 Alan W. Irwin
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 // Copyright (C) 2004 Andrew Ross
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	25 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	26 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	27 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	28 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	29 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	30 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	31 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	32 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	33 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	34 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	35 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	36 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	37 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	38 ////////////////////////////////////////////////////////////////////////
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	39
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21562 diff changeset	40 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	41 # include "config.h"
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	42 #endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	43
23455 73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files Rik <rik@octave.org> parents: 23220 diff changeset	44 #include <limits>
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	45
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	46 #include "defun.h"
23455 73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files Rik <rik@octave.org> parents: 23220 diff changeset	47 #include "ov.h"
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	48
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	49 OCTAVE_NAMESPACE_BEGIN
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	50
20802 8bb38ba1bad6 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20667 diff changeset	51 // FIXME: this looks like trouble...
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	52 static Matrix this_contour;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	53 static Matrix contourc;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	54 static int elem;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	55
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	56 // This is the quanta in which we increase this_contour.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	57 #define CONTOUR_QUANT 50
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	58
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	59 // Add a coordinate point (x,y) to this_contour.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	60 static void
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	61 add_point (double x, double y)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	62 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	63 if (elem % CONTOUR_QUANT == 0)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	64 this_contour = this_contour.append (Matrix (2, CONTOUR_QUANT, 0));
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	65
29278 7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	66 this_contour(0, elem) = x;
7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	67 this_contour(1, elem) = y;
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	68 elem++;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	69 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	70
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	71 // Add contents of current contour to contourc.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	72 // this_contour.cols () - 1;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	73 static void
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	74 end_contour (void)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	75 {
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	76 if (elem > 2)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	77 {
29278 7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	78 this_contour(1, 0) = elem - 1;
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	79 contourc = contourc.append (this_contour.extract_n (0, 0, 2, elem));
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	80 }
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	81
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	82 this_contour = Matrix ();
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	83 elem = 0;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	84 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	85
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	86 // Start a new contour, and add contents of current one to contourc.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	87
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	88 static void
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	89 start_contour (double lvl, double x, double y)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	90 {
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	91 end_contour ();
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	92 this_contour.resize (2, 0);
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	93 add_point (lvl, 0);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	94 add_point (x, y);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	95 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	96
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	97 static void
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	98 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	99 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	100 unsigned int start_edge, bool first, charMatrix& mark)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	101 {
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	102 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	103 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	104
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	105 // 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	106 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	107 && 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	108 {
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	109
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	110 //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	111 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	112 px[1] = px[2] = X(c+1);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	113
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	114 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	115 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	116
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	117 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	118 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	119 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	120 pz[0] = Z(r, c) - lvl;
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	121
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	122 // 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	123 //
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	124 // 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	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 1
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	127 // \| \| \| \|
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	128 // 3-----2 .-2-.
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	129
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	130 // 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	131 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	132
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	133 // 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	134 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	135 {
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	136 // 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	137 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	138 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	139 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	140 }
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	141
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	142 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	143 break;
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	144
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	145 // 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	146 mark(r, c) -= static_cast<char> (1 << start_edge);
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	147
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	148 // 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	149 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	150 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	151
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	152 // 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	153 if (first)
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	154 {
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	155 tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	156
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	157 if (math::isnan (tmp))
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	158 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	159 else
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	160 {
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	161 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	162 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	163 }
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	164
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	165 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	166 first = false;
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	167 }
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	168
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	169 // Find stop edge.
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	170 // 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	171 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	172 {
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	173 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	174 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	175 else
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	176 stop_edge = (start_edge - k) % 4;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	177
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	178 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	179 break;
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	180 }
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	181
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	182 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	183 pt[1] = (pt[0] + 1) % 4;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	184 tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	185
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	186 if (math::isnan (tmp))
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	187 ct_x = ct_y = 0.5;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	188 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	189 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	190 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	191 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	192 }
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	193
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	194 // 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	195 add_point (ct_x, ct_y);
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	196
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	197 // 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	198 mark(r, c) -= static_cast<char> (1 << stop_edge);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	199
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	200 // 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	201 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	202 r--;
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 == 1)
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	204 c++;
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 == 2)
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	206 r++;
704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	207 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	208 c--;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	209
15867 704e15f8fecd Modify contourc recursion to a loop to avoid stack overflow (bug #37891) Mike Miller <mtmiller@ieee.org> parents: 15220 diff changeset	210 // 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	211 start_edge = (stop_edge + 2) % 4;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	212
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	213 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	214 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	215
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	216 static void
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	217 mark_facets (const Matrix& Z, charMatrix& mark, double lvl)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	218 {
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	219 unsigned int nr = mark.rows ();
7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	220 unsigned int nc = mark.cols ();
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	221
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	222 double f[4];
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	223
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	224 for (unsigned int c = 0; c < nc; c++)
7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	225 for (unsigned int r = 0; r < nr; r++)
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	226 {
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	227 f[0] = Z(r, c) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	228 f[1] = Z(r, c+1) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	229 f[3] = Z(r+1, c) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	230 f[2] = Z(r+1, c+1) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	231
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	232 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	233 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	234 f[i] = std::numeric_limits<double>::epsilon ();
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	235
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	236 if (f[1] * f[2] < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	237 mark(r, c) += 2;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	238
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	239 if (f[0] * f[3] < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	240 mark(r, c) += 8;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	241 }
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	242
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	243 for (unsigned int r = 0; r < nr; r++)
7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	244 for (unsigned int c = 0; c < nc; c++)
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	245 {
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	246 f[0] = Z(r, c) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	247 f[1] = Z(r, c+1) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	248 f[3] = Z(r+1, c) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	249 f[2] = Z(r+1, c+1) - lvl;
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	250
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	251 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	252 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	253 f[i] = std::numeric_limits<double>::epsilon ();
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	254
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	255 if (f[0] * f[1] < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	256 mark(r, c) += 1;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	257
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	258 if (f[2] * f[3] < 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	259 mark(r, c) += 4;
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	260 }
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	261 }
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	262
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	263 static void
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	264 cntr (const RowVector& X, const RowVector& Y, const Matrix& Z, double lvl)
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	265 {
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	266 unsigned int nr = Z.rows ();
7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	267 unsigned int nc = Z.cols ();
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	268
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	269 charMatrix mark (nr - 1, nc - 1, 0);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	270
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	271 mark_facets (Z, mark, lvl);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	272
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	273 // Find contours that start at a domain edge.
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	274
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	275 for (unsigned int c = 0; c < nc - 1; c++)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	276 {
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	277 // Top.
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	278 if (mark(0, c) & 1)
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	279 drawcn (X, Y, Z, lvl, 0, c, 0.0, 0.0, 0, true, mark);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	280
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	281 // Bottom.
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	282 if (mark(nr - 2, c) & 4)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 8920 diff changeset	283 drawcn (X, Y, Z, lvl, nr - 2, c, 0.0, 0.0, 2, true, mark);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	284 }
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	285
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	286 for (unsigned int r = 0; r < nr - 1; r++)
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	287 {
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	288 // Left.
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	289 if (mark(r, 0) & 8)
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	290 drawcn (X, Y, Z, lvl, r, 0, 0.0, 0.0, 3, true, mark);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	291
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	292 // Right.
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	293 if (mark(r, nc - 2) & 2)
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	294 drawcn (X, Y, Z, lvl, r, nc - 2, 0.0, 0.0, 1, true, mark);
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	295 }
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	296
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	297 for (unsigned int r = 0; r < nr - 1; r++)
7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7042 diff changeset	298 for (unsigned int c = 0; c < nc - 1; c++)
7042 e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	299 if (mark (r, c) > 0)
e54cc03d53f6 [project @ 2007-10-19 20:43:32 by jwe] jwe parents: 7017 diff changeset	300 drawcn (X, Y, Z, lvl, r, c, 0.0, 0.0, 255, true, mark);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	301 }
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	302
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	303
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	304 DEFUN (__contourc__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21782 diff changeset	305 doc: /* -- texinfo --
29278 7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	306 @deftypefn {} {@var{c} =} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels})
7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	307 Calculate Z-level contours (isolines).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21782 diff changeset	308 @end deftypefn */)
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	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++)
29278 7bfc454b9e08 contourc.m: Overhaul function. Rik <rik@octave.org> parents: 27923 diff changeset	318 cntr (X, Y, Z, L(i));
20802 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 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: diff changeset	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 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	329
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	330 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/corefcn/__contourc__.cc @ 30564:796f54d4ddbf stable

annotate libinterp/corefcn/contourc.cc @ 30564:796f54d4ddbf stable