octave: libinterp/dldfcn/__voronoi_

annotate libinterp/dldfcn/voronoi.cc @ 29517:78ccd8bf439c

Suppress extraneous error messages from Qhull (bug #57727). * __delaunayn__.cc (F__delaunay__): Pass a FILE pointer to "/dev/null" to Qhull library to use for stderr reporting. Pass a "nullptr" to Qhull library to use for stdout reporting which disables status messages. * __voronoi__.cc (F__voronoi__): Pass a "nullptr" to Qhull library to use for stdout reporting which disables status messages. Remove unnecessary code to open file to "/dev/null" and unwind_action to close said file at end of fcn. * convhulln.cc (Fconvhulln): Pass a "nullptr" to Qhull library to use for stdout reporting which disables status messages. Remove unnecessary code to open file to "/dev/null" and unwind_action to close said file at end of fcn.

author	Rik <rik@octave.org>
date	Fri, 09 Apr 2021 06:38:21 -0700
parents	7854d5752dd2
children	93c8df989ea0

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 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	3 // Copyright (C) 2000-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // 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	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
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 // 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	11 // 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	12 // 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	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // 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	16 // 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	17 // 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	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // 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	21 // 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	22 // <https://www.gnu.org/licenses/>.
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 ////////////////////////////////////////////////////////////////////////
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	25
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	26 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	27 20. Augiust 2000 - Kai Habel: first release
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	28 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	29
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	30 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	31 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	32 Added optional second argument to pass options to the underlying
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	33 qhull command
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	34 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	35
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	36 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	37 # include "config.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	38 #endif
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	39
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	40 #include <cstdio>
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	41
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	42 #include <limits>
a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	43 #include <string>
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	44
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	45 #include "Array.h"
a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	46 #include "boolMatrix.h"
a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	47 #include "dMatrix.h"
a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	48 #include "dRowVector.h"
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18077 diff changeset	49 #include "oct-locbuf.h"
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	50 #include "unwind-prot.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	51
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	52 #include "Cell.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	53 #include "defun-dld.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	54 #include "error.h"
21126 ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	55 #include "errwarn.h"
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 22755 diff changeset	56 #include "ov.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	57 #include "ovl.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	58
14043 f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13903 diff changeset	59 #if defined (HAVE_QHULL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	60
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	61 # include "oct-qhull.h"
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	62
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	63 # if defined (NEED_QHULL_VERSION)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	64 char qh_version[] = "__voronoi__.oct 2007-07-24";
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	65 # endif
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	66
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	67 static void
24260 0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	68 free_qhull_memory ()
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	69 {
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	70 qh_freeqhull (! qh_ALL);
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	71
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	72 int curlong, totlong;
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	73 qh_memfreeshort (&curlong, &totlong);
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	74
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	75 if (curlong \|\| totlong)
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	76 warning ("__voronoi__: did not free %d bytes of long memory (%d pieces)",
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	77 totlong, curlong);
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	78 }
0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	79
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	80 static bool
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	81 octave_qhull_dims_ok (octave_idx_type dim, octave_idx_type n, const char *who)
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	82 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	83 if (sizeof (octave_idx_type) > sizeof (int))
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	84 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	85 int maxval = std::numeric_limits<int>::max ();
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	86
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	87 if (dim > maxval \|\| n > maxval)
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	88 error ("%s: dimension too large for Qhull", who);
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	89 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	90
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	91 return true;
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	92 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	93
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	94 #endif
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	95
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	96 DEFUN_DLD (__voronoi__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	97 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	98 @deftypefn {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	99 @deftypefnx {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	100 @deftypefnx {} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	101 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	102 @end deftypefn */)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	103 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	104 #if defined (HAVE_QHULL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	105
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	106 int nargin = args.length ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	107
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	108 if (nargin < 2 \|\| nargin > 3)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	109 print_usage ();
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	110
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20579 diff changeset	111 std::string caller = args(0).xstring_value ("__voronoi__: CALLER must be a string");
13903 7b5da9754554 __voronoi__: avoid undeclared variable warning John W. Eaton <jwe@octave.org> parents: 13880 diff changeset	112
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	113 octave_value_list retval;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	114
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	115 Matrix points = args(1).matrix_value ();
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	116 const octave_idx_type dim = points.columns ();
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	117 const octave_idx_type num_points = points.rows ();
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	118
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	119 if (! octave_qhull_dims_ok (dim, num_points, "__voronoi__"))
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	120 return ovl (0.0);
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	121
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	122 points = points.transpose ();
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	123
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	124 std::string options;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	125
16343 dda043ccad7c __voronoi__.cc: Change QHull arguments for 4D inputs to match Matlab. Rik <rik@octave.org> parents: 15195 diff changeset	126 if (dim <= 3)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	127 options = " Qbb";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	128 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	129 options = " Qbb Qx";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	130
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	131 if (nargin == 3)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	132 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	133 octave_value opt_arg = args(2);
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	134
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	135 if (opt_arg.is_string ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23577 diff changeset	136 options = ' ' + opt_arg.string_value ();
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23575 diff changeset	137 else if (opt_arg.isempty ())
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	138 ; // Use default options.
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23220 diff changeset	139 else if (opt_arg.iscellstr ())
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	140 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	141 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	142
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	143 Array<std::string> tmp = opt_arg.cellstr_value ();
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	144
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	145 for (octave_idx_type i = 0; i < tmp.numel (); i++)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23577 diff changeset	146 options += ' ' + tmp(i);
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	147 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	148 else
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	149 error ("%s: OPTIONS must be a string, cell array of strings, or empty",
66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	150 caller.c_str ());
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	151 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	152
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	153 boolT ismalloc = false;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	154
29517 78ccd8bf439c Suppress extraneous error messages from Qhull (bug #57727). Rik <rik@octave.org> parents: 29359 diff changeset	155 // Set the outfile pointer to stdout for status information.
78ccd8bf439c Suppress extraneous error messages from Qhull (bug #57727). Rik <rik@octave.org> parents: 29359 diff changeset	156 FILE *outfile = nullptr;
6880 e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman] dbateman parents: 6823 diff changeset	157 FILE *errfile = stderr;
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	158
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	159 // qh_new_qhull command and points arguments are not const...
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	160 std::string cmd = "qhull v" + options;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	161
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	162 OCTAVE_LOCAL_BUFFER (char, cmd_str, cmd.length () + 1);
13203 b6aba5b4edb1 voronoin: accept options as a cell array of character strings John W. Eaton <jwe@octave.org> parents: 12805 diff changeset	163
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	164 strcpy (cmd_str, cmd.c_str ());
13203 b6aba5b4edb1 voronoin: accept options as a cell array of character strings John W. Eaton <jwe@octave.org> parents: 12805 diff changeset	165
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	166 int exitcode = qh_new_qhull (dim, num_points, points.fortran_vec (),
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	167 ismalloc, cmd_str, outfile, errfile);
24260 0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	168
28823 26cfccfee9a0 Replace unwind_protect with more efficient constructs (bug #59192). Rik <rik@octave.org> parents: 27923 diff changeset	169 octave::unwind_action free_memory ([] () { free_qhull_memory (); });
24260 0f2dc8d6c34d Eliminate possible segfaults related to not cleaning up Qhull workspace. Rik <rik@octave.org> parents: 23219 diff changeset	170
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	171 if (exitcode)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	172 error ("%s: qhull failed", caller.c_str ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	173
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	174 // Calling findgood_all provides the number of Voronoi vertices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	175 // (sets qh num_good).
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	176
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	177 qh_findgood_all (qh facet_list);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	178
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	179 octave_idx_type num_voronoi_regions
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	180 = qh num_vertices - qh_setsize (qh del_vertices);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	181
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	182 octave_idx_type num_voronoi_vertices = qh num_good;
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	183
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	184 // Find the voronoi centers for all facets.
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	185
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	186 qh_setvoronoi_all ();
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	187
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	188 facetT *facet;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	189 vertexT *vertex;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	190 octave_idx_type k;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	191
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	192 // Find the number of Voronoi vertices for each Voronoi cell and
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	193 // store them in NI so we can use them later to set the dimensions
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	194 // of the RowVector objects used to collect them.
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18077 diff changeset	195
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	196 FORALLfacets
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	197 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	198 facet->seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	199 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	200
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	201 OCTAVE_LOCAL_BUFFER (octave_idx_type, ni, num_voronoi_regions);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	202 for (octave_idx_type i = 0; i < num_voronoi_regions; i++)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	203 ni[i] = 0;
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18077 diff changeset	204
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	205 k = 0;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	206
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	207 FORALLvertices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	208 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	209 if (qh hull_dim == 3)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	210 qh_order_vertexneighbors (vertex);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	211
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	212 bool infinity_seen = false;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	213
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	214 facetT neighbor, *neighborp;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	215
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	216 FOREACHneighbor_ (vertex)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	217 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	218 if (neighbor->upperdelaunay)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	219 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	220 if (! infinity_seen)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	221 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	222 infinity_seen = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	223 ni[k]++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	224 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	225 }
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	226 else
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	227 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	228 neighbor->seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	229 ni[k]++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	230 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	231 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	232
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	233 k++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	234 }
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	235
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	236 // If Qhull finds fewer regions than points, we will pad the end
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	237 // of the at_inf and C arrays so that they always contain at least
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	238 // as many elements as the given points array.
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	239
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	240 // FIXME: is it possible (or does it make sense) for
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	241 // num_voronoi_regions to ever be larger than num_points?
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	242
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	243 octave_idx_type nr = (num_points > num_voronoi_regions
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	244 ? num_points : num_voronoi_regions);
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	245
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	246 boolMatrix at_inf (nr, 1, false);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	247
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	248 // The list of Voronoi vertices. The first element is always
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	249 // Inf.
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	250 Matrix F (num_voronoi_vertices+1, dim);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	251
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	252 for (octave_idx_type d = 0; d < dim; d++)
21723 bae585228161 use namespace for numeric_limits John W. Eaton <jwe@octave.org> parents: 21721 diff changeset	253 F(0,d) = octave::numeric_limits<double>::Inf ();
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	254
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	255 // The cell array of vectors of indices into F that represent the
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	256 // vertices of the Voronoi regions (cells).
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	257
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	258 Cell C (nr, 1);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	259
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	260 // Now loop through the list of vertices again and store the
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	261 // coordinates of the Voronoi vertices and the lists of indices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	262 // for the cells.
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	263
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	264 FORALLfacets
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	265 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	266 facet->seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	267 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	268
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	269 octave_idx_type i = 0;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	270 k = 0;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	271
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	272 FORALLvertices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	273 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	274 if (qh hull_dim == 3)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	275 qh_order_vertexneighbors (vertex);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	276
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	277 bool infinity_seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	278
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	279 octave_idx_type idx = qh_pointid (vertex->point);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	280
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	281 octave_idx_type num_vertices = ni[k++];
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	282
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	283 // Qhull seems to sometimes produces regions with a single
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	284 // vertex. Is that a bug? How can a region have just one
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	285 // vertex? Let's skip it.
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	286
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	287 if (num_vertices == 1)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	288 continue;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	289
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	290 RowVector facet_list (num_vertices);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	291
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	292 octave_idx_type m = 0;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	293
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	294 facetT neighbor, *neighborp;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	295
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	296 FOREACHneighbor_(vertex)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	297 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	298 if (neighbor->upperdelaunay)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	299 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	300 if (! infinity_seen)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	301 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	302 infinity_seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	303 facet_list(m++) = 1;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	304 at_inf(idx) = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	305 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	306 }
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	307 else
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	308 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	309 if (! neighbor->seen)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	310 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	311 i++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	312 for (octave_idx_type d = 0; d < dim; d++)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	313 F(i,d) = neighbor->center[d];
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	314
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	315 neighbor->seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	316 neighbor->visitid = i;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	317 }
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	318
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	319 facet_list(m++) = neighbor->visitid + 1;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	320 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	321 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	322
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	323 C(idx) = facet_list;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	324 }
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	325
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	326 retval = ovl (F, C, at_inf);
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	327
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	328 return retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	329
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	330 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	331
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	332 octave_unused_parameter (args);
21937 55f7de37b618 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	333
21126 ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	334 std::string caller
ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	335 = (args.length () > 0
ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	336 ? args(0).xstring_value ("__voronoi__: CALLER must be a string")
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	337 : "__voronoi__");
21126 ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	338
21109 bd1752782e56 Use err_disabled_feature, warn_disabled_feature throughout code base. Rik <rik@octave.org> parents: 20940 diff changeset	339 err_disabled_feature (caller, "Qhull");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	340
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	341 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	342 }
12805 3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	343
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	344 /*
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	345 ## 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	346 %!assert (1)
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	347 */

Mercurial > octave

annotate libinterp/dldfcn/__voronoi__.cc @ 29517:78ccd8bf439c

annotate libinterp/dldfcn/voronoi.cc @ 29517:78ccd8bf439c