octave: libinterp/dldfcn/__voronoi_

annotate libinterp/dldfcn/voronoi.cc @ 21942:aab79a1885cc

limit gnulib headers to liboctave/wrappers directory * libinterp/module.mk, liboctave/module.mk, src/module.mk, libgui/src/module.mk: Don't include libgnu directory in lists of include directories. * c-file-ptr-stream.cc, data.cc, dirfns.cc, file-io.cc, ft-text-renderer.cc, gcd.cc, gl2ps-print.cc, graphics.cc, mex.cc, oct-fstrm.cc, oct-procbuf.cc, oct-tex-lexer.in.ll, oct-tex-parser.in.yy, pr-output.cc, quadcc.cc, rand.cc, toplev.cc, utils.cc, __delaunayn__.cc, __init_fltk__.cc, __voronoi__.cc, convhulln.cc, ov-cell.cc, ov-float.cc, ov-scalar.cc, lex.ll, oct-parse.in.yy, Range.cc, idx-vector.cc, Faddeeva/Faddeeva.cc, lo-mappers.cc, lo-specfun.cc, randgamma.cc, randmtzig.cc, randpoisson.cc, dir-ops.cc, file-ops.cc, file-stat.cc, oct-env.cc, oct-syscalls.cc, oct-time.cc, oct-uname.cc, cmd-edit.cc, cmd-hist.cc, lo-utils.cc, oct-inttypes.cc, oct-shlib.cc, sparse-util.cc, mkoctfile.in.cc: Use std:: instead of gnulib:: namespace. * oct-conf-post.in.h: Don't define GNULIB_NAMESPACE.

author	John W. Eaton <jwe@octave.org>
date	Fri, 17 Jun 2016 13:45:04 -0400
parents	55f7de37b618
children	112b20240c87

rev	line source
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	1 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	3 Copyright (C) 2000-2015 Kai Habel
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	4
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	5 This file is part of Octave.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	6
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6945 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6945 diff changeset	10 option) any later version.
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	11
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	15 for more details.
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	16
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6945 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6945 diff changeset	19 <http://www.gnu.org/licenses/>.
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	20
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	21 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	22
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	23 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	24 20. Augiust 2000 - Kai Habel: first release
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 /*
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	28 2003-12-14 Rafael Laboissiere <rafael@laboissiere.net>
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	29 Added optional second argument to pass options to the underlying
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	30 qhull command
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	31 */
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	32
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21723 diff changeset	33 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	34 # include "config.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	35 #endif
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	36
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	37 #include <cstdio>
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	38
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	39 #include <list>
6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	40
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 18077 diff changeset	41 #include "oct-locbuf.h"
9003 0631d397fbe0 replace lo_ieee_isnan by xisnan, add missing includes Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	42 #include "lo-ieee.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	43
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	44 #include "Cell.h"
9786 2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	45 #include "defun-dld.h"
2c279308f6ab fix includes in some src/DLD-FUNCTIONS files John W. Eaton <jwe@octave.org> parents: 9003 diff changeset	46 #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	47 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	48 #include "ovl.h"
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	49 #include "unwind-prot.h"
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	50
14043 f913363318e0 handle new names and locations of qhull include files (bug #33712) John W. Eaton <jwe@octave.org> parents: 13903 diff changeset	51 #if defined (HAVE_QHULL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	52
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	53 # include "oct-qhull.h"
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	54
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	55 # if defined (NEED_QHULL_VERSION)
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	56 char qh_version[] = "__voronoi__.oct 2007-07-24";
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21126 diff changeset	57 # endif
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	58
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	59 static void
3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	60 close_fcn (FILE *f)
3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	61 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21937 diff changeset	62 std::fclose (f);
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	63 }
3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	64
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	65 static bool
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	66 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	67 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	68 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	69 {
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	70 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	71
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	72 if (dim > maxval \|\| n > maxval)
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	73 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	74 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	75
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	76 return true;
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	77 }
ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	78
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	79 #endif
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	80
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	81 DEFUN_DLD (__voronoi__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	82 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20825 diff changeset	83 @deftypefn {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20825 diff changeset	84 @deftypefnx {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts}, @var{options})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20825 diff changeset	85 @deftypefnx {} {@var{C}, @var{F}, @var{Inf_Pts} =} __voronoi__ (@dots{})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	86 Undocumented internal function.\n\
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	87 @end deftypefn")
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	88 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	89 #if defined (HAVE_QHULL)
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	90
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	91 int nargin = args.length ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	92
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	93 if (nargin < 2 \|\| nargin > 3)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	94 print_usage ();
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	95
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20579 diff changeset	96 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	97
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	98 octave_value_list retval;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	99
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	100 Matrix points = args(1).matrix_value ();
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	101 const octave_idx_type dim = points.columns ();
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	102 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	103
18077 ac74b0c4c564 avoid overflow when passing problem dimensions to qhull with --enable-64 John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	104 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	105 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	106
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	107 points = points.transpose ();
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	108
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	109 std::string options;
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	110
16343 dda043ccad7c __voronoi__.cc: Change QHull arguments for 4D inputs to match Matlab. Rik <rik@octave.org> parents: 15195 diff changeset	111 if (dim <= 3)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	112 options = " Qbb";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	113 else
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	114 options = " Qbb Qx";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	115
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	116 if (nargin == 3)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	117 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	118 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	119
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	120 if (opt_arg.is_string ())
13880 1dc120c06ce0 finish previous change to __voronoi__ John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	121 options = " " + opt_arg.string_value ();
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	122 else if (opt_arg.is_empty ())
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	123 ; // Use default options.
13880 1dc120c06ce0 finish previous change to __voronoi__ John W. Eaton <jwe@octave.org> parents: 13879 diff changeset	124 else if (opt_arg.is_cellstr ())
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	125 {
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	126 options = "";
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	127
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	128 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	129
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	130 for (octave_idx_type i = 0; i < tmp.numel (); i++)
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	131 options += " " + tmp(i);
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 else
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	134 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	135 caller.c_str ());
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	136 }
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	137
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	138 boolT ismalloc = false;
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	139
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	140 octave::unwind_protect frame;
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	141
14309 824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	142 // Replace the outfile pointer with stdout for debugging information.
824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	143 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21937 diff changeset	144 FILE *outfile = std::fopen ("NUL", "w");
14309 824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	145 #else
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21937 diff changeset	146 FILE *outfile = std::fopen ("/dev/null", "w");
14309 824e5d362aba Fix Qhull calling convention by passing true file pointer to qh_new_qhull Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	147 #endif
6880 e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman] dbateman parents: 6823 diff changeset	148 FILE *errfile = stderr;
14339 3e4350f09a55 close temporary files opened for Qhull John W. Eaton <jwe@octave.org> parents: 14309 diff changeset	149
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	150 if (! outfile)
20825 66cd994d1b79 eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20790 diff changeset	151 error ("__voronoi__: unable to create temporary file for output");
6880 e00a8f661f06 [project @ 2007-09-07 21:39:55 by dbateman] dbateman parents: 6823 diff changeset	152
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	153 frame.add_fcn (close_fcn, outfile);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	154
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	155 // 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	156
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	157 std::string cmd = "qhull v" + options;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	158
adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	159 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	160
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	161 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	162
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	163 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	164 ismalloc, cmd_str, outfile, errfile);
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	165 if (exitcode)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	166 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	167
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	168 // 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	169 // (sets qh num_good).
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	170
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	171 qh_findgood_all (qh facet_list);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	172
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	173 octave_idx_type num_voronoi_regions
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	174 = qh num_vertices - qh_setsize (qh del_vertices);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	175
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	176 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	177
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	178 // Find the voronoi centers for all facets.
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	179
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	180 qh_setvoronoi_all ();
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	181
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	182 facetT *facet;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	183 vertexT *vertex;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	184 octave_idx_type k;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	185
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	186 // 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	187 // 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	188 // 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	189
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	190 FORALLfacets
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	191 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	192 facet->seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	193 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	194
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	195 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	196 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	197 ni[i] = 0;
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18077 diff changeset	198
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	199 k = 0;
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	200
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	201 FORALLvertices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	202 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	203 if (qh hull_dim == 3)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	204 qh_order_vertexneighbors (vertex);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	205
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	206 bool infinity_seen = false;
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	207
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	208 facetT neighbor, *neighborp;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	209
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	210 FOREACHneighbor_ (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 if (neighbor->upperdelaunay)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	213 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	214 if (! infinity_seen)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	215 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	216 infinity_seen = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	217 ni[k]++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	218 }
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 else
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	221 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	222 neighbor->seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	223 ni[k]++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	224 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	225 }
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	226
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	227 k++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	228 }
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	229
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	230 // 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	231 // 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	232 // 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	233
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	234 // 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	235 // 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	236
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	237 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	238 ? num_points : num_voronoi_regions);
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 boolMatrix at_inf (nr, 1, false);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	241
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	242 // 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	243 // Inf.
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	244 Matrix F (num_voronoi_vertices+1, dim);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	245
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	246 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	247 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	248
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	249 // 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	250 // vertices of the Voronoi regions (cells).
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 Cell C (nr, 1);
13862 6d7e133a4bed compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13746 diff changeset	253
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	254 // 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	255 // 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	256 // for the cells.
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	257
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	258 FORALLfacets
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	259 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	260 facet->seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	261 }
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	262
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	263 octave_idx_type i = 0;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	264 k = 0;
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 FORALLvertices
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	267 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	268 if (qh hull_dim == 3)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	269 qh_order_vertexneighbors (vertex);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	270
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	271 bool infinity_seen = false;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	272
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	273 octave_idx_type idx = qh_pointid (vertex->point);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	274
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	275 octave_idx_type num_vertices = ni[k++];
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	276
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	277 // 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	278 // 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	279 // vertex? Let's skip it.
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 if (num_vertices == 1)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	282 continue;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	283
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	284 RowVector facet_list (num_vertices);
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	285
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	286 octave_idx_type m = 0;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	287
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	288 facetT neighbor, *neighborp;
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 FOREACHneighbor_(vertex)
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 if (neighbor->upperdelaunay)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	293 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	294 if (! infinity_seen)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	295 {
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	296 infinity_seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	297 facet_list(m++) = 1;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	298 at_inf(idx) = true;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	299 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	300 }
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	301 else
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	302 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	303 if (! neighbor->seen)
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	304 {
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	305 i++;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	306 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	307 F(i,d) = neighbor->center[d];
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	308
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	309 neighbor->seen = true;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	310 neighbor->visitid = i;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	311 }
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	312
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	313 facet_list(m++) = neighbor->visitid + 1;
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	314 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9786 diff changeset	315 }
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	316
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	317 C(idx) = facet_list;
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	318 }
20866 2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	319
2bd3b13e2c8e 2015 Code Sprint: __voronoi__.cc: use ovl(). Rik <rik@octave.org> parents: 20853 diff changeset	320 retval = ovl (F, C, at_inf);
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6880 diff changeset	321
13871 adf60d6dc1dd more compatibility fixes for __voronoi__ John W. Eaton <jwe@octave.org> parents: 13862 diff changeset	322 // Free memory from Qhull
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	323 qh_freeqhull (! qh_ALL);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	324
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	325 int curlong, totlong;
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	326 qh_memfreeshort (&curlong, &totlong);
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	327
7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	328 if (curlong \|\| totlong)
13879 440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	329 warning ("%s: qhull did not free %d bytes of long memory (%d pieces)",
440d7914cf01 fix regression in __voronoi__ and convhulln option processing John W. Eaton <jwe@octave.org> parents: 13871 diff changeset	330 caller.c_str (), totlong, curlong);
13746 7ff0bdc3dc4c Revamp geometry functions dependent on Qhull (Bug #34604, Bug #33346) Rik <octave@nomad.inbox5.com> parents: 13203 diff changeset	331
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	332 return retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20866 diff changeset	333
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	334 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	335
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	336 octave_unused_parameter (args);
21937 55f7de37b618 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	337
21126 ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	338 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	339 = (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	340 ? args(0).xstring_value ("__voronoi__: CALLER must be a string")
ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	341 : std::string ("__voronoi__"));
ba0a4b4f021d include errwarn.h in files that use err_disabled_feature conditionally John W. Eaton <jwe@octave.org> parents: 21109 diff changeset	342
21109 bd1752782e56 Use err_disabled_feature, warn_disabled_feature throughout code base. Rik <rik@octave.org> parents: 20940 diff changeset	343 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	344
6823 9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	345 #endif
9fddcc586065 [project @ 2007-08-24 08:27:27 by dbateman] dbateman parents: diff changeset	346 }
12805 3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	347
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	348 /*
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	349 ## 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	350 %!assert (1)
3641167e5b75 codesprint: .cc helper functions do not need tests Rik <octave@nomad.inbox5.com>* parents: 11586 diff changeset	351 */

Mercurial > octave

annotate libinterp/dldfcn/__voronoi__.cc @ 21942:aab79a1885cc

annotate libinterp/dldfcn/voronoi.cc @ 21942:aab79a1885cc